diff options
| author | bde <bde@FreeBSD.org> | 1995-07-22 16:45:22 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1995-07-22 16:45:22 +0000 |
| commit | 35509aece996a3270a9b30cb7e72b84ed7f0415c (patch) | |
| tree | 8394b2b46acc5c94b577982d2fdb4c9fa0e24167 /sys/dev/sio | |
| parent | 18829b9aef82ca3456ff7f260ef55cd9c71e4e18 (diff) | |
| download | FreeBSD-src-35509aece996a3270a9b30cb7e72b84ed7f0415c.zip FreeBSD-src-35509aece996a3270a9b30cb7e72b84ed7f0415c.tar.gz | |
Obtained from: partly from ancient patches of mine via 1.1.5
Give names to the magic tty i/o sleep addresses and use them. This makes
it easier to remember what the addresses are for and to keep them unique.
Diffstat (limited to 'sys/dev/sio')
| -rw-r--r-- | sys/dev/sio/sio.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 39683e9..fd30f74 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.103 1995/07/21 22:51:34 bde Exp $ + * $Id: sio.c,v 1.104 1995/07/22 01:30:02 bde Exp $ */ #include "sio.h" @@ -66,12 +66,6 @@ #include <i386/isa/sioreg.h> #include <i386/isa/ic/ns16550.h> -/* - * XXX temporary kludges for 2.0 (XXX TK2.0). - */ -#define TSA_CARR_ON(tp) ((void *)&(tp)->t_rawq) -#define TSA_OCOMPLETE(tp) ((void *)&(tp)->t_outq) - #define LOTS_OF_EVENTS 64 /* helps separate urgent events from input */ #define RB_I_HIGH_WATER (TTYHOG - 2 * RS_IBUFSIZE) #define RS_IBUFSIZE 256 @@ -307,7 +301,7 @@ static u_int com_events; /* input chars + weighted output completions */ static int commajor; static int sio_timeout; static int sio_timeouts_until_log; -#if 0 /* XXX TK2.0 */ +#if 0 /* XXX */ static struct tty *sio_tty[NSIO]; #else static struct tty sio_tty[NSIO]; @@ -779,7 +773,7 @@ sioopen(dev, flag, mode, p) return (ENXIO); if (mynor & CONTROL_MASK) return (0); -#if 0 /* XXX TK2.0 */ +#if 0 /* XXX */ tp = com->tp = sio_tty[unit] = ttymalloc(sio_tty[unit]); #else tp = com->tp = &sio_tty[unit]; @@ -1714,7 +1708,7 @@ retry: enable_intr(); while ((inb(com->line_status_port) & (LSR_TSRE | LSR_TXRDY)) != (LSR_TSRE | LSR_TXRDY)) { - error = ttysleep(tp, TSA_OCOMPLETE(tp), TTIPRI | PCATCH, + error = ttysleep(tp, TSA_OLOWAT(tp), TTIPRI | PCATCH, "siotx", hz / 100); if ( txtimeout != 0 && (!error || error == EAGAIN) |
