Changed kernel magic combo prefix to Ctrl-Alt-...

[tpg/acess2.git] / Kernel / drv / kb.c

diff --git a/Kernel/drv/kb.c b/Kernel/drv/kb.c
index 013e953..eeb1f99 100644 (file)
--- a/Kernel/drv/kb.c
+++ b/Kernel/drv/kb.c
@@ -12,6 +12,9 @@
 // === CONSTANTS ===
 #define        KB_BUFFER_SIZE  1024
 
+// === IMPORTS ===
+void   Threads_Dump();
+
 // === PROTOTYPES ===
  int   KB_Install(char **Arguments);
 void   KB_IRQHandler();
@@ -23,7 +26,7 @@ void  KB_UpdateLEDs();
 // === GLOBALS ===
 MODULE_DEFINE(0, 0x0100, PS2Keybard, KB_Install, NULL, NULL);
 tDevFS_Driver  gKB_DevInfo = {
-       NULL, "PS2Kb",
+       NULL, "PS2Keyboard",
        {
        .NumACLs = 0,
        .Size = -1,
@@ -138,7 +141,18 @@ void KB_IRQHandler()
 
        // Ignore Non-Printable Characters
        if(ch == 0 || ch & 0x80)                return;
-               
+       
+       
+       // --- Check for Kernel Magic Combos
+       if(gbaKB_States[KEY_LCTRL] && gbaKB_States[KEY_LALT])
+       {
+               switch(ch)
+               {
+               case 'd':       __asm__ __volatile__ ("xchg %bx, %bx"); break;
+               case 'p':       Threads_Dump(); break;
+               }
+       }
+       
        // Is shift pressed
        if(gbKB_ShiftState ^ gbKB_CapsState)
        {
@@ -172,17 +186,7 @@ void KB_IRQHandler()
                }
        }
        
-       // --- Check for Kernel Magic Combos
-       if(gbaKB_States[KEY_LSHIFT] && gbaKB_States[KEY_RSHIFT])
-       {
-               switch(ch)
-               {
-               case 'D':       __asm__ __volatile__ ("xchg %bx, %bx"); break;
-               }
-       }
-       
-       if(gKB_Callback)
-               gKB_Callback(ch);
+       if(gKB_Callback)        gKB_Callback(ch);
 }
 
 /**