allow the console to attach on the rest of the alpha's we support.

5 files changed, 27 insertions, 36 deletions

diff --git a/sys/arch/alpha/alpha/dec_2100_a50.c b/sys/arch/alpha/alpha/dec_2100_a50.c
index 0947efbfde6..b944d08e77b 100644
--- a/sys/arch/alpha/alpha/dec_2100_a50.c
+++ b/sys/arch/alpha/alpha/dec_2100_a50.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_2100_a50.c,v 1.11 2000/11/08 21:48:42 art Exp $ */
+/* $OpenBSD: dec_2100_a50.c,v 1.12 2000/11/16 23:32:20 ericj Exp $ */
 /* $NetBSD: dec_2100_a50.c,v 1.43 2000/05/22 20:13:31 thorpej Exp $ */
 
 /*
@@ -48,9 +48,8 @@
 
 #include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
-#ifdef notyet
+#include <dev/ic/i8042reg.h>
 #include <dev/ic/pckbcvar.h>
-#endif
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
@@ -60,9 +59,7 @@
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
 
-#ifdef notyet
 #include "pckbd.h"
-#endif
 
 #ifndef CONSPEED
 #define CONSPEED TTYDEF_SPEED
@@ -142,13 +139,14 @@ dec_2100_a50_cons_init()
 #if NPCKBD > 0
 		/* display console ... */
 		/* XXX */
-		(void) pckbc_cnattach(&acp->ac_iot, IO_KBD, PCKBC_KBD_SLOT);
+		(void) pckbc_cnattach(acp->ac_iot, IO_KBD, KBCMDP,
+		    PCKBC_KBD_SLOT);
 
 		if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
 		    CTB_TURBOSLOT_TYPE_ISA)
-			isa_display_console(&acp->ac_iot, &acp->ac_memt);
+			isa_display_console(acp->ac_iot, acp->ac_memt);
 		else
