summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/alpha/api_up1000.c5
-rw-r--r--sys/arch/alpha/alpha/dec_1000a.c4
-rw-r--r--sys/arch/alpha/alpha/dec_2100_a50.c5
-rw-r--r--sys/arch/alpha/alpha/dec_550.c5
-rw-r--r--sys/arch/alpha/alpha/dec_6600.c5
-rw-r--r--sys/arch/alpha/alpha/dec_axppci_33.c5
-rw-r--r--sys/arch/alpha/alpha/dec_eb164.c5
-rw-r--r--sys/arch/alpha/alpha/dec_eb64plus.c5
-rw-r--r--sys/arch/alpha/alpha/dec_kn20aa.c5
-rw-r--r--sys/arch/alpha/alpha/dec_kn300.c5
-rw-r--r--sys/arch/amd64/amd64/wscons_machdep.c6
-rw-r--r--sys/arch/i386/i386/wscons_machdep.c6
-rw-r--r--sys/arch/loongson/loongson/wscons_machdep.c4
-rw-r--r--sys/arch/sparc64/dev/pckbc_ebus.c5
-rw-r--r--sys/dev/ic/pckbc.c8
-rw-r--r--sys/dev/ic/pckbcvar.h5
16 files changed, 36 insertions, 47 deletions
diff --git a/sys/arch/alpha/alpha/api_up1000.c b/sys/arch/alpha/alpha/api_up1000.c
index 5d76fad6325..49a37417105 100644
--- a/sys/arch/alpha/alpha/api_up1000.c
+++ b/sys/arch/alpha/alpha/api_up1000.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: api_up1000.c,v 1.10 2009/10/26 20:17:26 deraadt Exp $ */
+/* $OpenBSD: api_up1000.c,v 1.11 2010/11/23 04:07:55 shadchin Exp $ */
/* $NetBSD: api_up1000.c,v 1.4 2000/06/20 03:48:53 matt Exp $ */
/*
@@ -130,8 +130,7 @@ api_up1000_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
- (void) pckbc_cnattach(&icp->ic_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT, 0);
+ (void) pckbc_cnattach(&icp->ic_iot, IO_KBD, KBCMDP, 0);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)
diff --git a/sys/arch/alpha/alpha/dec_1000a.c b/sys/arch/alpha/alpha/dec_1000a.c
index 3bc81d1dca2..743108cb8fa 100644
--- a/sys/arch/alpha/alpha/dec_1000a.c
+++ b/sys/arch/alpha/alpha/dec_1000a.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_1000a.c,v 1.6 2008/07/16 20:03:20 miod Exp $ */
+/* $OpenBSD: dec_1000a.c,v 1.7 2010/11/23 04:07:55 shadchin Exp $ */
/* $NetBSD: dec_1000a.c,v 1.14 2001/06/05 04:53:11 thorpej Exp $ */
/*
@@ -201,7 +201,7 @@ dec_1000a_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
- (void) pckbc_cnattach(iot, IO_KBD, KBCMDP, PCKBC_KBD_SLOT, 0);
+ (void) pckbc_cnattach(iot, IO_KBD, KBCMDP, 0);
/*
* AlphaServer 1000s have a firmware bug whereby the
diff --git a/sys/arch/alpha/alpha/dec_2100_a50.c b/sys/arch/alpha/alpha/dec_2100_a50.c
index 3f06042f105..48ab41345e6 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.20 2008/07/24 16:34:22 miod Exp $ */
+/* $OpenBSD: dec_2100_a50.c,v 1.21 2010/11/23 04:07:55 shadchin Exp $ */
/* $NetBSD: dec_2100_a50.c,v 1.43 2000/05/22 20:13:31 thorpej Exp $ */
/*
@@ -150,8 +150,7 @@ dec_2100_a50_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
- (void) pckbc_cnattach(&acp->ac_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT, 0);
+ (void) pckbc_cnattach(&acp->ac_iot, IO_KBD, KBCMDP, 0);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)
diff --git a/sys/arch/alpha/alpha/dec_550.c b/sys/arch/alpha/alpha/dec_550.c
index 4a736aa3e75..e5238a1f3ff 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.12 2009/10/26 20:17:26 deraadt Exp $ */
+/* $OpenBSD: dec_550.c,v 1.13 2010/11/23 04:07:55 shadchin Exp $ */
/* $NetBSD: dec_550.c,v 1.10 2000/06/20 03:48:53 matt Exp $ */
/*
@@ -131,8 +131,7 @@ dec_550_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
- (void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT, 0);
+ (void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP, 0);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)
diff --git a/sys/arch/alpha/alpha/dec_6600.c b/sys/arch/alpha/alpha/dec_6600.c
index f4e5ef61512..01d7fad40d5 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.12 2009/10/26 20:17:26 deraadt Exp $ */
+/* $OpenBSD: dec_6600.c,v 1.13 2010/11/23 04:07:55 shadchin Exp $ */
/* $NetBSD: dec_6600.c,v 1.7 2000/06/20 03:48:54 matt Exp $ */
/*
@@ -153,8 +153,7 @@ dec_6600_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
- (void) pckbc_cnattach(&tsp->pc_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT, 0);
+ (void) pckbc_cnattach(&tsp->pc_iot, IO_KBD, KBCMDP, 0);
if (CTB_TURBOSLOT_TYPE(ctbslot) ==
CTB_TURBOSLOT_TYPE_ISA)
diff --git a/sys/arch/alpha/alpha/dec_axppci_33.c b/sys/arch/alpha/alpha/dec_axppci_33.c
index 470777ffdc7..d2a10a03bd3 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.21 2009/07/30 21:39:13 miod Exp $ */
+/* $OpenBSD: dec_axppci_33.c,v 1.22 2010/11/23 04:07:55 shadchin Exp $ */
/* $NetBSD: dec_axppci_33.c,v 1.44 2000/05/22 20:13:32 thorpej Exp $ */
/*
@@ -173,8 +173,7 @@ dec_axppci_33_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
- (void) pckbc_cnattach(&lcp->lc_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT, 0);
+ (void) pckbc_cnattach(&lcp->lc_iot, IO_KBD, KBCMDP, 0);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)
diff --git a/sys/arch/alpha/alpha/dec_eb164.c b/sys/arch/alpha/alpha/dec_eb164.c
index 4162821c6ad..10b0f33488a 100644
--- a/sys/arch/alpha/alpha/dec_eb164.c
+++ b/sys/arch/alpha/alpha/dec_eb164.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_eb164.c,v 1.17 2009/10/26 20:17:26 deraadt Exp $ */
+/* $OpenBSD: dec_eb164.c,v 1.18 2010/11/23 04:07:55 shadchin Exp $ */
/* $NetBSD: dec_eb164.c,v 1.33 2000/05/22 20:13:32 thorpej Exp $ */
/*
@@ -125,8 +125,7 @@ dec_eb164_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
- (void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT, 0);
+ (void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP, 0);
/*
* On at least LX164, SRM reports an isa video board
diff --git a/sys/arch/alpha/alpha/dec_eb64plus.c b/sys/arch/alpha/alpha/dec_eb64plus.c
index 230b538a604..e072e661d09 100644
--- a/sys/arch/alpha/alpha/dec_eb64plus.c
+++ b/sys/arch/alpha/alpha/dec_eb64plus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_eb64plus.c,v 1.7 2008/07/16 20:03:20 miod Exp $ */
+/* $OpenBSD: dec_eb64plus.c,v 1.8 2010/11/23 04:07:55 shadchin Exp $ */
/* $NetBSD: dec_eb64plus.c,v 1.25 2001/06/05 04:53:11 thorpej Exp $ */
/*
@@ -130,8 +130,7 @@ dec_eb64plus_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
- (void) pckbc_cnattach(&acp->ac_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT, 0);
+ (void) pckbc_cnattach(&acp->ac_iot, IO_KBD, KBCMDP, 0);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)
diff --git a/sys/arch/alpha/alpha/dec_kn20aa.c b/sys/arch/alpha/alpha/dec_kn20aa.c
index be0f750d421..909f1d9828e 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.18 2008/07/16 20:03:20 miod Exp $ */
+/* $OpenBSD: dec_kn20aa.c,v 1.19 2010/11/23 04:07:55 shadchin Exp $ */
/* $NetBSD: dec_kn20aa.c,v 1.42 2000/05/22 20:13:32 thorpej Exp $ */
/*
@@ -130,8 +130,7 @@ dec_kn20aa_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
- (void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT, 0);
+ (void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP, 0);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)
diff --git a/sys/arch/alpha/alpha/dec_kn300.c b/sys/arch/alpha/alpha/dec_kn300.c
index 4bdb4ceca17..2c4f3b8c811 100644
--- a/sys/arch/alpha/alpha/dec_kn300.c
+++ b/sys/arch/alpha/alpha/dec_kn300.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_kn300.c,v 1.5 2009/09/30 19:28:55 miod Exp $ */
+/* $OpenBSD: dec_kn300.c,v 1.6 2010/11/23 04:07:55 shadchin Exp $ */
/* $NetBSD: dec_kn300.c,v 1.34 2007/03/04 15:18:10 yamt Exp $ */
/*
@@ -180,8 +180,7 @@ dec_kn300_cons_init()
#if NPCKBD > 0
/* display console ... */
/* XXX */
- (void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT, 0);
+ (void) pckbc_cnattach(&ccp->cc_iot, IO_KBD, KBCMDP, 0);
if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
CTB_TURBOSLOT_TYPE_ISA)
diff --git a/sys/arch/amd64/amd64/wscons_machdep.c b/sys/arch/amd64/amd64/wscons_machdep.c
index 0ada759ddb5..4a9c6a6a7a2 100644
--- a/sys/arch/amd64/amd64/wscons_machdep.c
+++ b/sys/arch/amd64/amd64/wscons_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_machdep.c,v 1.8 2009/08/25 19:16:34 miod Exp $ */
+/* $OpenBSD: wscons_machdep.c,v 1.9 2010/11/23 04:07:55 shadchin Exp $ */
/*
* Copyright (c) 2001 Aaron Campbell
@@ -186,8 +186,8 @@ wscn_input_init(int pass)
}
#if (NPCKBC > 0)
- if (pass == 0 && pckbc_cnattach(X86_BUS_SPACE_IO, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT, 0) == 0)
+ if (pass == 0 &&
+ pckbc_cnattach(X86_BUS_SPACE_IO, IO_KBD, KBCMDP, 0) == 0)
return;
#endif
#if (NUKBD > 0)
diff --git a/sys/arch/i386/i386/wscons_machdep.c b/sys/arch/i386/i386/wscons_machdep.c
index 31648cbb9b6..d02cc724ce2 100644
--- a/sys/arch/i386/i386/wscons_machdep.c
+++ b/sys/arch/i386/i386/wscons_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_machdep.c,v 1.16 2009/08/25 19:16:36 miod Exp $ */
+/* $OpenBSD: wscons_machdep.c,v 1.17 2010/11/23 04:07:55 shadchin Exp $ */
/*
* Copyright (c) 2001 Aaron Campbell
@@ -185,8 +185,8 @@ wscn_input_init(int pass)
}
#if (NPCKBC > 0)
- if (pass == 0 && pckbc_cnattach(I386_BUS_SPACE_IO, IO_KBD, KBCMDP,
- PCKBC_KBD_SLOT, 0) == 0)
+ if (pass == 0 &&
+ pckbc_cnattach(I386_BUS_SPACE_IO, IO_KBD, KBCMDP, 0) == 0)
return;
#endif
#if (NUKBD > 0)
diff --git a/sys/arch/loongson/loongson/wscons_machdep.c b/sys/arch/loongson/loongson/wscons_machdep.c
index 6374b3157e2..5d4244d9728 100644
--- a/sys/arch/loongson/loongson/wscons_machdep.c
+++ b/sys/arch/loongson/loongson/wscons_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_machdep.c,v 1.8 2010/07/18 13:36:14 miod Exp $ */
+/* $OpenBSD: wscons_machdep.c,v 1.9 2010/11/23 04:07:55 shadchin Exp $ */
/*
* Copyright (c) 2010 Miodrag Vallat.
@@ -209,7 +209,7 @@ setup_kbd:
#if NPCKBC > 0
if (rc != 0)
rc = pckbc_cnattach(&bonito_pci_io_space_tag, IO_KBD,
- KBCMDP, PCKBC_KBD_SLOT, 0);
+ KBCMDP, 0);
#endif
#if NUKBD > 0
if (rc != 0)
diff --git a/sys/arch/sparc64/dev/pckbc_ebus.c b/sys/arch/sparc64/dev/pckbc_ebus.c
index e232507c6c5..264afe043f8 100644
--- a/sys/arch/sparc64/dev/pckbc_ebus.c
+++ b/sys/arch/sparc64/dev/pckbc_ebus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbc_ebus.c,v 1.11 2010/07/21 20:10:17 miod Exp $ */
+/* $OpenBSD: pckbc_ebus.c,v 1.12 2010/11/23 04:07:55 shadchin Exp $ */
/*
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -133,8 +133,7 @@ pckbc_ebus_attach(parent, self, aux)
if (console) {
if (pckbc_cnattach(sc->sc_iot,
- EBUS_PADDR_FROM_REG(&ea->ea_regs[0]), KBCMDP,
- PCKBC_KBD_SLOT, flags) == 0) {
+ EBUS_PADDR_FROM_REG(&ea->ea_regs[0]), KBCMDP, flags) == 0) {
t = &pckbc_consdata;
pckbc_console_attached = 1;
sc->sc_ioh_c = t->t_ioh_c;
diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c
index dd4a9fe6dd5..4dd50de8c34 100644
--- a/sys/dev/ic/pckbc.c
+++ b/sys/dev/ic/pckbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbc.c,v 1.26 2010/08/28 12:48:14 miod Exp $ */
+/* $OpenBSD: pckbc.c,v 1.27 2010/11/23 04:07:55 shadchin Exp $ */
/* $NetBSD: pckbc.c,v 1.5 2000/06/09 04:58:35 soda Exp $ */
/*
@@ -1014,7 +1014,7 @@ pckbcintr_internal(struct pckbc_internal *t, struct pckbc_softc *sc)
int
pckbc_cnattach(bus_space_tag_t iot, bus_addr_t addr, bus_size_t cmd_offset,
- pckbc_slot_t slot, int flags)
+ int flags)
{
bus_space_handle_t ioh_d, ioh_c;
int res = 0;
@@ -1048,7 +1048,7 @@ pckbc_cnattach(bus_space_tag_t iot, bus_addr_t addr, bus_size_t cmd_offset,
if (!res) {
#if (NPCKBD > 0)
- res = pckbd_cnattach(&pckbc_consdata, slot);
+ res = pckbd_cnattach(&pckbc_consdata, PCKBC_KBD_SLOT);
#else
res = ENXIO;
#endif /* NPCKBD > 0 */
@@ -1058,7 +1058,7 @@ pckbc_cnattach(bus_space_tag_t iot, bus_addr_t addr, bus_size_t cmd_offset,
bus_space_unmap(iot, pckbc_consdata.t_ioh_d, 1);
bus_space_unmap(iot, pckbc_consdata.t_ioh_c, 1);
} else {
- pckbc_consdata.t_slotdata[slot] = &pckbc_cons_slotdata;
+ pckbc_consdata.t_slotdata[PCKBC_KBD_SLOT] = &pckbc_cons_slotdata;
pckbc_init_slotdata(&pckbc_cons_slotdata);
pckbc_console = 1;
}
diff --git a/sys/dev/ic/pckbcvar.h b/sys/dev/ic/pckbcvar.h
index 0cf106b5980..60f732ecd08 100644
--- a/sys/dev/ic/pckbcvar.h
+++ b/sys/dev/ic/pckbcvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbcvar.h,v 1.9 2010/07/22 14:27:44 deraadt Exp $ */
+/* $OpenBSD: pckbcvar.h,v 1.10 2010/11/23 04:07:55 shadchin Exp $ */
/* $NetBSD: pckbcvar.h,v 1.4 2000/06/09 04:58:35 soda Exp $ */
/*
@@ -106,8 +106,7 @@ int pckbc_xt_translation(pckbc_tag_t, pckbc_slot_t, int);
void pckbc_slot_enable(pckbc_tag_t, pckbc_slot_t, int);
void pckbc_attach(struct pckbc_softc *, int);
-int pckbc_cnattach(bus_space_tag_t, bus_addr_t, bus_size_t,
- pckbc_slot_t, int);
+int pckbc_cnattach(bus_space_tag_t, bus_addr_t, bus_size_t, int);
int pckbc_is_console(bus_space_tag_t, bus_addr_t);
void pckbc_reset(struct pckbc_softc *);
int pckbcintr(void *);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 04:56:49 +0000