add error handling to ps2_mouse

diff --git a/key_process.c b/key_process.c
index f3b65d10142fa68c237213a6c24b516efc93f30d..e3bee02e3b904a1fc912dc0409cc8207148d0e7e 100644 (file)
--- a/key_process.c
+++ b/key_process.c
@@ -129,6 +129,7 @@ void proc_matrix(void) {
 #ifdef PS2_MOUSE_ENABLE
                 print("1: ps2_mouse_init \n");
                 print("2: ps2_mouse_read \n");
+                print("3: ps2_mouse: on/off toggle \n");
 #endif
                 _delay_ms(500);
                 print_enable = false;
@@ -154,6 +155,16 @@ void proc_matrix(void) {
                 phex(ps2_mouse_y); print("\n");
                 print("ps2_mouse_error_count: "); phex(ps2_mouse_error_count); print("\n");
                 break;
+            case KB_3:
+                ps2_mouse_enable = !ps2_mouse_enable;
+                print("ps2_mouse: ");
+                if (ps2_mouse_enable)
+                    print("on");
+                else
+                    print("off");
+                print("\n");
+                _delay_ms(500);
+                break;
 #endif
             case KB_B: // bootloader
                 usb_keyboard_clear_report();
@@ -299,9 +310,7 @@ void proc_matrix(void) {
 
 #ifdef PS2_MOUSE_ENABLE
     // ps2 mouse
-    //if (ps2_mouse_error_count > 10) {
-        ps2_mouse_read();
+    if (ps2_mouse_read() == 0)
         ps2_mouse_usb_send();
-    //}
 #endif
 }

diff --git a/ps2_mouse.c b/ps2_mouse.c
index e22ce6337cb6ea2a72b7d935db45ff8aa7f4b532..7ff9882462571577c745328e787014bfdf1ceedf 100644 (file)
--- a/ps2_mouse.c
+++ b/ps2_mouse.c
@@ -15,65 +15,91 @@
 #   define phex16(h)
 #endif
 
+// disable when errors occur 255 times.
+#define ERROR_RETURN() do { \
+    if (ps2_error) { \
+        if (ps2_mouse_error_count < 255) { \
+            ps2_mouse_error_count++; \
+        } else { \
+            ps2_mouse_error_count = 0; \
+            ps2_mouse_enable = false; \
+        } \
+        return ps2_error; \
+    } \
+} while (0)
+
+
 /*
 TODO
 ----
-- Error handling
 - Stream mode
 - Tracpoint command support: needed
 - Middle button + move = Wheel traslation
 */
+bool ps2_mouse_enable = true;
 uint8_t ps2_mouse_x = 0;
 uint8_t ps2_mouse_y = 0;
 uint8_t ps2_mouse_btn = 0;
 uint8_t ps2_mouse_error_count = 0;
+
 static uint8_t ps2_mouse_btn_prev = 0;
 
-void ps2_mouse_init(void) {
+
+uint8_t ps2_mouse_init(void) {
     uint8_t rcv;
 
+    if (!ps2_mouse_enable) return 1;
+
     // Reset
     rcv = ps2_host_send(0xFF);
     print("ps2_mouse_init: send 0xFF: ");
     phex(ps2_error); print("\n");
+    ERROR_RETURN();
 
     // ACK
     rcv = ps2_host_recv();
     print("ps2_mouse_init: read ACK: ");
     phex(rcv); phex(ps2_error); print("\n");
+    ERROR_RETURN();
 
     // BAT takes some time
     _delay_ms(100);
     rcv = ps2_host_recv();
     print("ps2_mouse_init: read BAT: ");
     phex(rcv); phex(ps2_error); print("\n");
+    ERROR_RETURN();
 
     // Device ID
     rcv = ps2_host_recv();
     print("ps2_mouse_init: read DevID: ");
     phex(rcv); phex(ps2_error); print("\n");
+    ERROR_RETURN();
 
     // Enable data reporting
     ps2_host_send(0xF4);
     print("ps2_mouse_init: send 0xF4: ");
     phex(ps2_error); print("\n");
+    ERROR_RETURN();
 
     // ACK
     rcv = ps2_host_recv();
     print("ps2_mouse_init: read ACK: ");
     phex(rcv); phex(ps2_error); print("\n");
+    ERROR_RETURN();
 
     // Set Remote mode
     ps2_host_send(0xF0);
     print("ps2_mouse_init: send 0xF0: ");
     phex(ps2_error); print("\n");
+    ERROR_RETURN();
 
     // ACK
     rcv = ps2_host_recv();
     print("ps2_mouse_init: read ACK: ");
     phex(rcv); phex(ps2_error); print("\n");
+    ERROR_RETURN();
 
-    if (ps2_error) ps2_mouse_error_count++;
+    return 0;
 }
 
 /*
@@ -84,18 +110,27 @@ Data format:
 1   x:   X movement(0-255)
 2   y:   Y movement(0-255)
 */
-void ps2_mouse_read(void)
+uint8_t ps2_mouse_read(void)
 {
     uint8_t rcv;
 
+    if (!ps2_mouse_enable) return 1;
+
     ps2_host_send(0xEB);
+    ERROR_RETURN();
+
     rcv=ps2_host_recv();
+    ERROR_RETURN();
+
     if(rcv==0xFA) {
         ps2_mouse_btn = ps2_host_recv();
+        ERROR_RETURN();
         ps2_mouse_x = ps2_host_recv();
+        ERROR_RETURN();
         ps2_mouse_y = ps2_host_recv();
+        ERROR_RETURN();
     }
-    if (ps2_error) ps2_mouse_error_count++;
+    return 0;
 }
 
 bool ps2_mouse_changed(void)
@@ -107,6 +142,9 @@ bool ps2_mouse_changed(void)
 void ps2_mouse_usb_send(void)
 {
     static bool scrolled = false;
+
+    if (!ps2_mouse_enable) return;
+
     if (ps2_mouse_changed()) {
         int8_t x, y, v, h;
         x = y = v = h = 0;

diff --git a/ps2_mouse.h b/ps2_mouse.h
index f590f3ad5d2a8c9961022c415eb7d02df8955b48..6efdf45fbf320a8c32538372dbd1e78e4c119088 100644 (file)
--- a/ps2_mouse.h
+++ b/ps2_mouse.h
@@ -12,13 +12,14 @@
 #define PS2_MOUSE_X_OVFLW       6
 #define PS2_MOUSE_Y_OVFLW       7
 
+bool ps2_mouse_enable;
 extern uint8_t ps2_mouse_x;
 extern uint8_t ps2_mouse_y;
 extern uint8_t ps2_mouse_btn;
 extern uint8_t ps2_mouse_error_count;
 
-void ps2_mouse_init(void);
-void ps2_mouse_read(void);
+uint8_t ps2_mouse_init(void);
+uint8_t ps2_mouse_read(void);
 bool ps2_mouse_changed(void);
 void ps2_mouse_usb_send(void);
 void ps2_mouse_print(void);