summaryrefslogtreecommitdiffstats
path: root/sys/dev/cy
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1995-07-22 16:45:22 +0000
committerbde <bde@FreeBSD.org>1995-07-22 16:45:22 +0000
commit35509aece996a3270a9b30cb7e72b84ed7f0415c (patch)
tree8394b2b46acc5c94b577982d2fdb4c9fa0e24167 /sys/dev/cy
parent18829b9aef82ca3456ff7f260ef55cd9c71e4e18 (diff)
downloadFreeBSD-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/cy')
-rw-r--r--sys/dev/cy/cy.c11
-rw-r--r--sys/dev/cy/cy_isa.c11
2 files changed, 6 insertions, 16 deletions
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 338abb1..20737bf 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: cy.c,v 1.9 1995/07/21 22:51:31 bde Exp $
+ * $Id: cy.c,v 1.10 1995/07/22 01:29:58 bde Exp $
*/
#include "cy.h"
@@ -151,11 +151,6 @@
#define CD1400_xIVR_CHAN_SHIFT 3
#define CD1400_xIVR_CHAN 0x0F /* XXX reduce to pack Cyclom-8Ys */
-/*
- * XXX temporary kludges for 2.0 (XXX TK2.0).
- */
-#define TSA_CARR_ON(tp) ((void *)&(tp)->t_rawq)
-
#define LOTS_OF_EVENTS 64 /* helps separate urgent events from input */
#define RB_I_HIGH_WATER (TTYHOG - 2 * RS_IBUFSIZE)
#define RS_IBUFSIZE 256
@@ -396,7 +391,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];
@@ -622,7 +617,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];
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 338abb1..20737bf 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: cy.c,v 1.9 1995/07/21 22:51:31 bde Exp $
+ * $Id: cy.c,v 1.10 1995/07/22 01:29:58 bde Exp $
*/
#include "cy.h"
@@ -151,11 +151,6 @@
#define CD1400_xIVR_CHAN_SHIFT 3
#define CD1400_xIVR_CHAN 0x0F /* XXX reduce to pack Cyclom-8Ys */
-/*
- * XXX temporary kludges for 2.0 (XXX TK2.0).
- */
-#define TSA_CARR_ON(tp) ((void *)&(tp)->t_rawq)
-
#define LOTS_OF_EVENTS 64 /* helps separate urgent events from input */
#define RB_I_HIGH_WATER (TTYHOG - 2 * RS_IBUFSIZE)
#define RS_IBUFSIZE 256
@@ -396,7 +391,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];
@@ -622,7 +617,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];
OpenPOWER on IntegriCloud