On Mon, Nov 22, 2010 at 10:09:31PM +0500, Alexandr Shadchin wrote:
> removed slot argument of function pckbc_cnattach
> because it is always PCKBC_KBD_SLOT
>
> --
> Alexandr Shadchin
Seems reasonable to me, but this would be something miod@ will have to
comment on in case he has evil plans to use other values ...
.... Ken
>
> Index: arch/alpha/alpha/api_up1000.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/alpha/alpha/api_up1000.c,v
> retrieving revision 1.10
> diff -u -p -r1.10 api_up1000.c
> --- arch/alpha/alpha/api_up1000.c 26 Oct 2009 20:17:26 -0000 1.10
> +++ arch/alpha/alpha/api_up1000.c 22 Nov 2010 12:48:43 -0000
> @@ -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)
> Index: arch/alpha/alpha/dec_1000a.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/alpha/alpha/dec_1000a.c,v
> retrieving revision 1.6
> diff -u -p -r1.6 dec_1000a.c
> --- arch/alpha/alpha/dec_1000a.c 16 Jul 2008 20:03:20 -0000 1.6
> +++ arch/alpha/alpha/dec_1000a.c 22 Nov 2010 12:48:44 -0000
> @@ -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
> Index: arch/alpha/alpha/dec_2100_a50.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/alpha/alpha/dec_2100_a50.c,v
> retrieving revision 1.20
> diff -u -p -r1.20 dec_2100_a50.c
> --- arch/alpha/alpha/dec_2100_a50.c 24 Jul 2008 16:34:22 -0000 1.20
> +++ arch/alpha/alpha/dec_2100_a50.c 22 Nov 2010 12:48:44 -0000
> @@ -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)
> Index: arch/alpha/alpha/dec_550.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/alpha/alpha/dec_550.c,v
> retrieving revision 1.12
> diff -u -p -r1.12 dec_550.c
> --- arch/alpha/alpha/dec_550.c 26 Oct 2009 20:17:26 -0000 1.12
> +++ arch/alpha/alpha/dec_550.c 22 Nov 2010 12:48:44 -0000
> @@ -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)
> Index: arch/alpha/alpha/dec_6600.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/alpha/alpha/dec_6600.c,v
> retrieving revision 1.12
> diff -u -p -r1.12 dec_6600.c
> --- arch/alpha/alpha/dec_6600.c 26 Oct 2009 20:17:26 -0000 1.12
> +++ arch/alpha/alpha/dec_6600.c 22 Nov 2010 12:48:44 -0000
> @@ -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)
> Index: arch/alpha/alpha/dec_axppci_33.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/alpha/alpha/dec_axppci_33.c,v
> retrieving revision 1.21
> diff -u -p -r1.21 dec_axppci_33.c
> --- arch/alpha/alpha/dec_axppci_33.c 30 Jul 2009 21:39:13 -0000 1.21
> +++ arch/alpha/alpha/dec_axppci_33.c 22 Nov 2010 12:48:44 -0000
> @@ -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)
> Index: arch/alpha/alpha/dec_eb164.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/alpha/alpha/dec_eb164.c,v
> retrieving revision 1.17
> diff -u -p -r1.17 dec_eb164.c
> --- arch/alpha/alpha/dec_eb164.c 26 Oct 2009 20:17:26 -0000 1.17
> +++ arch/alpha/alpha/dec_eb164.c 22 Nov 2010 12:48:44 -0000
> @@ -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
> Index: arch/alpha/alpha/dec_eb64plus.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/alpha/alpha/dec_eb64plus.c,v
> retrieving revision 1.7
> diff -u -p -r1.7 dec_eb64plus.c
> --- arch/alpha/alpha/dec_eb64plus.c 16 Jul 2008 20:03:20 -0000 1.7
> +++ arch/alpha/alpha/dec_eb64plus.c 22 Nov 2010 12:48:44 -0000
> @@ -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)
> Index: arch/alpha/alpha/dec_kn20aa.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/alpha/alpha/dec_kn20aa.c,v
> retrieving revision 1.18
> diff -u -p -r1.18 dec_kn20aa.c
> --- arch/alpha/alpha/dec_kn20aa.c 16 Jul 2008 20:03:20 -0000 1.18
> +++ arch/alpha/alpha/dec_kn20aa.c 22 Nov 2010 12:48:44 -0000
> @@ -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)
> Index: arch/alpha/alpha/dec_kn300.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/alpha/alpha/dec_kn300.c,v
> retrieving revision 1.5
> diff -u -p -r1.5 dec_kn300.c
> --- arch/alpha/alpha/dec_kn300.c 30 Sep 2009 19:28:55 -0000 1.5
> +++ arch/alpha/alpha/dec_kn300.c 22 Nov 2010 12:48:44 -0000
> @@ -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)
> Index: arch/amd64/amd64/wscons_machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/amd64/amd64/wscons_machdep.c,v
> retrieving revision 1.8
> diff -u -p -r1.8 wscons_machdep.c
> --- arch/amd64/amd64/wscons_machdep.c 25 Aug 2009 19:16:34 -0000 1.8
> +++ arch/amd64/amd64/wscons_machdep.c 22 Nov 2010 12:48:44 -0000
> @@ -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)
> Index: arch/i386/i386/wscons_machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/i386/i386/wscons_machdep.c,v
> retrieving revision 1.16
> diff -u -p -r1.16 wscons_machdep.c
> --- arch/i386/i386/wscons_machdep.c 25 Aug 2009 19:16:36 -0000 1.16
> +++ arch/i386/i386/wscons_machdep.c 22 Nov 2010 12:48:45 -0000
> @@ -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)
> Index: arch/loongson/loongson/wscons_machdep.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/loongson/loongson/wscons_machdep.c,v
> retrieving revision 1.8
> diff -u -p -r1.8 wscons_machdep.c
> --- arch/loongson/loongson/wscons_machdep.c 18 Jul 2010 13:36:14 -0000
> 1.8
> +++ arch/loongson/loongson/wscons_machdep.c 22 Nov 2010 12:48:45 -0000
> @@ -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)
> Index: arch/sparc64/dev/pckbc_ebus.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/sparc64/dev/pckbc_ebus.c,v
> retrieving revision 1.11
> diff -u -p -r1.11 pckbc_ebus.c
> --- arch/sparc64/dev/pckbc_ebus.c 21 Jul 2010 20:10:17 -0000 1.11
> +++ arch/sparc64/dev/pckbc_ebus.c 22 Nov 2010 12:48:48 -0000
> @@ -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;
> Index: dev/ic/pckbc.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/ic/pckbc.c,v
> retrieving revision 1.26
> diff -u -p -r1.26 pckbc.c
> --- dev/ic/pckbc.c 28 Aug 2010 12:48:14 -0000 1.26
> +++ dev/ic/pckbc.c 22 Nov 2010 12:48:49 -0000
> @@ -1014,7 +1014,7 @@ pckbcintr_internal(struct pckbc_internal
>
> 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_
>
> 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_
> 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;
> }
> Index: dev/ic/pckbcvar.h
> ===================================================================
> RCS file: /cvs/src/sys/dev/ic/pckbcvar.h,v
> retrieving revision 1.9
> diff -u -p -r1.9 pckbcvar.h
> --- dev/ic/pckbcvar.h 22 Jul 2010 14:27:44 -0000 1.9
> +++ dev/ic/pckbcvar.h 22 Nov 2010 12:48:49 -0000
> @@ -106,8 +106,7 @@ int pckbc_xt_translation(pckbc_tag_t, pc
> 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 *);
