diff options
| -rw-r--r-- | sys/amd64/amd64/db_interface.c | 4 | ||||
| -rw-r--r-- | sys/i386/i386/db_interface.c | 4 | ||||
| -rw-r--r-- | sys/kern/tty_cons.c | 16 | ||||
| -rw-r--r-- | sys/sys/cons.h | 2 |
4 files changed, 7 insertions, 19 deletions
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c index 6a49ef9..cdc3ac3 100644 --- a/sys/amd64/amd64/db_interface.c +++ b/sys/amd64/amd64/db_interface.c @@ -87,7 +87,7 @@ kdb_trap(int type, int code, struct amd64_saved_state *regs) * our breakpoints by disarming our breakpoints and fixing up * %eip. */ - if (cn_unavailable() != 0 && ddb_mode) { + if (cnunavailable() != 0 && ddb_mode) { if (type == T_TRCTRAP) { regs->tf_rflags &= ~PSL_T; return (1); @@ -327,7 +327,7 @@ Debugger(const char *msg) * OK if the call is for the debugger hotkey but not if the call * is a weak form of panicing. */ - if (cn_unavailable() != 0 && !(boothowto & RB_GDB)) + if (cnunavailable() != 0 && !(boothowto & RB_GDB)) return; if (atomic_cmpset_acq_int(&in_Debugger, 0, 1)) { diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c index 6e7b99a..79173c7 100644 --- a/sys/i386/i386/db_interface.c +++ b/sys/i386/i386/db_interface.c @@ -90,7 +90,7 @@ kdb_trap(int type, int code, struct i386_saved_state *regs) * our breakpoints by disarming our breakpoints and fixing up * %eip. */ - if (cn_unavailable() != 0 && ddb_mode) { + if (cnunavailable() != 0 && ddb_mode) { if (type == T_TRCTRAP) { regs->tf_eflags &= ~PSL_T; return (1); @@ -320,7 +320,7 @@ Debugger(const char *msg) * OK if the call is for the debugger hotkey but not if the call * is a weak form of panicing. */ - if (cn_unavailable() != 0 && !(boothowto & RB_GDB)) + if (cnunavailable() != 0 && !(boothowto & RB_GDB)) return; if (atomic_cmpset_acq_int(&in_Debugger, 0, 1)) { diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c index 9a0a12f..835c35a 100644 --- a/sys/kern/tty_cons.c +++ b/sys/kern/tty_cons.c @@ -126,7 +126,6 @@ static char *console_pausestr= "<pause; press any key to proceed to next line or '.' to end pause mode>"; struct tty *constty; /* pointer to console "window" tty */ -void cndebug(char *); static void constty_timeout(void *arg); CONS_DRIVER(cons, NULL, NULL, NULL, NULL, NULL, NULL, NULL); @@ -292,21 +291,10 @@ cnavailable(struct consdev *cn, int available) } int -cn_unavailable(void) +cnunavailable(void) { - return (cons_avail_mask == 0); -} - -void -cndebug(char *str) -{ - int i, len; - len = strlen(str); - cnputc('>'); cnputc('>'); cnputc('>'); cnputc(' '); - for (i = 0; i < len; i++) - cnputc(str[i]); - cnputc('\n'); + return (cons_avail_mask == 0); } /* diff --git a/sys/sys/cons.h b/sys/sys/cons.h index 3721a39..a8e523a 100644 --- a/sys/sys/cons.h +++ b/sys/sys/cons.h @@ -104,7 +104,7 @@ int cncheckc(void); int cngetc(void); void cndbctl(int); void cnputc(int); -int cn_unavailable(void); +int cnunavailable(void); #endif /* _KERNEL */ |
