X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdrv%2Fkb.c;h=6c2bf926547f97d086a47cb54b34462685806880;hb=3045a1c5f05fa6f6e3cfe73da753b7500e87aff3;hp=0de8fe12cf4157b41a0f447aebfb159f81b06030;hpb=d84c449919ed7a288945d043a04802d96daf7047;p=tpg%2Facess2.git

diff --git a/Kernel/drv/kb.c b/Kernel/drv/kb.c
index 0de8fe12..6c2bf926 100644
--- 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();
@@ -21,28 +24,31 @@ void	KB_UpdateLEDs();
  int	KB_IOCtl(tVFS_Node *Node, int Id, void *Data);
 
 // === GLOBALS ===
-MODULE_DEFINE(0, 0x0100, PS2Keybard, KB_Install, NULL, NULL);
+MODULE_DEFINE(0, 0x0100, PS2Keyboard, KB_Install, NULL, NULL);
 tDevFS_Driver	gKB_DevInfo = {
 	NULL, "PS2Keyboard",
 	{
 	.NumACLs = 0,
-	.Size = -1,
-	.Read = KB_Read,
+	.Size = 0,
+	//.Read = KB_Read,
 	.IOCtl = KB_IOCtl
 	}
 };
 tKeybardCallback	gKB_Callback = NULL;
-Uint8	**gpKB_Map = gpKBDUS;
-Uint8	gbaKB_States[256];
+Uint32	**gpKB_Map = gpKBDUS;
+Uint8	gbaKB_States[3][256];
  int	gbKB_ShiftState = 0;
  int	gbKB_CapsState = 0;
  int	gbKB_KeyUp = 0;
  int	giKB_KeyLayer = 0;
+#if USE_KERNEL_MAGIC
+ int	gbKB_MagicState = 0;
+#endif
 //Uint64	giKB_ReadBase = 0;
