hook for ps driver and untimeout stuff for lucas drivers

[unix-history] / usr / src / sys / kern / subr_prf.c

diff --git a/usr/src/sys/kern/subr_prf.c b/usr/src/sys/kern/subr_prf.c
index ceeecfa..c7d1cc9 100644 (file)
--- a/usr/src/sys/kern/subr_prf.c
+++ b/usr/src/sys/kern/subr_prf.c
@@ -1,4 +1,4 @@
-/*     subr_prf.c      4.19    81/11/20        */
+/*     subr_prf.c      4.21    82/01/16        */

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


@@ -170,11 +170,12 @@ printn(n, b, touser)
 panic(s)
        char *s;
 {
 panic(s)
        char *s;
 {

-       int bootopt = panicstr ? RB_AUTOBOOT : RB_AUTOBOOT|RB_NOSYNC;
+       int bootopt = RB_AUTOBOOT;

 
 

+       if (panicstr)
+               bootopt |= RB_NOSYNC;

        panicstr = s;
        printf("panic: %s\n", s);
        panicstr = s;
        printf("panic: %s\n", s);

-       (void) spl0();

        boot(RB_PANIC, bootopt);
 }
 
        boot(RB_PANIC, bootopt);
 }
 


@@ -214,7 +215,7 @@ putchar(c, touser)
        if (touser) {
                register struct tty *tp = u.u_ttyp;
 
        if (touser) {
                register struct tty *tp = u.u_ttyp;
 

-               if (tp && (tp->t_state&CARR_ON)) {
+               if (tp && (tp->t_state&TS_CARR_ON)) {

                        register s = spl6();
                        if (c == '\n')
                                (void) ttyoutput('\r', tp);
                        register s = spl6();
                        if (c == '\n')
                                (void) ttyoutput('\r', tp);