diff options
| author | kato <kato@FreeBSD.org> | 1999-05-10 09:37:37 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1999-05-10 09:37:37 +0000 |
| commit | 2f539e7c63c72fee3ccac7f325373bc3c02ec4b7 (patch) | |
| tree | 3a2021ee0d01adcdb8bc990a3eb9da9538fb694f | |
| parent | 207e053c4b28fe9c83aa45444f05c31ded18d09a (diff) | |
| download | FreeBSD-src-2f539e7c63c72fee3ccac7f325373bc3c02ec4b7.zip FreeBSD-src-2f539e7c63c72fee3ccac7f325373bc3c02ec4b7.tar.gz | |
Fixed for COM_MULTIPORT option. Members flags and unit should be
obtained via appropriate functions.
| -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 46da368..1819a2e 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 46da368..1819a2e 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); |
