summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1997-05-18 21:19:04 +0000
committerphk <phk@FreeBSD.org>1997-05-18 21:19:04 +0000
commitbdc03328fb3be75298cc4bbb26ac2030cc3b541c (patch)
treeca9e4ee6e98bf582a126a796703b7114309533d6 /sys/dev
parent051d52fdad2544e1ad6604da5d137fe0d6bab7bd (diff)
downloadFreeBSD-src-bdc03328fb3be75298cc4bbb26ac2030cc3b541c.zip
FreeBSD-src-bdc03328fb3be75298cc4bbb26ac2030cc3b541c.tar.gz
Flags 0x1000 on sio now disables the dreaded test#3.
PR: 3395
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/sio/sio.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index d31ded2..5bb3262 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
- * $Id: sio.c,v 1.164 1997/04/26 11:46:06 peter Exp $
+ * $Id: sio.c,v 1.165 1997/05/18 20:53:52 phk Exp $
*/
#include "opt_comconsole.h"
@@ -120,6 +120,7 @@
#define COM_LOSESOUTINTS(dev) ((dev)->id_flags & 0x08)
#define COM_NOFIFO(dev) ((dev)->id_flags & 0x02)
#define COM_VERBOSE(dev) ((dev)->id_flags & 0x80)
+#define COM_NOTST3(dev) ((dev)->id_flags & 0x1000)
#define com_scr 7 /* scratch register for 16450-16550 (R/W) */
@@ -659,7 +660,7 @@ sioprobe(dev)
failures[1] = inb(iobase + com_ier) - IER_ETXRDY;
failures[2] = inb(iobase + com_mcr) - mcr_image;
DELAY(10000); /* Some internal modems need this time */
- if (idev->id_irq != 0)
+ if (idev->id_irq != 0 && !COM_NOTST3(idev))
failures[3] = isa_irq_pending(idev) ? 0 : 1;
failures[4] = (inb(iobase + com_iir) & IIR_IMASK) - IIR_TXRDY;
DELAY(1000); /* XXX */
OpenPOWER on IntegriCloud