diff options
author | marcel <marcel@FreeBSD.org> | 2004-07-10 21:24:36 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 2004-07-10 21:24:36 +0000 |
commit | b995877a066c7e04b455d29b5641151d05828de5 (patch) | |
tree | 10a9c443547b07a52a8faa4980f1f322d300bf7f /sys/i386/isa/pcvt/pcvt_kbd.c | |
parent | bc3d2a18b0c8abdb4a6e3401dc8269fac6f6d7e5 (diff) | |
download | FreeBSD-src-b995877a066c7e04b455d29b5641151d05828de5.zip FreeBSD-src-b995877a066c7e04b455d29b5641151d05828de5.tar.gz |
Update for the KDB framework:
o Make debugging code conditional upon KDB instead of DDB.
o Call kdb_enter() instead of Debugger().
o Remove local (static) variable in_debugger. Use kdb_active instead.
Diffstat (limited to 'sys/i386/isa/pcvt/pcvt_kbd.c')
-rw-r--r-- | sys/i386/isa/pcvt/pcvt_kbd.c | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/sys/i386/isa/pcvt/pcvt_kbd.c b/sys/i386/isa/pcvt/pcvt_kbd.c index 343f385..51f0dd0 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) |