summaryrefslogtreecommitdiffstats
path: root/sys/dev/sio
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1993-09-28 00:01:18 +0000
committerjkh <jkh@FreeBSD.org>1993-09-28 00:01:18 +0000
commit49b312bb925b10ad6fb0498308b3ebaf466e4052 (patch)
treea5adea3ca60ca9c36606d6a6fdc97d3824feee92 /sys/dev/sio
parenta7deae3c0f824b13c5b3cc74bf7b5499f72c811b (diff)
downloadFreeBSD-src-49b312bb925b10ad6fb0498308b3ebaf466e4052.zip
FreeBSD-src-49b312bb925b10ad6fb0498308b3ebaf466e4052.tar.gz
Change to sio for recognising the last serial port on a multiport
card correctly. Updated syscons to 0.2e, added features for upcoming XFree86 2.0, fixed crashbug.
Diffstat (limited to 'sys/dev/sio')
-rw-r--r--sys/dev/sio/sio.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index a51e58c..0dbb439 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -41,7 +41,7 @@
* into the patch kit. Added in sioselect
* from com.c. Added port 4 support.
*/
-static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys/i386/isa/sio.c,v 1.7 1993/09/08 17:38:05 rgrimes Exp $";
+static char rcsid[] = "$Header: /a/cvs/386BSD/src/sys/i386/isa/sio.c,v 1.8 1993/09/10 16:59:16 rgrimes Exp $";
#include "sio.h"
#if NSIO > 0
@@ -467,8 +467,12 @@ sioattach(isdp)
scr2 = inb(iobase + com_scr);
outb(iobase + com_scr, scr);
printf("sio%d: type", unit);
+#ifdef COM_MULTIPORT
+ if (0);
+#else
if (scr1 != 0xa5 || scr2 != 0x5a)
printf(" <8250>");
+#endif
else {
outb(iobase + com_fifo, FIFO_ENABLE | FIFO_TRIGGER_14);
DELAY(100);
OpenPOWER on IntegriCloud