Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Leave out display console related bits if wscons is not compiled in.

Browse Source 
Should fix link error reported by Kevin <kev@drule.org>.
This commit is contained in:
drochner 1999-03-28 13:48:40 +00:00
parent e1410f9e82
commit 31a77e61b3
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/alpha/alpha/dec_3000_300.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_3000_300.c,v 1.24 1999/02/26 03:57:10 thorpej Exp $ */
/* $NetBSD: dec_3000_300.c,v 1.25 1999/03/28 13:48:40 drochner Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dec_3000_300.c,v 1.24 1999/02/26 03:57:10 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_3000_300.c,v 1.25 1999/03/28 13:48:40 drochner Exp $");
#include "opt_new_scc_driver.h"
@ -57,6 +57,8 @@ __KERNEL_RCSID(0, "$NetBSD: dec_3000_300.c,v 1.24 1999/02/26 03:57:10 thorpej Ex
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsiconf.h>
#include "wsdisplay.h"
void dec_3000_300_init __P((void));
static void dec_3000_300_cons_init __P((void));
static void dec_3000_300_device_register __P((struct device *, void *));
@ -98,11 +100,13 @@ dec_3000_300_cons_init()
switch (ctb->ctb_term_type) {
case CTB_GRAPHICS:
#if NWSDISPLAY > 0
/* display console ... */
if (zs_ioasic_lk201_cnattach(0x1a0000000, 0x00180000, 0)
&& tc_3000_300_fb_cnattach(ctb->ctb_turboslot)) {
break;
}
#endif
printf("consinit: Unable to init console on keyboard and ");
printf("TURBOchannel slot 0x%lx.\n", ctb->ctb_turboslot);
printf("Using serial console.\n");

8
sys/arch/alpha/alpha/dec_3000_500.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_3000_500.c,v 1.23 1999/02/26 03:57:11 thorpej Exp $ */
/* $NetBSD: dec_3000_500.c,v 1.24 1999/03/28 13:48:40 drochner Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dec_3000_500.c,v 1.23 1999/02/26 03:57:11 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_3000_500.c,v 1.24 1999/03/28 13:48:40 drochner Exp $");
#include "opt_new_scc_driver.h"
@ -57,6 +57,8 @@ __KERNEL_RCSID(0, "$NetBSD: dec_3000_500.c,v 1.23 1999/02/26 03:57:11 thorpej Ex
#include <dev/scsipi/scsipi_all.h>
#include <dev/scsipi/scsiconf.h>
#include "wsdisplay.h"
void dec_3000_500_init __P((void));
static void dec_3000_500_cons_init __P((void));
static void dec_3000_500_device_register __P((struct device *, void *));
@ -118,11 +120,13 @@ dec_3000_500_cons_init()
switch (ctb->ctb_term_type) {
case CTB_GRAPHICS:
#if NWSDISPLAY > 0
/* display console ... */
if (zs_ioasic_lk201_cnattach(0x1e0000000, 0x00180000, 0)
&& tc_3000_500_fb_cnattach(ctb->ctb_turboslot)) {
break;
}
#endif
printf("consinit: Unable to init console on keyboard and ");
printf("TURBOchannel slot 0x%lx.\n", ctb->ctb_turboslot);
printf("Using serial console.\n");

7
sys/arch/alpha/tc/tc_3000_300.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tc_3000_300.c,v 1.18 1999/02/12 01:49:07 thorpej Exp $ */
/* $NetBSD: tc_3000_300.c,v 1.19 1999/03/28 13:48:40 drochner Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: tc_3000_300.c,v 1.18 1999/02/12 01:49:07 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: tc_3000_300.c,v 1.19 1999/03/28 13:48:40 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -46,6 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: tc_3000_300.c,v 1.18 1999/02/12 01:49:07 thorpej Exp
#include <alpha/tc/tc_3000_300.h>
#include <alpha/tc/ioasicreg.h>
#include "wsdisplay.h"
#include "sfb.h"
#if NSFB > 0
@ -268,6 +269,7 @@ tc_3000_300_iointr(framep, vec)
} while (ifound);
}
#if NWSDISPLAY > 0
/*
* tc_3000_300_fb_cnattach --
* Attempt to map the CTB output device to a slot and attach the
@ -296,3 +298,4 @@ tc_3000_300_fb_cnattach(turbo_slot)
return tc_fb_cnattach(tc_3000_300_slots[output_slot-1].tcs_addr);
}
#endif /* NWSDISPLAY */

7
sys/arch/alpha/tc/tc_3000_500.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tc_3000_500.c,v 1.18 1999/02/12 01:49:07 thorpej Exp $ */
/* $NetBSD: tc_3000_500.c,v 1.19 1999/03/28 13:48:40 drochner Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: tc_3000_500.c,v 1.18 1999/02/12 01:49:07 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: tc_3000_500.c,v 1.19 1999/03/28 13:48:40 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -46,6 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: tc_3000_500.c,v 1.18 1999/02/12 01:49:07 thorpej Exp
#include <alpha/tc/tc_conf.h>
#include <alpha/tc/tc_3000_500.h>
#include "wsdisplay.h"
#include "sfb.h"
#if NSFB > 0
@ -268,6 +269,7 @@ tc_3000_500_iointr(framep, vec)
} while (ifound);
}
#if NWSDISPLAY > 0
/*
* tc_3000_500_fb_cnattach --
* Attempt to map the CTB output device to a slot and attach the
@ -306,6 +308,7 @@ tc_3000_500_fb_cnattach(turbo_slot)
}
return tc_fb_cnattach(tc_3000_500_slots[output_slot-1].tcs_addr);
}
#endif /* NWSDISPLAY */
#if 0
/*