From 1853ec1bdb135555d58f6248f490bc10c23c08f0 Mon Sep 17 00:00:00 2001
From: Artur Grabowski <art@cvs.openbsd.org>
Date: Thu, 5 Jul 2001 10:12:29 +0000
Subject: Get rid of REAL_CLISTS. It was never implemented and the tentacles
 are everywhhere.

---
 sys/kern/init_main.c | 10 +---------
 sys/kern/tty.c       | 25 +------------------------
 sys/kern/tty_subr.c  |  5 +----
 3 files changed, 3 insertions(+), 37 deletions(-)

(limited to 'sys/kern')

diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 697165d9149..61f2ade8124 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init_main.c,v 1.71 2001/06/27 07:16:28 art Exp $	*/
+/*	$OpenBSD: init_main.c,v 1.72 2001/07/05 10:12:24 art Exp $	*/
 /*	$NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $	*/
 
 /*
@@ -60,9 +60,6 @@
 #include <sys/tty.h>
 #include <sys/conf.h>
 #include <sys/buf.h>
-#ifdef REAL_CLISTS
-#include <sys/clist.h>
-#endif
 #include <sys/device.h>
 #include <sys/protosw.h>
 #include <sys/reboot.h>
@@ -321,11 +318,6 @@ main(framep)
 	/* Start real time and statistics clocks. */
 	initclocks();
 
-#ifdef REAL_CLISTS
-	/* Initialize clists. */
-	clist_init();
-#endif
-
 #ifdef SYSVSHM
 	/* Initialize System V style shared memory. */
 	shminit();
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index de2eccad18b..15ea3c84d5b 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tty.c,v 1.44 2001/05/14 07:15:33 angelos Exp $	*/
+/*	$OpenBSD: tty.c,v 1.45 2001/07/05 10:12:24 art Exp $	*/
 /*	$NetBSD: tty.c,v 1.68.4.2 1996/06/06 16:04:52 thorpej Exp $	*/
 
 /*-
@@ -80,9 +80,6 @@ void 	filt_ttywdetach __P((struct knote *kn));
 char ttclos[]	= "ttycls";
 char ttopen[]	= "ttyopn";
 char ttybg[]	= "ttybg";
-#ifdef REAL_CLISTS
-char ttybuf[]	= "ttybuf";
-#endif
 char ttyin[]	= "ttyin";
 char ttyout[]	= "ttyout";
 
@@ -1757,17 +1754,8 @@ loop:
 				if (ce == 0) {
 					tp->t_rocount = 0;
 					if (ttyoutput(*cp, tp) >= 0) {
-#ifdef REAL_CLISTS
-						/* No Clists, wait a bit. */
-						ttstart(tp);
-						if (error = ttysleep(tp, &lbolt,
-						    TTOPRI | PCATCH, ttybuf, 0))
-							break;
-						goto loop;
-#else
 						/* out of space */
 						goto overfull;
-#endif
 					}
 					cp++;
 					cc--;
@@ -1792,17 +1780,8 @@ loop:
 			cp += ce, cc -= ce, tk_nout += ce;
 			tp->t_outcc += ce;
 			if (i > 0) {
-#ifdef REAL_CLISTS
-				/* No Clists, wait a bit. */
-				ttstart(tp);
-				if (error = ttysleep(tp,
-				    &lbolt, TTOPRI | PCATCH, ttybuf, 0))
-					break;
-				goto loop;
-#else
 				/* out of space */
 				goto overfull;
-#endif
 			}
 			if (ISSET(tp->t_lflag, FLUSHO) ||
 			    tp->t_outq.c_cc > hiwat)
@@ -1819,7 +1798,6 @@ out:
 	uio->uio_resid += cc;
 	return (error);
 
-#ifndef REAL_CLISTS
 overfull:
 	/*
 	 * Since we are using ring buffers, if we can't insert any more into
@@ -1828,7 +1806,6 @@ overfull:
 	 * proceed as normal.
 	 */
 	hiwat = tp->t_outq.c_cc - 1;
-#endif
 
 ovhiwat:
 	ttstart(tp);
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index 0edd29ff68d..5e2ac28c78c 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tty_subr.c,v 1.12 2001/06/22 14:14:09 deraadt Exp $	*/
+/*	$OpenBSD: tty_subr.c,v 1.13 2001/07/05 10:12:25 art Exp $	*/
 /*	$NetBSD: tty_subr.c,v 1.13 1996/02/09 19:00:43 christos Exp $	*/
 
 /*
@@ -39,9 +39,6 @@
 #include <sys/buf.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
-#ifdef REAL_CLISTS
-#include <sys/clist.h>
-#endif
 #include <sys/malloc.h>
 
 /*
-- 
cgit v1.2.3