diff options
| author | KATO Takenori <kato@FreeBSD.org> | 1999-05-10 09:37:37 +0000 |
|---|---|---|
| committer | KATO Takenori <kato@FreeBSD.org> | 1999-05-10 09:37:37 +0000 |
| commit | f77f865c0f0a8d8dfd422f616da30a51d180bd42 (patch) | |
| tree | fbdadc6028583c25e6c5dd70303ccba923852ebf | |
| parent | 871d777f45e679af3e2f6ff5f71249ed52ddb19c (diff) | |
Notes
| -rw-r--r-- | sys/pc98/cbus/sio.c | 5 | ||||
| -rw-r--r-- | sys/pc98/pc98/sio.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index 46da36806f1b..1819a2e3cce1 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sio.c,v 1.93 1999/05/09 13:00:48 phk Exp $ + * $Id: sio.c,v 1.94 1999/05/10 09:14:40 kato Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -4972,7 +4972,8 @@ pc98_check_if_type(device_t dev, struct siodev *iod) } else { irr = if_16550a_type[if_type].irr_read; #ifdef COM_MULTIPORT - if (!COM_ISMULTIPORT(dev) || dev->id_unit == COM_MPMASTER(dev)) + if (!COM_ISMULTIPORT(isa_get_flags(dev)) || + device_get_unit(dev) == COM_MPMASTER(isa_get_flags(dev))) #endif if (irr != -1) { tmp = inb(io | irr); diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c index 46da36806f1b..1819a2e3cce1 100644 --- a/sys/pc98/pc98/sio.c +++ b/sys/pc98/pc98/sio.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sio.c,v 1.93 1999/05/09 13:00:48 phk Exp $ + * $Id: sio.c,v 1.94 1999/05/10 09:14:40 kato Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -4972,7 +4972,8 @@ pc98_check_if_type(device_t dev, struct siodev *iod) } else { irr = if_16550a_type[if_type].irr_read; #ifdef COM_MULTIPORT - if (!COM_ISMULTIPORT(dev) || dev->id_unit == COM_MPMASTER(dev)) + if (!COM_ISMULTIPORT(isa_get_flags(dev)) || + device_get_unit(dev) == COM_MPMASTER(isa_get_flags(dev))) #endif if (irr != -1) { tmp = inb(io | irr); |