X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdrv%2Fkb.c;h=07e07f5d624857e2677f6b9a145ad88c49a57e48;hb=02cbaac1233be9c5228973a787431fa5e0aa178e;hp=65d340e9a3539a69407f3d75a579d590cf6e9ef7;hpb=156885e938b60fee9d061d989ae7711c9aeea493;p=tpg%2Facess2.git

diff --git a/Kernel/drv/kb.c b/Kernel/drv/kb.c
index 65d340e9..07e07f5d 100644
--- a/Kernel/drv/kb.c
+++ b/Kernel/drv/kb.c
@@ -11,16 +11,18 @@
 
 // === CONSTANTS ===
 #define	KB_BUFFER_SIZE	1024
+#define	USE_KERNEL_MAGIC	1
 
 // === IMPORTS ===
-void	Threads_Dump();
+void	Threads_Dump(void);
+void	Heap_Stats(void);
 
 // === PROTOTYPES ===
  int	KB_Install(char **Arguments);
-void	KB_IRQHandler();
+void	KB_IRQHandler(int IRQNum);
 void	KB_AddBuffer(char ch);
 Uint64	KB_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Dest);
-void	KB_UpdateLEDs();
+void	KB_UpdateLEDs(void);
  int	KB_IOCtl(tVFS_Node *Node, int Id, void *Data);
 
 // === GLOBALS ===
@@ -43,6 +45,8 @@ Uint8	gbaKB_States[3][256];
  int	giKB_KeyLayer = 0;
 #if USE_KERNEL_MAGIC
  int	gbKB_MagicState = 0;
+ int	giKB_MagicAddress = 0;
+ int	giKB_MagicAddressPos = 0;
 #endif
 //Uint64	giKB_ReadBase = 0;
 //Uint32	gaKB_Buffer[KB_BUFFER_SIZE];	//!< Keyboard Ring Buffer
@@ -52,7 +56,7 @@ Uint8	gbaKB_States[3][256];
 
 // === CODE ===
 /**
- * \fn int KB_Install(char **Arguments)
+ * \brief Install the keyboard driver
  */
 int KB_Install(char **Arguments)
 {
@@ -63,6 +67,7 @@ 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 );
@@ -71,25 +76,25 @@ int KB_Install(char **Arguments)
 }
 
 /**
- * \fn void KB_IRQHandler()
  * \brief Called on a keyboard IRQ
+ * \param IRQNum	IRQ number (unused)
  */
-void KB_IRQHandler()
+void KB_IRQHandler(int IRQNum)
 {
 	Uint8	scancode;
 	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("KB_IRQHandler: scancode = 0x%02x", scancode);
+	//Log_Debug("Keyboard", "scancode = %02x", scancode);
 
 	// Ignore ACKs
 	if(scancode == 0xFA) {
-		// Oh man! This is anachic (I'm leaving it here to represent the
-		// mess that Acess once was)
+		// Oh man! This is anarchic (I'm leaving it here to represent
+		// the mess that Acess once was)
 		//kb_lastChar = KB_ACK;
 		return;
 	}
@@ -124,7 +129,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,21 +174,43 @@ 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)
 		{
-		case 'd':	__asm__ __volatile__ ("xchg %bx, %bx");	break;
-		case 'p':	Threads_Dump();	break;
+		case '0':	case '1':	case '2':	case '3':
+		case '4':	case '5':	case '6':	case '7':
+		case '8':	case '9':	case 'a':	case 'b':
+		case 'c':	case 'd':	case 'e':	case 'f':
+			{
+			char	str[2] = {ch,0};
+			if(giKB_MagicAddressPos == BITS/4)	break;
+			giKB_MagicAddress |= atoi(str) << giKB_MagicAddressPos;
+			giKB_MagicAddressPos ++;
+			}
+			break;
+		
+		// Thread List Dump
+		case 'p':	Threads_Dump();	return;
+		// Heap Statistics
+		case 'h':	Heap_Stats();	return;
+		// Dump Structure
+		case 's':	return;
 		}
 	}
 	#endif
 
 	// Is shift pressed
-	// - Darn ugly hacks !(!x) means (bool)x
-	if( !(!gbKB_ShiftState) ^ gbKB_CapsState)
+	// - Darn ugly hacks !!x means (bool)x
+	if( !!gbKB_ShiftState ^ gbKB_CapsState)
 	{
 		switch(ch)
 		{
@@ -220,10 +247,10 @@ void KB_IRQHandler()
 }
 
 /**
- * \fn void KB_UpdateLEDs()
+ * \fn void KB_UpdateLEDs(void)
  * \brief Updates the status of the keyboard LEDs
  */
-void KB_UpdateLEDs()
+void KB_UpdateLEDs(void)
 {
 	Uint8	leds;