summaryrefslogtreecommitdiffstats
path: root/sys/pc98/cbus/sio.c
diff options
context:
space:
mode:
authornyan <nyan@FreeBSD.org>2003-08-02 09:41:31 +0000
committernyan <nyan@FreeBSD.org>2003-08-02 09:41:31 +0000
commit545a2236aefe60062736c1131614210dba7f44b5 (patch)
tree9299a6adad8656401436ad10063b92d81e98d64a /sys/pc98/cbus/sio.c
parente1e146913d8055d39386b57bb361a14ae5d879bb (diff)
downloadFreeBSD-src-545a2236aefe60062736c1131614210dba7f44b5.zip
FreeBSD-src-545a2236aefe60062736c1131614210dba7f44b5.tar.gz
Merged from sys/dev/sio/sio.c revision 1.400.
Diffstat (limited to 'sys/pc98/cbus/sio.c')
-rw-r--r--sys/pc98/cbus/sio.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 03f5041..c1cecb4 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -353,8 +353,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
@@ -784,7 +785,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);
@@ -1487,6 +1489,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;
OpenPOWER on IntegriCloud