[src/netbsd-1-4]: src/sys/arch/alpha/alpha pull up rev 1.28 from trunk (ross)

[cgd <cgd%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/57e175d1d0e1
branches:  netbsd-1-4
changeset: 469214:57e175d1d0e1
user:      cgd <cgd%NetBSD.org@localhost>
date:      Sun Aug 08 07:17:00 1999 +0000

description:
pull up rev 1.28 from trunk (ross)

diffstat:

 sys/arch/alpha/alpha/dec_3000_300.c |  34 +++++++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 9 deletions(-)

diffs (74 lines):

diff -r 20f80444665b -r 57e175d1d0e1 sys/arch/alpha/alpha/dec_3000_300.c
--- a/sys/arch/alpha/alpha/dec_3000_300.c       Sun Aug 08 07:07:07 1999 +0000
+++ b/sys/arch/alpha/alpha/dec_3000_300.c       Sun Aug 08 07:17:00 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3000_300.c,v 1.25.2.1 1999/04/16 23:10:35 thorpej Exp $ */
+/* $NetBSD: dec_3000_300.c,v 1.25.2.2 1999/08/08 07:17:00 cgd 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.25.2.1 1999/04/16 23:10:35 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3000_300.c,v 1.25.2.2 1999/08/08 07:17:00 cgd Exp $");
 
 #include "opt_new_scc_driver.h"
 
@@ -49,6 +49,9 @@
 #include <dev/tc/tcvar.h>
 #include <alpha/tc/tcdsvar.h>
 #include <alpha/tc/tc_3000_300.h>
+#ifndef NEW_SCC_DRIVER
+#include <alpha/tc/sccvar.h>
+#endif
 
 #include <machine/z8530var.h>
 #include <dev/dec/zskbdvar.h>
@@ -93,11 +96,21 @@
 static void
 dec_3000_300_cons_init()
 {
-#if defined(NEW_SCC_DRIVER)
        struct ctb *ctb;
 
        ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off);
 
+#ifndef NEW_SCC_DRIVER
+       switch (ctb->ctb_term_type) {
+       case CTB_GRAPHICS:
+               alpha_donot_kludge_scc = 1;
+               return;
+       case CTB_PRINTERPORT:
+               return;
+       default:
+               goto badconsole;
+       }
+#else
        switch (ctb->ctb_term_type) {
        case CTB_GRAPHICS:
 #if NWSDISPLAY > 0
@@ -138,13 +151,16 @@
                }
 
        default:
-               printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
-               printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot);
+               goto badconsole;
+       }
+#endif
+       return;
+badconsole:
+       printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
+       printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot);
 
-               panic("consinit: unknown console type %lu\n",
-                   ctb->ctb_term_type);
-       }
-#endif /* NEW_SCC_DRIVER */
+       panic("consinit: unknown console type %lu\n",
+           ctb->ctb_term_type);
 }
 
 static void