system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-30 05:36:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Flags 0x1000 on sio now disables the dreaded test#3.

Browse source 
PR:		3395
This commit is contained in:
Poul-Henning Kamp 1997-05-18 21:19:04 +00:00
parent 8463cf03a9
commit e12ca851a6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=25898
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sys/dev/sio/sio.c
View file

@ -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 */

5
sys/i386/isa/sio.c
View file

@ -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 */

5
sys/isa/sio.c
View file

@ -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 */