X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/5dc2581e36fb4827eac327698a31dfc39b717f9f..ad7871609881e73855d0b04da49b486cd93efca7:/usr/src/sys/kern/tty_subr.c

diff --git a/usr/src/sys/kern/tty_subr.c b/usr/src/sys/kern/tty_subr.c
index fd22d6fb0a..1679654772 100644
--- a/usr/src/sys/kern/tty_subr.c
+++ b/usr/src/sys/kern/tty_subr.c
@@ -1,20 +1,25 @@
 /*-
- * Copyright (c) 1982, 1986 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1982, 1986, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
- * %sccs.include.proprietary.c%
+ * This module is believed to contain source code proprietary to AT&T.
+ * Use and redistribution is subject to the Berkeley Software License
+ * Agreement and your Software Agreement with AT&T (Western Electric).
  *
- *	@(#)tty_subr.c	7.7 (Berkeley) %G%
+ *	@(#)tty_subr.c	8.1 (Berkeley) 6/10/93
  */
 
-#include "param.h"
-#include "systm.h"
-#include "buf.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "clist.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
+#include <sys/clist.h>
 
 char	cwaiting;
+struct	cblock *cfree, *cfreelist;
+int	cfreecount, nclist;
 
 #define setquote(cp) \
 	setbit(((char *)((int)(cp)&~CROUND)+sizeof(struct cblock *)), \
@@ -96,10 +101,10 @@ getc(p)
 q_to_b(q, cp, cc)
 	register struct clist *q;
 	register char *cp;
+	int cc;
 {
 	register struct cblock *bp;
-	register int s;
-	register nc;
+	register int s, nc;
 	char *acp;
 
 	if (cc <= 0)
@@ -115,8 +120,8 @@ q_to_b(q, cp, cc)
 
 	while (cc) {
 		nc = sizeof (struct cblock) - ((int)q->c_cf & CROUND);
-		nc = MIN(nc, cc);
-		nc = MIN(nc, q->c_cc);
+		nc = min(nc, cc);
+		nc = min(nc, q->c_cc);
 		(void) bcopy(q->c_cf, cp, (unsigned)nc);
 		q->c_cf += nc;
 		q->c_cc -= nc;
@@ -159,9 +164,9 @@ q_to_b(q, cp, cc)
  */
 ndqb(q, flag)
 	register struct clist *q;
+	int flag;
 {
-	register cc;
-	int s;
+	register int cc, s;
 
 	s = spltty();
 	if (q->c_cc <= 0) {
@@ -197,7 +202,7 @@ out:
  */
 ndflush(q, cc)
 	register struct clist *q;
-	register cc;
+	register int cc;
 {
 	register struct cblock *bp;
 	char *end;
@@ -250,11 +255,12 @@ out:
 
 
 putc(c, p)
+	int c;
 	register struct clist *p;
 {
 	register struct cblock *bp;
 	register char *cp;
-	register s;
+	register int s;
 
 	s = spltty();
 	if ((cp = p->c_cl) == NULL || p->c_cc < 0 ) {	/* no cblocks yet */
@@ -299,7 +305,7 @@ b_to_q(cp, cc, q)
 {
 	register char *cq;
 	register struct cblock *bp;
-	register s, nc;
+	register int s, nc;
 	int acc;
 
 	if (cc <= 0)
@@ -328,7 +334,7 @@ b_to_q(cp, cc, q)
 			bp->c_next = NULL;
 			cq = bp->c_info;
 		}
-		nc = MIN(cc, sizeof (struct cblock) - ((int)cq & CROUND));
+		nc = min(cc, sizeof (struct cblock) - ((int)cq & CROUND));
 		(void) bcopy(cp, cq, (unsigned)nc);
 		cp += nc;
 		cq += nc;
@@ -422,7 +428,7 @@ catq(from, to)
 #ifdef notdef
 	char bbuf[CBSIZE*4];
 #endif
-	register s, c;
+	register int s, c;
 
 	s = spltty();
 	if (to->c_cc == 0) {
@@ -507,7 +513,7 @@ putw(c, p)
 	register struct clist *p;
 	word_t c;
 {
-	register s;
+	register int s;
 	register struct cblock *bp;
 	register char *cp;
 
@@ -558,4 +564,4 @@ putw(c, p)
 	splx(s);
 	return (0);
 }
-#endif unneeded
+#endif /* unneeded */