[src/trunk]: src/sys/arch/alpha Leave out display console related bits if wsc...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/alpha Leave out display console related bits if wsc...
From: drochner <drochner%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 05:31:03 +0000

details:   https://anonhg.NetBSD.org/src/rev/b6adad40fa69
branches:  trunk
changeset: 467739:b6adad40fa69
user:      drochner <drochner%NetBSD.org@localhost>
date:      Sun Mar 28 13:48:40 1999 +0000

description:
Leave out display console related bits if wscons is not compiled in.
Should fix link error reported by Kevin <kev%drule.org@localhost>.

diffstat:

 sys/arch/alpha/alpha/dec_3000_300.c |  8 ++++++--
 sys/arch/alpha/alpha/dec_3000_500.c |  8 ++++++--
 sys/arch/alpha/tc/tc_3000_300.c     |  7 +++++--
 sys/arch/alpha/tc/tc_3000_500.c     |  7 +++++--
 4 files changed, 22 insertions(+), 8 deletions(-)

diffs (163 lines):

diff -r 96cd1c93eaa3 -r b6adad40fa69 sys/arch/alpha/alpha/dec_3000_300.c
--- a/sys/arch/alpha/alpha/dec_3000_300.c       Sun Mar 28 13:39:30 1999 +0000
+++ b/sys/arch/alpha/alpha/dec_3000_300.c       Sun Mar 28 13:48:40 1999 +0000
@@ -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 @@
 #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 @@
 
        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");
diff -r 96cd1c93eaa3 -r b6adad40fa69 sys/arch/alpha/alpha/dec_3000_500.c
--- a/sys/arch/alpha/alpha/dec_3000_500.c       Sun Mar 28 13:39:30 1999 +0000
+++ b/sys/arch/alpha/alpha/dec_3000_500.c       Sun Mar 28 13:48:40 1999 +0000
@@ -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 @@
 #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 @@
 
        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");
diff -r 96cd1c93eaa3 -r b6adad40fa69 sys/arch/alpha/tc/tc_3000_300.c
--- a/sys/arch/alpha/tc/tc_3000_300.c   Sun Mar 28 13:39:30 1999 +0000
+++ b/sys/arch/alpha/tc/tc_3000_300.c   Sun Mar 28 13:48:40 1999 +0000
@@ -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 @@
 #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 @@
        } 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 @@
 
        return tc_fb_cnattach(tc_3000_300_slots[output_slot-1].tcs_addr);
 }
+#endif /* NWSDISPLAY */
diff -r 96cd1c93eaa3 -r b6adad40fa69 sys/arch/alpha/tc/tc_3000_500.c
--- a/sys/arch/alpha/tc/tc_3000_500.c   Sun Mar 28 13:39:30 1999 +0000
+++ b/sys/arch/alpha/tc/tc_3000_500.c   Sun Mar 28 13:48:40 1999 +0000
@@ -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 @@
 #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 @@
        } 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 @@
        }
        return tc_fb_cnattach(tc_3000_500_slots[output_slot-1].tcs_addr);
 }
+#endif /* NWSDISPLAY */
 
 #if 0
 /*

Prev by Date: [src/trunk]: src/sys/arch/macppc/dev Remove unused files.
Next by Date: [src/trunk]: src/sys/arch/x68k/stand/xxboot Fixed the bug described in the pr...
Previous by Thread: [src/trunk]: src/sys/arch/macppc/dev Remove unused files.
Next by Thread: [src/trunk]: src/sys/arch/x68k/stand/xxboot Fixed the bug described in the pr...
Indexes:

Home | Main Index | Thread Index | Old Index