diff options
| author | kato <kato@FreeBSD.org> | 1999-03-04 10:37:30 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1999-03-04 10:37:30 +0000 |
| commit | 7179175e4092295a5bc75c6f57cb2b2424bbd36e (patch) | |
| tree | 709fdf76e3602b7d815fe155c8d826f30ebd5e54 /sys/pc98 | |
| parent | 18785d877291fe205daa535f62bfc814efc77b6b (diff) | |
| download | FreeBSD-src-7179175e4092295a5bc75c6f57cb2b2424bbd36e.zip FreeBSD-src-7179175e4092295a5bc75c6f57cb2b2424bbd36e.tar.gz | |
Sync with sys/i386/isa/sio.c revision 1.229.
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/cbus/sio.c | 10 | ||||
| -rw-r--r-- | sys/pc98/pc98/sio.c | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index 9492ea3..07d8f11 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.80 1999/02/02 17:26:03 kato Exp $ + * $Id: sio.c,v 1.81 1999/02/05 11:37:40 kato Exp $ */ #include "opt_comconsole.h" @@ -1473,6 +1473,9 @@ sioattach(isdp) #ifdef COM_ESP Port_t *espp; #endif +#ifdef COM_MULTIPORT + struct isa_device *idev; +#endif Port_t iobase; int s; int unit; @@ -1762,8 +1765,9 @@ determined_type: ; if (unit == COM_MPMASTER(isdp)) printf(" master"); printf(")"); - com->no_irq = find_isadev(isa_devtab_tty, &siodriver, - COM_MPMASTER(isdp))->id_irq == 0; + idev = find_isadev(isa_devtab_tty, &siodriver, + COM_MPMASTER(isdp)); + com->no_irq = (idev == NULL || idev->id_irq == 0); } #endif /* COM_MULTIPORT */ #ifdef PC98 diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c index 9492ea3..07d8f11 100644 --- a/sys/pc98/pc98/sio.c +++ b/sys/pc98/pc98/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.80 1999/02/02 17:26:03 kato Exp $ + * $Id: sio.c,v 1.81 1999/02/05 11:37:40 kato Exp $ */ #include "opt_comconsole.h" @@ -1473,6 +1473,9 @@ sioattach(isdp) #ifdef COM_ESP Port_t *espp; #endif +#ifdef COM_MULTIPORT + struct isa_device *idev; +#endif Port_t iobase; int s; int unit; @@ -1762,8 +1765,9 @@ determined_type: ; if (unit == COM_MPMASTER(isdp)) printf(" master"); printf(")"); - com->no_irq = find_isadev(isa_devtab_tty, &siodriver, - COM_MPMASTER(isdp))->id_irq == 0; + idev = find_isadev(isa_devtab_tty, &siodriver, + COM_MPMASTER(isdp)); + com->no_irq = (idev == NULL || idev->id_irq == 0); } #endif /* COM_MULTIPORT */ #ifdef PC98 |
