[src/netbsd-1-4]: src/sys/arch/alpha/alpha Pull up revision 1.5 (requested by...

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

details:   https://anonhg.NetBSD.org/src/rev/d1e8f379b5b5
branches:  netbsd-1-4
changeset: 470286:d1e8f379b5b5
user:      he <he%NetBSD.org@localhost>
date:      Sun Feb 06 17:22:52 2000 +0000

description:
Pull up revision 1.5 (requested by veego):
  Fix detection of booted device for IDE drives, such that automatic
  booting from a slave drive or a drive on the second channel works.

diffstat:

 sys/arch/alpha/alpha/dec_550.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 196858111259 -r d1e8f379b5b5 sys/arch/alpha/alpha/dec_550.c
--- a/sys/arch/alpha/alpha/dec_550.c    Sun Feb 06 17:22:29 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_550.c    Sun Feb 06 17:22:52 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_550.c,v 1.3.2.1 1999/04/16 23:12:39 thorpej Exp $ */
+/* $NetBSD: dec_550.c,v 1.3.2.2 2000/02/06 17:22:52 he Exp $ */
 
 /*
  * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.3.2.1 1999/04/16 23:12:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.3.2.2 2000/02/06 17:22:52 he Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,8 +48,9 @@
 #include <dev/ic/comreg.h>
 #include <dev/ic/comvar.h>
 
+#include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
-#include <dev/isa/pckbcvar.h>
+#include <dev/ic/pckbcvar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
@@ -128,7 +129,7 @@
 #if NPCKBD > 0
                /* display console ... */
                /* XXX */
-               (void) pckbc_cnattach(&ccp->cc_iot, PCKBC_KBD_SLOT);
+               (void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, PCKBC_KBD_SLOT);
 
                if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
                    CTB_TURBOSLOT_TYPE_ISA)