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

Merged from sys/dev/sio/sio.c revisions from 1.360 to 1.362.

Browse Source
This commit is contained in:
Yoshihiro Takahashi 2002-01-18 03:30:22 +00:00
parent 403eaa1e44
commit afaabc227f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=89485
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/pc98/cbus/sio.c
View File

@ -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;
}
}

8
sys/pc98/pc98/sio.c
View File

@ -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;
}
}