-			pci_display_console(&acp->ac_iot, &acp->ac_memt,
+			pci_display_console(acp->ac_iot, acp->ac_memt,
 			    &acp->ac_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
 			    CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
 #else
diff --git a/sys/arch/alpha/alpha/dec_550.c b/sys/arch/alpha/alpha/dec_550.c
index 9a64a8822cb..4dd5c08531c 100644
--- a/sys/arch/alpha/alpha/dec_550.c
+++ b/sys/arch/alpha/alpha/dec_550.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_550.c,v 1.3 2000/11/08 21:48:43 art Exp $ */
+/* $OpenBSD: dec_550.c,v 1.4 2000/11/16 23:32:20 ericj Exp $ */
 /* $NetBSD: dec_550.c,v 1.10 2000/06/20 03:48:53 matt Exp $ */
 
 /*
@@ -49,9 +49,8 @@
 #include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
 #include <dev/ic/i8042reg.h>
-#ifdef notyet
+
 #include <dev/ic/pckbcvar.h>
-#endif
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
@@ -134,14 +133,14 @@ dec_550_cons_init()
 #if NPCKBD > 0
 		/* display console ... */
 		/* XXX */
-		(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP,
+		(void) pckbc_cnattach(ccp->cc_iot, IO_KBD, KBCMDP,
 		    PCKBC_KBD_SLOT);
 
 		if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
 		    CTB_TURBOSLOT_TYPE_ISA)
-			isa_display_console(&ccp->cc_iot, &ccp->cc_memt);
+			isa_display_console(ccp->cc_iot, ccp->cc_memt);
 		else
-			pci_display_console(&ccp->cc_iot, &ccp->cc_memt,
+			pci_display_console(ccp->cc_iot, ccp->cc_memt,
 			    &ccp->cc_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
 			    CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
 #else
diff --git a/sys/arch/alpha/alpha/dec_6600.c b/sys/arch/alpha/alpha/dec_6600.c
index 96b5b9ca2a6..376cfb0d484 100644
--- a/sys/arch/alpha/alpha/dec_6600.c
+++ b/sys/arch/alpha/alpha/dec_6600.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_6600.c,v 1.1 2000/11/16 04:50:17 ericj Exp $ */
+/* $OpenBSD: dec_6600.c,v 1.2 2000/11/16 23:32:20 ericj Exp $ */
 /* $NetBSD: dec_6600.c,v 1.7 2000/06/20 03:48:54 matt Exp $ */
 
 /*
@@ -56,9 +56,7 @@
 #include <scsi/scsiconf.h>
 #include <dev/ata/atavar.h>
 
-#if 0
 #include "pckbd.h"
-#endif
 
 #ifndef CONSPEED
 #define CONSPEED TTYDEF_SPEED
@@ -130,17 +128,17 @@ dec_6600_cons_init()
 #if NPCKBD > 0
 		/* display console ... */
 		/* XXX */
-		(void) pckbc_cnattach(&tsp->pc_iot, IO_KBD, KBCMDP,
+		(void) pckbc_cnattach(tsp->pc_iot, IO_KBD, KBCMDP,
 		    PCKBC_KBD_SLOT);
 
 		if (CTB_TURBOSLOT_TYPE(ctbslot) ==
 		    CTB_TURBOSLOT_TYPE_ISA)
-			isa_display_console(&tsp->pc_iot, &tsp->pc_memt);
+			isa_display_console(tsp->pc_iot, tsp->pc_memt);
 		else {
 			/* The display PCI might be different */
 			tsp_console_hose = CTB_TURBOSLOT_HOSE(ctbslot);
 			tsp = tsp_init(0, tsp_console_hose);
-			pci_display_console(&tsp->pc_iot, &tsp->pc_memt,
+			pci_display_console(tsp->pc_iot, tsp->pc_memt,
 			    &tsp->pc_pc, CTB_TURBOSLOT_BUS(ctbslot),
 			    CTB_TURBOSLOT_SLOT(ctbslot), 0);
 		}
diff --git a/sys/arch/alpha/alpha/dec_axppci_33.c b/sys/arch/alpha/alpha/dec_axppci_33.c
index 76a8140db9d..3142011d0ec 100644
--- a/sys/arch/alpha/alpha/dec_axppci_33.c
+++ b/sys/arch/alpha/alpha/dec_axppci_33.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_axppci_33.c,v 1.11 2000/11/08 21:48:44 art Exp $ */
+/* $OpenBSD: dec_axppci_33.c,v 1.12 2000/11/16 23:32:20 ericj Exp $ */
 /* $NetBSD: dec_axppci_33.c,v 1.44 2000/05/22 20:13:32 thorpej Exp $ */
 
 /*
@@ -48,9 +48,8 @@
 
 #include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
-#if 0
+#include <dev/ic/i8042reg.h>
 #include <dev/ic/pckbcvar.h>
-#endif
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
@@ -60,9 +59,7 @@
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
 
-#if 0
 #include "pckbd.h"
-#endif
 
 #ifndef CONSPEED
 #define CONSPEED TTYDEF_SPEED
@@ -177,13 +174,14 @@ dec_axppci_33_cons_init()
 #if NPCKBD > 0
 		/* display console ... */
 		/* XXX */
-		(void) pckbc_cnattach(&lcp->lc_iot, IO_KBD, PCKBC_KBD_SLOT);
+		(void) pckbc_cnattach(lcp->lc_iot, IO_KBD, KBCMDP,
+		    PCKBC_KBD_SLOT);
 
 		if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
 		    CTB_TURBOSLOT_TYPE_ISA)
-			isa_display_console(&lcp->lc_iot, &lcp->lc_memt);
+			isa_display_console(lcp->lc_iot, lcp->lc_memt);
 		else
-			pci_display_console(&lcp->lc_iot, &lcp->lc_memt,
+			pci_display_console(lcp->lc_iot, lcp->lc_memt,
 			    &lcp->lc_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
 			    CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
 #else
diff --git a/sys/arch/alpha/alpha/dec_kn20aa.c b/sys/arch/alpha/alpha/dec_kn20aa.c
index 70a167d4ee7..5cd7a3e9b92 100644
--- a/sys/arch/alpha/alpha/dec_kn20aa.c
+++ b/sys/arch/alpha/alpha/dec_kn20aa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_kn20aa.c,v 1.10 2000/11/08 21:48:45 art Exp $ */
+/* $OpenBSD: dec_kn20aa.c,v 1.11 2000/11/16 23:32:20 ericj Exp $ */
 /* $NetBSD: dec_kn20aa.c,v 1.42 2000/05/22 20:13:32 thorpej Exp $ */
 
 /*
@@ -48,9 +48,8 @@
 
 #include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
-#if 0
+#include <dev/ic/i8042reg.h>
 #include <dev/ic/pckbcvar.h>
-#endif
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
@@ -60,9 +59,7 @@
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
 
-#if 0
 #include "pckbd.h"
-#endif
 
 #ifndef CONSPEED
 #define CONSPEED TTYDEF_SPEED
@@ -133,13 +130,14 @@ dec_kn20aa_cons_init()
 #if NPCKBD > 0
 		/* display console ... */
 		/* XXX */
-		(void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, PCKBC_KBD_SLOT);
+		(void) pckbc_cnattach(ccp->cc_iot, IO_KBD, KBCMDP,
+		    PCKBC_KBD_SLOT);
 
 		if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
 		    CTB_TURBOSLOT_TYPE_ISA)
-			isa_display_console(&ccp->cc_iot, &ccp->cc_memt);
+			isa_display_console(ccp->cc_iot, ccp->cc_memt);
 		else
-			pci_display_console(&ccp->cc_iot, &ccp->cc_memt,
+			pci_display_console(ccp->cc_iot, ccp->cc_memt,
 			    &ccp->cc_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
 			    CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
 #else