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

Track the resource id of the memory port instead of just assuming that

Browse Source 
it is 0x0.  Cardbus-based sio/modem cards can now be ejected without
panic'ing.
This commit is contained in:
Scott Long 2003-06-09 21:25:14 +00:00
parent 824de7507e
commit 87947cad18
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/sio/sio.c
View File

@ -265,8 +265,9 @@ struct com_s {
struct resource *irqres;
struct resource *ioportres;
void *cookie;
dev_t devs[6];
int ioportrid;
void *cookie;
dev_t devs[6];
/*
* Data area for output buffers. Someday we should build the output
@ -448,7 +449,8 @@ siodetach(dev)
bus_release_resource(dev, SYS_RES_IRQ, 0, com->irqres);
}
if (com->ioportres)
bus_release_resource(dev, SYS_RES_IOPORT, 0, com->ioportres);
bus_release_resource(dev, SYS_RES_IOPORT, com->ioportrid,
com->ioportres);
if (com->tp && (com->tp->t_state & TS_ISOPEN)) {
device_printf(dev, "still open, forcing close\n");
(*linesw[com->tp->t_line].l_close)(com->tp, 0);
@ -931,6 +933,7 @@ sioattach(dev, xrid, rclk)
bzero(com, sizeof *com);
com->unit = unit;
com->ioportres = port;
com->ioportrid = rid;
com->bst = rman_get_bustag(port);
com->bsh = rman_get_bushandle(port);
com->cfcr_image = CFCR_8BITS;