diff options
| -rw-r--r-- | sys/i386/isa/pcvt/pcvt_hdr.h | 1 | ||||
| -rw-r--r-- | sys/i386/isa/pcvt/pcvt_kbd.c | 29 |
2 files changed, 12 insertions, 18 deletions
diff --git a/sys/i386/isa/pcvt/pcvt_hdr.h b/sys/i386/isa/pcvt/pcvt_hdr.h index a100de78799c..079d7ddb724f 100644 --- a/sys/i386/isa/pcvt/pcvt_hdr.h +++ b/sys/i386/isa/pcvt/pcvt_hdr.h @@ -55,6 +55,7 @@ #include <sys/callout.h> #include <sys/conf.h> #include <sys/cons.h> +#include <sys/kdb.h> #include <sys/kernel.h> #include <sys/module.h> #include <sys/lock.h> diff --git a/sys/i386/isa/pcvt/pcvt_kbd.c b/sys/i386/isa/pcvt/pcvt_kbd.c index 343f38508e27..51f0dd017581 100644 --- a/sys/i386/isa/pcvt/pcvt_kbd.c +++ b/sys/i386/isa/pcvt/pcvt_kbd.c @@ -945,27 +945,20 @@ scroll_reset: shutdown_nice(0); #endif /* PCVT_CTRL_ALT_DEL */ -#if defined(DDB) /* Check for cntl-alt-esc */ +#if defined(KDB) /* Check for cntl-alt-esc */ if((key == 110) && ctrl_down && (meta_down || altgr_down)) { - static u_char in_Debugger; - - if(!in_Debugger) - { - in_Debugger = 1; - - /* the string is actually not used... */ - Debugger("kbd"); - - in_Debugger = 0; - if(noblock) - return NULL; - else - goto loop; - } - } -#endif /* defined(DDB) */ + if (!kdb_active) + { + kdb_enter("kbd"); + if(noblock) + return NULL; + else + goto loop; + } + } +#endif /* defined(KDB) */ /* look for keys with special handling */ if(key == 128) |