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.

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 a100de7..079d7dd 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 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)