Check for CONFIG_PS2PORT on all entry ps2 function entry points.
authorKevin O'Connor <kevin@koconnor.net>
Sun, 29 Jan 2012 17:25:46 +0000 (12:25 -0500)
committerKevin O'Connor <kevin@koconnor.net>
Thu, 2 Feb 2012 01:42:39 +0000 (20:42 -0500)
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
src/ps2port.c

index 58335af913852b7893ec6f4fad1c743531aabdf4..1f042999047ed818e7a5b458c0c03716b9b4cc0d 100644 (file)
@@ -132,6 +132,8 @@ i8042_aux_write(u8 c)
 void
 i8042_reboot(void)
 {
+    if (! CONFIG_PS2PORT)
+       return;
     int i;
     for (i=0; i<10; i++) {
         i8042_wait_write();
@@ -322,12 +324,17 @@ ps2_command(int aux, int command, u8 *param)
 int
 ps2_kbd_command(int command, u8 *param)
 {
+    if (! CONFIG_PS2PORT)
+        return -1;
     return ps2_command(0, command, param);
 }
 
 int
 ps2_mouse_command(int command, u8 *param)
 {
+    if (! CONFIG_PS2PORT)
+        return -1;
+
     // Update ps2ctr for mouse enable/disable.
     if (command == PSMOUSE_CMD_ENABLE || command == PSMOUSE_CMD_DISABLE) {
         u16 ebda_seg = get_ebda_seg();