diff options
| author | nyan <nyan@FreeBSD.org> | 2002-06-24 15:24:42 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2002-06-24 15:24:42 +0000 |
| commit | 2c118c5fbb54255f62669f4b9782f73c2816e6ae (patch) | |
| tree | e48324307027a6e61d7072f8d3bbeb3f2b3e099b /sys | |
| parent | 6a9fad4558387890f75b98893b8ac1094d3598db (diff) | |
| download | FreeBSD-src-2c118c5fbb54255f62669f4b9782f73c2816e6ae.zip FreeBSD-src-2c118c5fbb54255f62669f4b9782f73c2816e6ae.tar.gz | |
Merged from sys/dev/sio/sio.c revisions 1.376 and 1.377.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/pc98/cbus/sio.c | 10 | ||||
| -rw-r--r-- | sys/pc98/pc98/sio.c | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index 1f3e8f3..e2f6916 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -4270,11 +4270,13 @@ siocnattach(port, speed) u_char cfcr; u_int divisor; struct siocnstate sp; + int unit = 0; /* XXX random value! */ siocniobase = port; + siocnunit = unit; comdefaultrate = speed; sio_consdev.cn_pri = CN_NORMAL; - sio_consdev.cn_dev = makedev(CDEV_MAJOR, 0); + sio_consdev.cn_dev = makedev(CDEV_MAJOR, unit); s = spltty(); @@ -4310,7 +4312,7 @@ siogdbattach(port, speed) u_char cfcr; u_int divisor; struct siocnstate sp; - int unit = 1; /* XXX !!! */ + int unit = 1; /* XXX random value! */ siogdbiobase = port; gdbdefaultrate = speed; @@ -4448,7 +4450,7 @@ siogdbgetc() int s; struct siocnstate sp; - if (minor(dev) == siocnunit) { + if (siogdbunit == siocnunit) { iobase = siocniobase; speed = comdefaultrate; } else { @@ -4475,7 +4477,7 @@ siogdbputc(c) int s; struct siocnstate sp; - if (minor(dev) == siocnunit) { + if (siogdbunit == siocnunit) { iobase = siocniobase; speed = comdefaultrate; } else { diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c index 1f3e8f3..e2f6916 100644 --- a/sys/pc98/pc98/sio.c +++ b/sys/pc98/pc98/sio.c @@ -4270,11 +4270,13 @@ siocnattach(port, speed) u_char cfcr; u_int divisor; struct siocnstate sp; + int unit = 0; /* XXX random value! */ siocniobase = port; + siocnunit = unit; comdefaultrate = speed; sio_consdev.cn_pri = CN_NORMAL; - sio_consdev.cn_dev = makedev(CDEV_MAJOR, 0); + sio_consdev.cn_dev = makedev(CDEV_MAJOR, unit); s = spltty(); @@ -4310,7 +4312,7 @@ siogdbattach(port, speed) u_char cfcr; u_int divisor; struct siocnstate sp; - int unit = 1; /* XXX !!! */ + int unit = 1; /* XXX random value! */ siogdbiobase = port; gdbdefaultrate = speed; @@ -4448,7 +4450,7 @@ siogdbgetc() int s; struct siocnstate sp; - if (minor(dev) == siocnunit) { + if (siogdbunit == siocnunit) { iobase = siocniobase; speed = comdefaultrate; } else { @@ -4475,7 +4477,7 @@ siogdbputc(c) int s; struct siocnstate sp; - if (minor(dev) == siocnunit) { + if (siogdbunit == siocnunit) { iobase = siocniobase; speed = comdefaultrate; } else { |
