summaryrefslogtreecommitdiffstats
path: root/sys/pc98
diff options
context:
space:
mode:
authornyan <nyan@FreeBSD.org>2002-01-18 03:30:22 +0000
committernyan <nyan@FreeBSD.org>2002-01-18 03:30:22 +0000
commit8ecdb14a693e0f546976f3765fdc39ea03a75670 (patch)
treeab35367be3255ee3c8f79c2fd085ae4dcf71e465 /sys/pc98
parent26e43e11761e110071c03758806cda4a248c44b6 (diff)
downloadFreeBSD-src-8ecdb14a693e0f546976f3765fdc39ea03a75670.zip
FreeBSD-src-8ecdb14a693e0f546976f3765fdc39ea03a75670.tar.gz
Merged from sys/dev/sio/sio.c revisions from 1.360 to 1.362.
Diffstat (limited to 'sys/pc98')
-rw-r--r--sys/pc98/cbus/sio.c8
-rw-r--r--sys/pc98/pc98/sio.c8
2 files changed, 12 insertions, 4 deletions
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index e90704d..8a88bc9 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -1336,10 +1336,14 @@ sioprobe(dev, xrid, noprobe)
irqs = irqmap[1] & ~irqmap[0];
if (bus_get_resource(idev, SYS_RES_IRQ, 0, &xirq, NULL) == 0 &&
- ((1 << xirq) & irqs) == 0)
+ ((1 << xirq) & irqs) == 0) {
printf(
"sio%d: configured irq %ld not in bitmap of probed irqs %#x\n",
device_get_unit(dev), xirq, irqs);
+ printf(
+ "sio%d: port may not be enabled\n",
+ device_get_unit(dev));
+ }
if (bootverbose)
printf("sio%d: irq maps: %#x %#x %#x %#x\n",
device_get_unit(dev),
@@ -1645,7 +1649,7 @@ sioattach(dev, xrid)
scr2 = sio_getreg(com, com_scr);
sio_setreg(com, com_scr, scr);
if (scr1 != 0xa5 || scr2 != 0x5a) {
- printf(" 8250");
+ printf(" 8250 or not responding");
goto determined_type;
}
}
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index e90704d..8a88bc9 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -1336,10 +1336,14 @@ sioprobe(dev, xrid, noprobe)
irqs = irqmap[1] & ~irqmap[0];
if (bus_get_resource(idev, SYS_RES_IRQ, 0, &xirq, NULL) == 0 &&
- ((1 << xirq) & irqs) == 0)
+ ((1 << xirq) & irqs) == 0) {
printf(
"sio%d: configured irq %ld not in bitmap of probed irqs %#x\n",
device_get_unit(dev), xirq, irqs);
+ printf(
+ "sio%d: port may not be enabled\n",
+ device_get_unit(dev));
+ }
if (bootverbose)
printf("sio%d: irq maps: %#x %#x %#x %#x\n",
device_get_unit(dev),
@@ -1645,7 +1649,7 @@ sioattach(dev, xrid)
scr2 = sio_getreg(com, com_scr);
sio_setreg(com, com_scr, scr);
if (scr1 != 0xa5 || scr2 != 0x5a) {
- printf(" 8250");
+ printf(" 8250 or not responding");
goto determined_type;
}
}
OpenPOWER on IntegriCloud