#include <modules.h>\r
#include <vfs.h>\r
#include <fs_devfs.h>\r
-#include <tpl_drv_common.h>\r
-#include <tpl_drv_joystick.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
+#include <api_drv_common.h>\r
+#include <api_drv_joystick.h>\r
+#include "common.h"\r
\r
// == CONSTANTS ==\r
#define NUM_AXIES 2 // X+Y\r
#define NUM_BUTTONS 5 // Left, Right, Scroll Click, Scroll Up, Scroll Down\r
-#define PS2_IO_PORT 0x60\r
\r
// == PROTOTYPES ==\r
// - Internal -\r
int PS2Mouse_Install(char **Arguments);\r
-void PS2Mouse_IRQ(int Num);\r
-static void mouseSendCommand(Uint8 cmd);\r
-void PS2Mouse_Enable();\r
+void PS2Mouse_HandleInterrupt(Uint8 InputByte);\r
// - Filesystem -\r
Uint64 PS2Mouse_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);\r
int PS2Mouse_IOCtl(tVFS_Node *Node, int ID, void *Data);\r
\r
// == GLOBALS ==\r
+void (*gpMouse_EnableFcn)(void);\r
// - Settings\r
int giMouse_Sensitivity = 1;\r
int giMouse_MaxX = 640, giMouse_MaxY = 480;\r
tJoystick_FileHeader *gMouse_FileHeader = (void *)gMouse_FileData;\r
tJoystick_Axis *gMouse_Axies;\r
Uint8 *gMouse_Buttons;\r
+tJoystick_Callback gMouse_Callback;\r
+ int gMouse_CallbackArg;\r
+ int giMouse_AxisLimits[2];\r
// - Internal State\r
int giMouse_Cycle = 0; // IRQ Position\r
Uint8 gaMouse_Bytes[4] = {0,0,0,0};\r
// == 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
- IRQ_AddHandler(12, PS2Mouse_IRQ); // Set IRQ\r
giMouse_Cycle = 0; // Set Current Cycle position\r
- PS2Mouse_Enable(); // Enable the mouse\r
+ gpMouse_EnableFcn();\r
\r
DevFS_AddDevice(&gMouse_DriverStruct);\r
\r
\r
/* Handle Mouse Interrupt\r
*/\r
-void PS2Mouse_IRQ(int Num)\r
+void PS2Mouse_HandleInterrupt(Uint8 InputByte)\r
{\r
Uint8 flags;\r
- int dx, dy;\r
- int dx_accel, dy_accel;\r
-\r
+ int d[2], d_accel[2];\r
+ int i;\r
\r
// Gather mouse data\r
- gaMouse_Bytes[giMouse_Cycle] = inb(0x60);\r
+ gaMouse_Bytes[giMouse_Cycle] = InputByte;\r
LOG("gaMouse_Bytes[%i] = 0x%02x", gMouse_Axies[0].MaxValue);\r
// - If bit 3 of the first byte is not set, it's not a valid packet?\r
if(giMouse_Cycle == 0 && !(gaMouse_Bytes[0] & 0x08) )\r
if(flags & 0xC0) return;\r
\r
// Calculate dX and dY\r
- dx = gaMouse_Bytes[1]; if(flags & 0x10) dx = -(256-dx);\r
- dy = gaMouse_Bytes[2]; if(flags & 0x20) dy = -(256-dy);\r
- dy = -dy; // Y is negated\r
- LOG("RAW dx=%i, dy=%i\n", dx, dy);\r
+ d[0] = gaMouse_Bytes[1]; if(flags & 0x10) d[0] = -(256-d[0]); // x\r
+ d[1] = gaMouse_Bytes[2]; if(flags & 0x20) d[1] = -(256-d[1]); // y\r
+ d[1] = -d[1]; // Y is negated\r
+ LOG("RAW dx=%i, dy=%i\n", d[0], d[1]);\r
// Apply scaling\r
// TODO: Apply a form of curve to the mouse movement (dx*log(dx), dx^k?)\r
// TODO: Independent sensitivities?\r
// TODO: Disable acceleration via a flag?\r
- dx_accel = dx*giMouse_Sensitivity;\r
- dy_accel = dy*giMouse_Sensitivity;\r
+ d_accel[0] = d[0]*giMouse_Sensitivity;\r
+ d_accel[1] = d[1]*giMouse_Sensitivity;\r
\r
// Set Buttons (Primary)\r
- gMouse_Buttons[0] = (flags & 1) ? 0xFF : 0;\r
- gMouse_Buttons[1] = (flags & 2) ? 0xFF : 0;\r
- gMouse_Buttons[2] = (flags & 4) ? 0xFF : 0;\r
+ for( i = 0; i < 3; i ++ )\r
+ {\r
+ Uint8 newVal = (flags & (1 << i)) ? 0xFF : 0;\r
+ if(newVal != gMouse_Buttons[i]) {\r
+ if( gMouse_Callback )\r
+ gMouse_Callback(gMouse_CallbackArg, 0, i, newVal - gMouse_Buttons[i]);\r
+ gMouse_Buttons[i] = newVal;\r
+ }\r
+ }\r
\r
// Update X and Y Positions\r
- gMouse_Axies[0].CurValue = MIN( MAX(gMouse_Axies[0].MinValue, gMouse_Axies[0].CurValue + dx_accel), gMouse_Axies[0].MaxValue );\r
- gMouse_Axies[1].CurValue = MIN( MAX(gMouse_Axies[1].MinValue, gMouse_Axies[1].CurValue + dy_accel), gMouse_Axies[1].MaxValue );\r
+ for( i = 0; i < 2; i ++ )\r
+ {\r
+ Sint16 newCursor = 0;\r
+ if( giMouse_AxisLimits[i] )\r
+ newCursor = MIN( MAX(0, gMouse_Axies[i].CursorPos + d_accel[i]), giMouse_AxisLimits[i] );;\r
+ \r
+ if( gMouse_Callback )\r
+ {\r
+ if(giMouse_AxisLimits[i] && gMouse_Axies[i].CursorPos != newCursor)\r
+ gMouse_Callback(gMouse_CallbackArg, 1, i, newCursor - gMouse_Axies[i].CursorPos);\r
+ if(!giMouse_AxisLimits[i] && gMouse_Axies[i].CurValue != d_accel[i])\r
+ gMouse_Callback(gMouse_CallbackArg, 1, i, d_accel[i] - gMouse_Axies[i].CurValue);\r
+ }\r
+ \r
+ gMouse_Axies[i].CurValue = d_accel[i];\r
+ 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
\r
/* Read mouse state (coordinates)\r
if(Offset + Length > sizeof(gMouse_FileData)) Length = sizeof(gMouse_FileData) - Offset;\r
\r
memcpy(Buffer, &gMouse_FileData[Offset], Length);\r
- \r
+ \r
+ VFS_MarkAvaliable(Node, 0);\r
return Length;\r
}\r
\r
if(!info) return 0;\r
if(info->Num < 0 || info->Num >= 2) return 0;\r
if(info->Value != -1)\r
- gMouse_Axies[info->Num].MaxValue = info->Value;\r
- return gMouse_Axies[info->Num].MaxValue;\r
+ giMouse_AxisLimits[info->Num] = info->Value;\r
+ return giMouse_AxisLimits[info->Num];\r
\r
case JOY_IOCTL_GETSETAXISPOSITION:\r
if(!info) return 0;\r
if(info->Num < 0 || info->Num >= 2) return 0;\r
if(info->Value != -1)\r
- gMouse_Axies[info->Num].CurValue = info->Value;\r
- return gMouse_Axies[info->Num].CurValue;\r
+ gMouse_Axies[info->Num].CursorPos = info->Value;\r
+ return gMouse_Axies[info->Num].CursorPos;\r
\r
case JOY_IOCTL_GETSETAXISFLAGS:\r
return -1;\r
}\r
}\r
\r
-//== Internal Functions ==\r
-static inline void mouseOut64(Uint8 data)\r
-{\r
- int timeout=100000;\r
- while( timeout-- && inb(0x64) & 2 ); // Wait for Flag to clear\r
- outb(0x64, data); // Send Command\r
-}\r
-static inline void mouseOut60(Uint8 data)\r
-{\r
- int timeout=100000;\r
- while( timeout-- && inb(0x64) & 2 ); // Wait for Flag to clear\r
- outb(0x60, data); // Send Command\r
-}\r
-static inline Uint8 mouseIn60(void)\r
-{\r
- int timeout=100000;\r
- while( timeout-- && (inb(0x64) & 1) == 0); // Wait for Flag to set\r
- return inb(0x60);\r
-}\r
-static inline void mouseSendCommand(Uint8 cmd)\r
-{\r
- mouseOut64(0xD4);\r
- mouseOut60(cmd);\r
-}\r
-\r
-void PS2Mouse_Enable(void)\r
-{\r
- Uint8 status;\r
- Log_Log("PS2Mouse", "Enabling Mouse...");\r
- \r
- // Enable AUX PS/2\r
- mouseOut64(0xA8);\r
- \r
- // Enable AUX PS/2 (Compaq Status Byte)\r
- mouseOut64(0x20); // Send Command\r
- status = mouseIn60(); // Get Status\r
- status &= ~0x20; // Clear "Disable Mouse Clock"\r
- status |= 0x02; // Set IRQ12 Enable\r
- mouseOut64(0x60); // Send Command\r
- mouseOut60(status); // Set Status\r
- \r
- //mouseSendCommand(0xF6); // Set Default Settings\r
- mouseSendCommand(0xF4); // Enable Packets\r
-}\r
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au