X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FInput%2FPS2KbMouse%2Fmain.c;h=ceb422ac3b1cff2df6e25dda97732dbadf5f1306;hb=440a12bc5613b5195d032fd0878de945a9b51e56;hp=ae51f81c8f736976b5d7270facb0131897737854;hpb=f48e29379bd57e2d361cbc65477be120da47e874;p=tpg%2Facess2.git diff --git a/KernelLand/Modules/Input/PS2KbMouse/main.c b/KernelLand/Modules/Input/PS2KbMouse/main.c index ae51f81c..ceb422ac 100644 --- a/KernelLand/Modules/Input/PS2KbMouse/main.c +++ b/KernelLand/Modules/Input/PS2KbMouse/main.c @@ -7,7 +7,7 @@ #include #include "common.h" -// === IMPORTS === +// === CONSTANTS === // TODO: Allow runtime/compile-time switching // Maybe PCI will have it? // Integrator-CP @@ -31,17 +31,17 @@ // === GLOBALS === MODULE_DEFINE(0, 0x0100, Input_PS2KbMouse, PS2_Install, NULL, NULL); // Shuts the makefile up MODULE_DEFINE(0, 0x0100, PS2Keyboard, KB_Install, NULL, "Input_PS2KbMouse", "Keyboard", NULL); -MODULE_DEFINE(0, 0x0100, PS2Mouse, PS2Mouse_Install, NULL, "Input_PS2KbMouse", NULL); +MODULE_DEFINE(0, 0x0100, PS2Mouse, PS2Mouse_Install, NULL, "Input_PS2KbMouse", "Mouse", NULL); // === CODE === int PS2_Install(char **Arguments) { #if ARCHDIR_is_x86 || ARCHDIR_is_x86_64 KBC8042_Init(); - gpMouse_EnableFcn = KBC8042_EnableMouse; + gpPS2Mouse_EnableFcn = KBC8042_EnableMouse; #elif ARCHDIR_is_armv7 PL050_Init(KEYBOARD_BASE, KEYBOARD_IRQ, MOUSE_BASE, MOUSE_IRQ); - gpMouse_EnableFcn = PL050_EnableMouse; + gpPS2Mouse_EnableFcn = PL050_EnableMouse; #endif return MODULE_ERR_OK;