-Uint8	gaKB_Buffer[KB_BUFFER_SIZE];	//!< Keyboard Ring Buffer
-volatile int	giKB_InsertPoint = 0;	//!< Writing location marker
-volatile int	giKB_ReadPoint = 0;	//!< Reading location marker
-volatile int	giKB_InUse = 0;		//!< Lock marker
+//Uint32	gaKB_Buffer[KB_BUFFER_SIZE];	//!< Keyboard Ring Buffer
+//volatile int	giKB_InsertPoint = 0;	//!< Writing location marker
+//volatile int	giKB_ReadPoint = 0;	//!< Reading location marker
+//volatile int	giKB_InUse = 0;		//!< Lock marker
 
 // === CODE ===
 /**
@@ -63,7 +69,7 @@ void KB_IRQHandler()
 {
 	Uint8	scancode;
 	Uint32	ch;
-	 int	keyNum;
+	// int	keyNum;
 
 	//if( inportb(0x64) & 0x20 )	return;
 	
@@ -71,6 +77,8 @@ void KB_IRQHandler()
 
 	// Ignore ACKs
 	if(scancode == 0xFA) {
+		// Oh man! This is anachic (I'm leaving it here to represent the
+		// mess that acess once was
 		//kb_lastChar = KB_ACK;
 		return;
 	}
@@ -102,48 +110,73 @@ void KB_IRQHandler()
 	
 	// Translate
 	ch = gpKB_Map[giKB_KeyLayer][scancode];
-	keyNum = giKB_KeyLayer * 256 + scancode;
+	//keyNum = giKB_KeyLayer * 256 + scancode;
 	// Check for unknown key
 	if(!ch && !gbKB_KeyUp)
 		Warning("UNK %i %x", giKB_KeyLayer, scancode);
 	
-	// Reset Layer
-	giKB_KeyLayer = 0;
-	
 	// Key Up?
 	if (gbKB_KeyUp)
 	{
 		gbKB_KeyUp = 0;
-		gbaKB_States[ keyNum ] = 0;	// Unset key state flag
+		gbaKB_States[giKB_KeyLayer][scancode] = 0;	// Unset key state flag
+		
+		#if USE_KERNEL_MAGIC
+		if(ch == KEY_LCTRL)	gbKB_MagicState &= ~1;
+		if(ch == KEY_LALT)	gbKB_MagicState &= ~2;
+		#endif
 		
-		if( !gbaKB_States[KEY_LSHIFT] && !gbaKB_States[KEY_RSHIFT] )
-			gbKB_ShiftState = 0;
+		if(ch == KEY_LSHIFT)	gbKB_ShiftState &= ~1;
+		if(ch == KEY_RSHIFT)	gbKB_ShiftState &= ~2;
 		
-		KB_AddBuffer(KEY_KEYUP);
-		KB_AddBuffer(ch);
+		// Call callback
+		if(ch != 0 && gKB_Callback)
+			gKB_Callback( ch & 0x80000000 );
 		
+		// Reset Layer
+		giKB_KeyLayer = 0;
 		return;
 	}
 
 	// Set the bit relating to the key
-	gbaKB_States[keyNum] = 1;
-	if(ch == KEY_LSHIFT || ch == KEY_RSHIFT)
-		gbKB_ShiftState = 1;
+	gbaKB_States[giKB_KeyLayer][scancode] = 1;
+	// Set shift key bits
+	if(ch == KEY_LSHIFT)	gbKB_ShiftState |= 1;
+	if(ch == KEY_RSHIFT)	gbKB_ShiftState |= 2;
 	
 	// Check for Caps Lock
 	if(ch == KEY_CAPSLOCK) {
 		gbKB_CapsState = !gbKB_CapsState;
 		KB_UpdateLEDs();
 	}
+	
+	// Reset Layer
+	giKB_KeyLayer = 0;
 
 	// Ignore Non-Printable Characters
-	if(ch == 0 || ch & 0x80)		return;
-		
+	if(ch == 0)		return;
+	
+	// --- Check for Kernel Magic Combos
+	#if USE_KERNEL_MAGIC
+	if(ch == KEY_LCTRL)	gbKB_MagicState |= 1;
+	if(ch == KEY_LALT)	gbKB_MagicState |= 2;
+	if(gbKB_MagicState == 3)
+	{
+		switch(ch)
+		{
+		case 'd':	__asm__ __volatile__ ("xchg %bx, %bx");	break;
+		case 'p':	Threads_Dump();	break;
+		}
+	}
+	#endif
+	
 	// Is shift pressed
-	if(gbKB_ShiftState ^ gbKB_CapsState)
+	// - Darn ugly hacks !(!x) means (bool)x
+	if( !(!gbKB_ShiftState) ^ gbKB_CapsState)
 	{
 		switch(ch)
 		{
+		case 0:	break;
 		case '`':	ch = '~';	break;
 		case '1':	ch = '!';	break;
 		case '2':	ch = '@';	break;
@@ -172,57 +205,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);
-}
-
-/**
- * \fn void KB_AddBuffer(char ch)
- * \brief Add to the keyboard ring buffer
- */
-void KB_AddBuffer(char ch)
-{
-	// Add to buffer
-	gaKB_Buffer[ giKB_InsertPoint++ ] = ch;
-	// - Wrap
-	if( giKB_InsertPoint == KB_BUFFER_SIZE )	giKB_InsertPoint = 0;
-	// - Force increment read pointer
-	if( giKB_InsertPoint == giKB_ReadPoint )	giKB_ReadPoint ++;
-}
-
-/**
- * \fn Uint64 KB_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Dest)
- * \brief Read from the ring buffer
- * \param Node	Unused
- * \param Offset	Unused (Character Device)
- * \param Length	Number of bytes to read
- * \param Dest	Destination
- */
-Uint64 KB_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Dest)
-{
-	 int	pos = 0;
-	char	*dstbuf = Dest;
-	
-	if(giKB_InUse)	return -1;
-	giKB_InUse = 1;
-	
-	while(giKB_ReadPoint != giKB_InsertPoint && pos < Length)
-	{
-		dstbuf[pos++] = gaKB_Buffer[ giKB_ReadPoint++ ];
-		if( giKB_ReadPoint == KB_BUFFER_SIZE )	giKB_InsertPoint = 0;
-	}
-	
-	giKB_InUse = 0;
-	
-	return Length;
+	if(gKB_Callback && ch != 0)	gKB_Callback(ch);
 }
 
 /**