ibmpc: Add timeout check

diff --git a/tmk_core/protocol/ibmpc.c b/tmk_core/protocol/ibmpc.c
index 65c44ab7498ac6b628a9c9ff9ac7eebb06c61696..3606022d761205e40fd3e4e6fa000d38b4ce1124 100644 (file)
--- a/tmk_core/protocol/ibmpc.c
+++ b/tmk_core/protocol/ibmpc.c
@@ -69,6 +69,7 @@ volatile uint8_t ibmpc_error = IBMPC_ERR_NONE;
 static volatile uint16_t recv_data = 0xFFFF;
 /* internal state of receiving data */
 static volatile uint16_t isr_state = 0x8000;
+static uint8_t timer_start = 0;
 
 void ibmpc_host_init(void)
 {
@@ -205,6 +206,25 @@ ISR(IBMPC_INT_VECT)
 {
     uint8_t dbit;
     dbit = IBMPC_DATA_PIN&(1<<IBMPC_DATA_BIT);
+
+    // Timeout check
+    uint8_t t;
+    // use only the least byte of millisecond timer
+    asm("lds %0, %1" : "=r" (t) : "p" (&timer_count));
+    //t = (uint8_t)timer_count;    // compiler uses four registers instead of one
+    if (isr_state == 0x8000) {
+        timer_start = t;
+    } else {
+        // should not take more than 1ms
+        if (timer_start != t && (uint8_t)(timer_start + 1) != t) {
+            ibmpc_error = IBMPC_ERR_TIMEOUT;
+            //goto ERROR;
+            // timeout error recovery by clearing isr_state?
+            timer_start = t;
+            isr_state = 0x8000;
+        }
+    }
+
     isr_state = isr_state>>1;
     if (dbit) isr_state |= 0x8000;
 
@@ -270,6 +290,7 @@ ISR(IBMPC_INT_VECT)
         case 0b10010000:
         case 0b01010000:
         case 0b11010000:
+            // TODO: parity check?
             // AT-done
             recv_data = recv_data<<8;
             recv_data |= (isr_state>>6) & 0xFF;
@@ -283,6 +304,7 @@ ISR(IBMPC_INT_VECT)
         case 0b11110000:
         default:            // xxxx_oooo(any 1 in low nibble)
             // Illegal
+            ibmpc_error = IBMPC_ERR_ILLEGAL;
             goto ERROR;
             break;
     }
@@ -290,7 +312,6 @@ ISR(IBMPC_INT_VECT)
 ERROR:
     isr_state = 0x8000;
     recv_data = 0xFF00; // clear data and scancode of error 0x00
-    ibmpc_error = 0xFF;
     return;
 DONE:
     // TODO: process error code: 0x00(AT), 0xFF(XT) in particular

diff --git a/tmk_core/protocol/ibmpc.h b/tmk_core/protocol/ibmpc.h
index fc117f23c174cd8b7d09d0a4df4fd68e6d7419f6..18da8f4cbd1ea3fed6387487ffd7a52247c22e33 100644 (file)
--- a/tmk_core/protocol/ibmpc.h
+++ b/tmk_core/protocol/ibmpc.h
@@ -79,6 +79,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #define IBMPC_ERR_SEND        0x10
 #define IBMPC_ERR_TIMEOUT     0x20
 #define IBMPC_ERR_FULL        0x40
+#define IBMPC_ERR_ILLEGAL     0x80
 
 #define IBMPC_LED_SCROLL_LOCK 0
 #define IBMPC_LED_NUM_LOCK    1