X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdrv%2Fkb.c;h=2e07aef58a2a70d1f31c30e7e1ebedaaff24c742;hb=e4b700d576ea9155c3fc86b0c57869a224851954;hp=fc078974f552017f73b102864a863be0c5aaf9ec;hpb=2c4e2813c105e40b962e7982b40a348dc0b272e6;p=tpg%2Facess2.git

diff --git a/Kernel/drv/kb.c b/Kernel/drv/kb.c
index fc078974..2e07aef5 100644
--- a/Kernel/drv/kb.c
+++ b/Kernel/drv/kb.c
@@ -141,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])
+	{
+		LOG("ch = 0x%02x", ch);
+		switch(ch)
+		{
+		case 'd':	__asm__ __volatile__ ("xchg %bx, %bx");	break;
+		case 'p':	Threads_Dump();	break;
+		}
+	}
+	
 	// Is shift pressed
 	if(gbKB_ShiftState ^ gbKB_CapsState)
 	{
@@ -175,16 +186,6 @@ 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;
-		case 'P':	Threads_Dump();	break;
-		}
-	}
-	
 	if(gKB_Callback)	gKB_Callback(ch);
 }