summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2013-01-11 23:42:24 +0000
committerimp <imp@FreeBSD.org>2013-01-11 23:42:24 +0000
commit57290bbe8a21fcf1085e08133b845f62278f13e7 (patch)
tree3198ebb52f2c27ad26f7f0b96cad974ba19224c4 /sys
parentae7a101bcb09bdb778b58981b276e035cfedc577 (diff)
downloadFreeBSD-src-57290bbe8a21fcf1085e08133b845f62278f13e7.zip
FreeBSD-src-57290bbe8a21fcf1085e08133b845f62278f13e7.tar.gz
MFi386: Make similar changes that were made to atkbdc in r245315.
Diffstat (limited to 'sys')
-rw-r--r--sys/pc98/cbus/pckbd.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/sys/pc98/cbus/pckbd.c b/sys/pc98/cbus/pckbd.c
index 5efb983..e424294 100644
--- a/sys/pc98/cbus/pckbd.c
+++ b/sys/pc98/cbus/pckbd.c
@@ -77,9 +77,9 @@ DRIVER_MODULE(pckbd, isa, pckbd_driver, pckbd_devclass, 0, 0);
static bus_addr_t pckbd_iat[] = {0, 2};
-static int pckbd_probe_unit(int unit, int port, int irq,
+static int pckbd_probe_unit(device_t dev, int port, int irq,
int flags);
-static int pckbd_attach_unit(int unit, keyboard_t **kbd,
+static int pckbd_attach_unit(device_t dev, keyboard_t **kbd,
int port, int irq, int flags);
static timeout_t pckbd_timeout;
@@ -103,7 +103,7 @@ pckbdprobe(device_t dev)
return ENXIO;
isa_load_resourcev(res, pckbd_iat, 2);
- error = pckbd_probe_unit(device_get_unit(dev),
+ error = pckbd_probe_unit(dev,
isa_get_port(dev),
(1 << isa_get_irq(dev)),
device_get_flags(dev));
@@ -128,7 +128,7 @@ pckbdattach(device_t dev)
return ENXIO;
isa_load_resourcev(res, pckbd_iat, 2);
- error = pckbd_attach_unit(device_get_unit(dev), &kbd,
+ error = pckbd_attach_unit(dev, &kbd,
isa_get_port(dev),
(1 << isa_get_irq(dev)),
device_get_flags(dev));
@@ -164,7 +164,7 @@ pckbd_isa_intr(void *arg)
}
static int
-pckbd_probe_unit(int unit, int port, int irq, int flags)
+pckbd_probe_unit(device_t dev, int port, int irq, int flags)
{
keyboard_switch_t *sw;
int args[2];
@@ -176,24 +176,26 @@ pckbd_probe_unit(int unit, int port, int irq, int flags)
args[0] = port;
args[1] = irq;
- error = (*sw->probe)(unit, args, flags);
+ error = (*sw->probe)(device_get_unit(dev), args, flags);
if (error)
return error;
return 0;
}
static int
-pckbd_attach_unit(int unit, keyboard_t **kbd, int port, int irq, int flags)
+pckbd_attach_unit(device_t dev, keyboard_t **kbd, int port, int irq, int flags)
{
keyboard_switch_t *sw;
int args[2];
int error;
+ int unit;
sw = kbd_get_switch(DRIVER_NAME);
if (sw == NULL)
return ENXIO;
/* reset, initialize and enable the device */
+ unit = device_get_unit(dev);
args[0] = port;
args[1] = irq;
*kbd = NULL;
OpenPOWER on IntegriCloud