spl5 not splimp

[unix-history] / 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 412bcb9..b78ec73 100644 (file)
--- a/usr/src/sys/kern/tty_subr.c
+++ b/usr/src/sys/kern/tty_subr.c
@@ -1,4 +1,4 @@
-/*     tty_subr.c      4.9     %G%     */
+/*     tty_subr.c      4.13    81/11/20        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -18,7 +18,7 @@ register struct clist *p;
        register struct cblock *bp;
        register int c, s;
 
        register struct cblock *bp;
        register int c, s;
 

-       s = spl6();
+       s = spl5();

        if (p->c_cc <= 0) {
                c = -1;
                p->c_cc = 0;
        if (p->c_cc <= 0) {
                c = -1;
                p->c_cc = 0;


@@ -54,6 +54,7 @@ register struct clist *p;
        return(c);
 }
 
        return(c);
 }
 

+#if 0

 /*
  * copy clist to buffer.
  * return number of bytes moved.
 /*
  * copy clist to buffer.
  * return number of bytes moved.


@@ -68,7 +69,7 @@ register char *cp;
 
        if (cc <= 0)
                return(0);
 
        if (cc <= 0)
                return(0);

-       s = spl6();
+       s = spl5();

        if (q->c_cc <= 0) {
                q->c_cc = 0;
                q->c_cf = q->c_cl = NULL;
        if (q->c_cc <= 0) {
                q->c_cc = 0;
                q->c_cf = q->c_cl = NULL;


@@ -109,6 +110,7 @@ register char *cp;
        splx(s);
        return(cp-acp);
 }
        splx(s);
        return(cp-acp);
 }

+#endif

 
 /*
  * Return count of contiguous characters
 
 /*
  * Return count of contiguous characters


@@ -121,7 +123,7 @@ register struct clist *q;
 register cc;
 int s;
 
 register cc;
 int s;
 

-       s = spl6();
+       s = spl5();

        if (q->c_cc <= 0) {
                cc = -q->c_cc;
                goto out;
        if (q->c_cc <= 0) {
                cc = -q->c_cc;
                goto out;


@@ -164,7 +166,7 @@ char *end;
 int rem;
 register s;
 
 int rem;
 register s;
 

-       s = spl6();
+       s = spl5();

        if (q->c_cc < 0) {
                printf("neg q flush\n");
                goto out;
        if (q->c_cc < 0) {
                printf("neg q flush\n");
                goto out;


@@ -222,7 +224,7 @@ register struct clist *p;
        register char *cp;
        register s;
 
        register char *cp;
        register s;
 

-       s = spl6();
+       s = spl5();

        if ((cp = p->c_cl) == NULL || p->c_cc < 0 ) {
                if ((bp = cfreelist) == NULL) {
                        splx(s);
        if ((cp = p->c_cl) == NULL || p->c_cc < 0 ) {
                if ((bp = cfreelist) == NULL) {
                        splx(s);


@@ -271,7 +273,7 @@ register int cc;
        acc = cc;
 
 
        acc = cc;
 
 

-       s = spl6();
+       s = spl5();

        if ((cq = q->c_cl) == NULL || q->c_cc < 0) {
                if ((bp = cfreelist) == NULL) 
                        goto out;
        if ((cq = q->c_cl) == NULL || q->c_cc < 0) {
                if ((bp = cfreelist) == NULL) 
                        goto out;


@@ -334,7 +336,7 @@ register struct clist *p;
        register int c, s;
        struct cblock *obp;
 
        register int c, s;
        struct cblock *obp;
 

-       s = spl6();
+       s = spl5();

        if (p->c_cc <= 0)
                c = -1;
        else {
        if (p->c_cc <= 0)
                c = -1;
        else {


@@ -397,12 +399,13 @@ register struct clist *p;
 }
 #endif
 
 }
 #endif
 

+#if 0

 putw(c, p)
 register struct clist *p;
 {
        register s;
 
 putw(c, p)
 register struct clist *p;
 {
        register s;
 

-       s = spl6();
+       s = spl5();

        if (cfreelist==NULL) {
                splx(s);
                return(-1);
        if (cfreelist==NULL) {
                splx(s);
                return(-1);


@@ -412,3 +415,4 @@ register struct clist *p;
        splx(s);
        return(0);
 }
        splx(s);
        return(0);
 }

+#endif