diff options
author | Poul-Henning Kamp <phk@FreeBSD.org> | 1997-05-18 21:19:04 +0000 |
---|---|---|
committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1997-05-18 21:19:04 +0000 |
commit | e12ca851a6e7673efcb1b121c0d33abb7d2192ad (patch) | |
tree | b70da3167afcaa6545c5c74c1ef17305bd46c488 | |
parent | 8463cf03a913c1837ab4460892712678e54be2db (diff) | |
download | src-e12ca851a6e7673efcb1b121c0d33abb7d2192ad.tar.gz src-e12ca851a6e7673efcb1b121c0d33abb7d2192ad.zip |
Flags 0x1000 on sio now disables the dreaded test#3.
PR: 3395
Notes
Notes:
svn path=/head/; revision=25898
-rw-r--r-- | sys/dev/sio/sio.c | 5 | ||||
-rw-r--r-- | sys/i386/isa/sio.c | 5 | ||||
-rw-r--r-- | sys/isa/sio.c | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index d31ded23e103..5bb3262ece20 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 */ diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c index d31ded23e103..5bb3262ece20 100644 --- a/sys/i386/isa/sio.c +++ b/sys/i386/isa/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 */ diff --git a/sys/isa/sio.c b/sys/isa/sio.c index d31ded23e103..5bb3262ece20 100644 --- a/sys/isa/sio.c +++ b/sys/isa/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 */ |