X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FInput%2FPS2KbMouse%2Fkb.c;h=e53f09309447e784804308e6da1b519b70a2de28;hb=2c3ab58b961dea91fdfbf432a7fdf9593c6e7a8e;hp=507d5757903681e84d6a318923ee019a1901f6a8;hpb=3764c294f21229bdf700f436fa4884f5e76e0d3a;p=tpg%2Facess2.git

diff --git a/Modules/Input/PS2KbMouse/kb.c b/Modules/Input/PS2KbMouse/kb.c
index 507d5757..e53f0930 100644
--- a/Modules/Input/PS2KbMouse/kb.c
+++ b/Modules/Input/PS2KbMouse/kb.c
@@ -5,8 +5,8 @@
 #include <acess.h>
 #include <modules.h>
 #include <fs_devfs.h>
-#include <tpl_drv_common.h>
-#include <tpl_drv_keyboard.h>
+#include <api_drv_common.h>
+#include <api_drv_keyboard.h>
 #include "kb_kbdus.h"
 
 // === CONSTANTS ===
@@ -20,9 +20,7 @@ extern void	Heap_Stats(void);
 
 // === PROTOTYPES ===
  int	KB_Install(char **Arguments);
-void	KB_IRQHandler(int IRQNum);
-void	KB_AddBuffer(char ch);
-Uint64	KB_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Dest);
+void	KB_HandleScancode(Uint8 scancode);
 void	KB_UpdateLEDs(void);
  int	KB_IOCtl(tVFS_Node *Node, int Id, void *Data);
 
@@ -32,7 +30,6 @@ tDevFS_Driver	gKB_DevInfo = {
 	{
 	.NumACLs = 0,
 	.Size = 0,
-	//.Read = KB_Read,
 	.IOCtl = KB_IOCtl
 	}
 };
@@ -55,16 +52,6 @@ Uint8	gbaKB_States[3][256];
  */
 int KB_Install(char **Arguments)
 {
-	Uint8	temp;
-	
-	// Attempt to get around a strange bug in Bochs/Qemu by toggling
-	// the controller on and off
-	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 MODULE_ERR_OK;
@@ -74,16 +61,10 @@ int KB_Install(char **Arguments)
  * \brief Called on a keyboard IRQ
  * \param IRQNum	IRQ number (unused)
  */
-void KB_IRQHandler(int IRQNum)
+void KB_HandleScancode(Uint8 scancode)
 {
-	Uint8	scancode;
 	Uint32	ch;
-	// int	keyNum;
 
-	// 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);
 
 	// Ignore ACKs
@@ -257,13 +238,12 @@ void KB_UpdateLEDs(void)
 
 	leds = (gbKB_CapsState ? 4 : 0);
 
-	while( inb(0x64) & 2 );	// Wait for bit 2 to unset
-	outb(0x60, 0xED);	// Send update command
-
-	while( inb(0x64) & 2 );	// Wait for bit 2 to unset
-	outb(0x60, leds);
+	// TODO: Update LEDS
+	Log_Warning("Keyboard", "TODO: Update LEDs");
 }
 
+static const char	*csaIOCTL_NAMES[] = {DRV_IOCTLNAMES, DRV_KEYBAORD_IOCTLNAMES, NULL};
+
 /**
  * \fn int KB_IOCtl(tVFS_Node *Node, int Id, void *Data)
  * \brief Calls an IOCtl Command
@@ -272,11 +252,8 @@ int KB_IOCtl(tVFS_Node *Node, int Id, void *Data)
 {
 	switch(Id)
 	{
-	case DRV_IOCTL_TYPE:	return DRV_TYPE_KEYBOARD;
-	case DRV_IOCTL_IDENT:	memcpy(Data, "KB\0\0", 4);	return 1;
-	case DRV_IOCTL_VERSION:	return 0x100;
-	case DRV_IOCTL_LOOKUP:	return 0;
-
+	BASE_IOCTLS(DRV_TYPE_KEYBOARD, "KB", 0x100, csaIOCTL_NAMES);
+	
 	// Sets the Keyboard Callback
 	case KB_IOCTL_SETCALLBACK:
 		// Sanity Check