[src/netbsd-1-4]: src/sys/arch/alpha/alpha Pull up 1.2 -> 1.3.

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

details:   https://anonhg.NetBSD.org/src/rev/071c322056fc
branches:  netbsd-1-4
changeset: 468304:071c322056fc
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Apr 16 23:13:16 1999 +0000

description:
Pull up 1.2 -> 1.3.

diffstat:

 sys/arch/alpha/alpha/dec_alphabook1.c |  13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (41 lines):

diff -r ca77e05675f9 -r 071c322056fc sys/arch/alpha/alpha/dec_alphabook1.c
--- a/sys/arch/alpha/alpha/dec_alphabook1.c     Fri Apr 16 23:12:39 1999 +0000
+++ b/sys/arch/alpha/alpha/dec_alphabook1.c     Fri Apr 16 23:13:16 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_alphabook1.c,v 1.2 1999/02/13 02:41:40 thorpej Exp $ */
+/* $NetBSD: dec_alphabook1.c,v 1.2.2.1 1999/04/16 23:13:16 thorpej Exp $ */
 
 /*
  * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -31,7 +31,7 @@
  */
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.2 1999/02/13 02:41:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.2.2.1 1999/04/16 23:13:16 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -127,17 +127,18 @@
                }
 
        case 3:
-#if    NPCKBD  > 0
+#if NPCKBD > 0
                /* display console ... */
                /* XXX */
                (void) pckbc_cnattach(&lcp->lc_iot, PCKBC_KBD_SLOT);
 
-               if ((ctb->ctb_turboslot & 0xffff) == 0)
+               if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
+                   CTB_TURBOSLOT_TYPE_ISA)
                        isa_display_console(&lcp->lc_iot, &lcp->lc_memt);
                else
                        pci_display_console(&lcp->lc_iot, &lcp->lc_memt,
-                           &lcp->lc_pc, (ctb->ctb_turboslot >> 8) & 0xff,
-                           ctb->ctb_turboslot & 0xff, 0);
+                           &lcp->lc_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
+                           CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
 #else
                panic("not configured to use display && keyboard console");
 #endif