X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdrv%2Fkb.c;h=ba9eb72cdeda37aeaad1ed40ba6cdd6ce403049a;hb=45f9a29e481ce9ea7ca7121541f0e0f90147f5b1;hp=92f00a72691cab7c216034f820aad76f4fed3522;hpb=a0f4dde15a97a206bf88109fecde52576b373109;p=tpg%2Facess2.git

diff --git a/Kernel/drv/kb.c b/Kernel/drv/kb.c
index 92f00a72..ba9eb72c 100644
--- a/Kernel/drv/kb.c
+++ b/Kernel/drv/kb.c
@@ -11,6 +11,7 @@
 
 // === CONSTANTS ===
 #define	KB_BUFFER_SIZE	1024
+#define	USE_KERNEL_MAGIC	1
 
 // === IMPORTS ===
 void	Threads_Dump();
@@ -63,11 +64,12 @@ int KB_Install(char **Arguments)
 	temp = inb(0x61);
 	outb(0x61, temp | 0x80);
 	outb(0x61, temp & 0x7F);
+	inb(0x60);	// Clear keyboard buffer
 	
 	IRQ_AddHandler(1, KB_IRQHandler);
 	DevFS_AddDevice( &gKB_DevInfo );
 	//Log("KB_Install: Installed");
-	return 1;
+	return MODULE_ERR_OK;
 }
 
 /**
@@ -80,9 +82,11 @@ void KB_IRQHandler()
 	Uint32	ch;
 	// int	keyNum;
 
-	//if( inportb(0x64) & 0x20 )	return;
+	// Check port 0x64 to tell if this is from the aux port
+	if( inb(0x64) & 0x20 )	return;
 
 	scancode = inb(0x60); // Read from the keyboard's data buffer
+	//Log_Debug("Keyboard", "scancode = %02x", scancode);
 
 	//Log("KB_IRQHandler: scancode = 0x%02x", scancode);
 
@@ -124,7 +128,7 @@ void KB_IRQHandler()
 	//keyNum = giKB_KeyLayer * 256 + scancode;
 	// Check for unknown key
 	if(!ch && !gbKB_KeyUp)
-		Warning("UNK %i %x", giKB_KeyLayer, scancode);
+		Log_Warning("Keyboard", "UNK %i %x", giKB_KeyLayer, scancode);
 
 	// Key Up?
 	if (gbKB_KeyUp)
@@ -169,8 +173,14 @@ void KB_IRQHandler()
 
 	// --- Check for Kernel Magic Combos
 	#if USE_KERNEL_MAGIC
-	if(ch == KEY_LCTRL)	gbKB_MagicState |= 1;
-	if(ch == KEY_LALT)	gbKB_MagicState |= 2;
+	if(ch == KEY_LCTRL) {
+		gbKB_MagicState |= 1;
+		//Log_Log("Keyboard", "Kernel Magic LCTRL Down\n");
+	}
+	if(ch == KEY_LALT) {
+		gbKB_MagicState |= 2;
+		//Log_Log("Keyboard", "Kernel Magic LALT Down\n");
+	}
 	if(gbKB_MagicState == 3)
 	{
 		switch(ch)