Rename cn_unavailable to cnunavailable for little more consistency.
Garbage collect unused cndebug() function. Suggested by: bde
This commit is contained in:
parent
ae62d94069
commit
dec8868dcc
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=125487
@ -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)) {
|
||||
|
@ -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)) {
|
||||
|
@ -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,23 +291,12 @@ 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');
|
||||
}
|
||||
|
||||
/*
|
||||
* XXX: rewrite to use sbufs instead
|
||||
*/
|
||||
|
@ -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 */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user