diff options
| author | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2010-11-23 04:07:56 +0000 |
|---|---|---|
| committer | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2010-11-23 04:07:56 +0000 |
| commit | 6c3fd4be2069e04c665d400d35dacfeb3188cd98 (patch) | |
| tree | 743a1be9fd70652f9dbd173a39eab3de133ef22e /sys/dev/ic | |
| parent | 4846dc5b38dce4b29e241b6320b4dac098e5e05f (diff) | |
removed slot argument of function pckbc_cnattach
because it is always PCKBC_KBD_SLOT
ok krw@, miod@
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/pckbc.c | 8 | ||||
| -rw-r--r-- | sys/dev/ic/pckbcvar.h | 5 |
2 files changed, 6 insertions, 7 deletions
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 *); |