d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allocate all resources using keyboard controller.

Browse Source
This commit is contained in:
Yoshihiro Takahashi 2001-06-17 04:43:28 +00:00
parent 844518ff93
commit 3d1421a7f8
2 changed files with 74 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
sys/pc98/cbus/pckbd.c
View File

@ -74,6 +74,8 @@ static driver_t pckbd_driver = {
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,
int flags);
static int pckbd_attach_unit(int unit, keyboard_t **kbd,
@ -84,14 +86,30 @@ static timeout_t pckbd_timeout;
static int
pckbdprobe(device_t dev)
{
struct resource *res;
int error, rid;
/* Check isapnp ids */
if (isa_get_vendorid(dev))
return (ENXIO);
device_set_desc(dev, "PC-98 Keyboard");
return pckbd_probe_unit(device_get_unit(dev), isa_get_port(dev),
(1 << isa_get_irq(dev)), device_get_flags(dev));
rid = 0;
res = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &rid, pckbd_iat, 2,
RF_ACTIVE);
if (res == NULL)
return ENXIO;
isa_load_resourcev(res, pckbd_iat, 2);
error = pckbd_probe_unit(device_get_unit(dev),
isa_get_port(dev),
(1 << isa_get_irq(dev)),
device_get_flags(dev));
bus_release_resource(dev, SYS_RES_IOPORT, rid, res);
return (error);
}
static int
@ -100,15 +118,26 @@ pckbdattach(device_t dev)
keyboard_t *kbd;
void *ih;
struct resource *res;
int zero = 0;
int error, rid;
pckbd_attach_unit(device_get_unit(dev), &kbd, isa_get_port(dev),
(1 << isa_get_irq(dev)), device_get_flags(dev));
rid = 0;
res = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &rid, pckbd_iat, 2,
RF_ACTIVE);
if (res == NULL)
return ENXIO;
isa_load_resourcev(res, pckbd_iat, 2);
res = bus_alloc_resource(dev, SYS_RES_IRQ, &zero, 0ul, ~0ul, 1,
RF_SHAREABLE | RF_ACTIVE);
error = pckbd_attach_unit(device_get_unit(dev), &kbd,
isa_get_port(dev),
(1 << isa_get_irq(dev)),
device_get_flags(dev));
rid = 0;
res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, RF_ACTIVE);
if (res == NULL)
return ENXIO;
BUS_SETUP_INTR(device_get_parent(dev), dev, res, INTR_TYPE_TTY,
pckbd_isa_intr, kbd, &ih);
pckbd_isa_intr, kbd, &ih);
return (0);
}

45
sys/pc98/pc98/pc98kbd.c
View File

@ -74,6 +74,8 @@ static driver_t pckbd_driver = {
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,
int flags);
static int pckbd_attach_unit(int unit, keyboard_t **kbd,
@ -84,14 +86,30 @@ static timeout_t pckbd_timeout;
static int
pckbdprobe(device_t dev)
{
struct resource *res;
int error, rid;
/* Check isapnp ids */
if (isa_get_vendorid(dev))
return (ENXIO);
device_set_desc(dev, "PC-98 Keyboard");
return pckbd_probe_unit(device_get_unit(dev), isa_get_port(dev),
(1 << isa_get_irq(dev)), device_get_flags(dev));
rid = 0;
res = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &rid, pckbd_iat, 2,
RF_ACTIVE);
if (res == NULL)
return ENXIO;
isa_load_resourcev(res, pckbd_iat, 2);
error = pckbd_probe_unit(device_get_unit(dev),
isa_get_port(dev),
(1 << isa_get_irq(dev)),
device_get_flags(dev));
bus_release_resource(dev, SYS_RES_IOPORT, rid, res);
return (error);
}
static int
@ -100,15 +118,26 @@ pckbdattach(device_t dev)
keyboard_t *kbd;
void *ih;
struct resource *res;
int zero = 0;
int error, rid;
pckbd_attach_unit(device_get_unit(dev), &kbd, isa_get_port(dev),
(1 << isa_get_irq(dev)), device_get_flags(dev));
rid = 0;
res = isa_alloc_resourcev(dev, SYS_RES_IOPORT, &rid, pckbd_iat, 2,
RF_ACTIVE);
if (res == NULL)
return ENXIO;
isa_load_resourcev(res, pckbd_iat, 2);
res = bus_alloc_resource(dev, SYS_RES_IRQ, &zero, 0ul, ~0ul, 1,
RF_SHAREABLE | RF_ACTIVE);
error = pckbd_attach_unit(device_get_unit(dev), &kbd,
isa_get_port(dev),
(1 << isa_get_irq(dev)),
device_get_flags(dev));
rid = 0;
res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, RF_ACTIVE);
if (res == NULL)
return ENXIO;
BUS_SETUP_INTR(device_get_parent(dev), dev, res, INTR_TYPE_TTY,
pckbd_isa_intr, kbd, &ih);
pckbd_isa_intr, kbd, &ih);
return (0);
}