Kernel - Cleaning up a little (implemented MIN and MAX functions)

[tpg/acess2.git] / Modules / Input / PS2KbMouse / ps2mouse.c

diff --git a/Modules/Input/PS2KbMouse/ps2mouse.c b/Modules/Input/PS2KbMouse/ps2mouse.c
index 15b02e4..e80a141 100644 (file)
--- a/Modules/Input/PS2KbMouse/ps2mouse.c
+++ b/Modules/Input/PS2KbMouse/ps2mouse.c
@@ -10,9 +10,6 @@
 #include <api_drv_joystick.h>\r
 #include "common.h"\r
 \r
-static inline int MIN(int a, int b) { return (a < b) ? a : b; }\r
-static inline int MAX(int a, int b) { return (a > b) ? a : b; }\r
-\r
 // == CONSTANTS ==\r
 #define NUM_AXIES      2       // X+Y\r
 #define NUM_BUTTONS    5       // Left, Right, Scroll Click, Scroll Up, Scroll Down\r
@@ -53,13 +50,19 @@ tDevFS_Driver       gMouse_DriverStruct = {
 // == CODE ==\r
 int PS2Mouse_Install(char **Arguments)\r
 {\r
+       \r
+\r
        // Set up variables\r
-       gMouse_Axies = (void*)&gMouse_FileData[1];\r
+       gMouse_Axies = (void*)&gMouse_FileData[4];\r
        gMouse_Buttons = (void*)&gMouse_Axies[NUM_AXIES];\r
+\r
+       gMouse_FileHeader->NAxies = 2;  gMouse_FileHeader->NButtons = 3;\r
+       gMouse_Axies[0].MinValue = -10; gMouse_Axies[0].MaxValue = 10;\r
+       gMouse_Axies[1].MinValue = -10; gMouse_Axies[1].MaxValue = 10;\r
        \r
        // Initialise Mouse Controller\r
        giMouse_Cycle = 0;      // Set Current Cycle position\r
-       KBC8042_EnableMouse();\r
+       gpMouse_EnableFcn();\r
        \r
        DevFS_AddDevice(&gMouse_DriverStruct);\r
        \r
@@ -136,6 +139,7 @@ void PS2Mouse_HandleInterrupt(Uint8 InputByte)
                gMouse_Axies[i].CursorPos = newCursor;\r
        }\r
 \r
+//     Log("Mouse at %ix%i", gMouse_Axies[0].CursorPos, gMouse_Axies[1].CursorPos);\r
                \r
        VFS_MarkAvaliable(&gMouse_DriverStruct.RootNode, 1);\r
 }\r