diff options
| author | peter <peter@FreeBSD.org> | 1999-12-06 17:52:20 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-12-06 17:52:20 +0000 |
| commit | b0a0898508a414c3ae25d71a2ea3edc3aba1f534 (patch) | |
| tree | 53aec4d571e2ad3f3b8fff09a879d9aa851320a9 /sys/dev/sio | |
| parent | a5a19afa34a6e816121b0d3717b69cc33de82554 (diff) | |
| download | FreeBSD-src-b0a0898508a414c3ae25d71a2ea3edc3aba1f534.zip FreeBSD-src-b0a0898508a414c3ae25d71a2ea3edc3aba1f534.tar.gz | |
Fix a pair of silly warnings that I introduced (that would have been
nasty on an Alpha or some other sizeof(int) != sizeof(long) machine).
Diffstat (limited to 'sys/dev/sio')
| -rw-r--r-- | sys/dev/sio/sio.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index b9dac8c..af08d24 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -575,10 +575,7 @@ sioprobe(dev) intrmask_t irqs; u_char mcr_image; int result; -#ifdef COM_MULTIPORT - Port_t xiobase; -#endif - int xirq; + u_long xirq; u_int flags = device_get_flags(dev); int rid; struct resource *port; @@ -638,14 +635,17 @@ sioprobe(dev) mcr_image = MCR_IENABLE; #ifdef COM_MULTIPORT if (COM_ISMULTIPORT(flags) && !COM_NOTAST4(flags)) { + Port_t xiobase; + u_long io; + idev = devclass_get_device(sio_devclass, COM_MPMASTER(flags)); if (idev == NULL) { printf("sio%d: master device %d not configured\n", device_get_unit(dev), COM_MPMASTER(flags)); idev = dev; } - if (bus_get_resource(idev, SYS_RES_IOPORT, 0, &xiobase, - NULL) == 0) { + if (bus_get_resource(idev, SYS_RES_IOPORT, 0, &io, NULL) == 0) { + xiobase = io; if (bus_get_resource(idev, SYS_RES_IRQ, 0, NULL, NULL)) outb(xiobase + com_scr, 0x80); /* no irq */ else @@ -809,7 +809,7 @@ sioprobe(dev) if (bus_get_resource(idev, SYS_RES_IRQ, 0, &xirq, NULL) == 0 && ((1 << xirq) & irqs) == 0) printf( - "sio%d: configured irq %d not in bitmap of probed irqs %#x\n", + "sio%d: configured irq %ld not in bitmap of probed irqs %#x\n", device_get_unit(dev), xirq, irqs); if (bootverbose) printf("sio%d: irq maps: %#x %#x %#x %#x\n", |
