]> git.friedersdorff.com Git - max/tmk_keyboard.git/blobdiff - converter/ibmpc_usb/ibmpc_usb.c
Merge remote-tracking branch 'origin/ibmpc_timer0isr_fix'
[max/tmk_keyboard.git] / converter / ibmpc_usb / ibmpc_usb.c
index 2270e1bae4235e8b650d52dddd449b99486e0ce8..cf1ab0b747bf5ffb1e519722a2c10ffba6988043 100644 (file)
@@ -113,6 +113,8 @@ uint8_t matrix_scan(void)
     // scan code reading states
     static enum {
         INIT,
+        WAIT_SETTLE,
+        AT_RESET,
         XT_RESET,
         XT_RESET_WAIT,
         XT_RESET_DONE,
@@ -127,35 +129,45 @@ uint8_t matrix_scan(void)
 
 
     if (ibmpc_error) {
-        xprintf("\nERR:%02X\n", ibmpc_error);
+        xprintf("\nERR:%02X ISR:%04X ", ibmpc_error, ibmpc_isr_debug);
 
         // when recv error, neither send error nor buffer full
         if (!(ibmpc_error & (IBMPC_ERR_SEND | IBMPC_ERR_FULL))) {
             // keyboard init again
             if (state == LOOP) {
-                xprintf("init\n");
+                xprintf("[RST] ");
                 state = INIT;
             }
         }
 
         // clear or process error
         ibmpc_error = IBMPC_ERR_NONE;
-    }
-
-    // check ISR state debug
-    if (ibmpc_isr_debug) {
-        xprintf("\nISR:%04X\n", ibmpc_isr_debug);
         ibmpc_isr_debug = 0;
     }
 
-    // check protocol AT/XT
-    if (ibmpc_protocol != current_protocol) {
-        xprintf("\nPROTO:%02X\n", ibmpc_protocol);
+    // check protocol change AT/XT
+    if (ibmpc_protocol && ibmpc_protocol != current_protocol) {
+        xprintf("\nPRT:%02X ISR:%04X ", ibmpc_protocol, ibmpc_isr_debug);
+
+        // protocol change between AT and XT indicates that
+        // keyboard is hotswapped or something goes wrong.
+        // This requires initializing keyboard again probably.
+        if (((current_protocol&IBMPC_PROTOCOL_XT) && (ibmpc_protocol&IBMPC_PROTOCOL_AT)) ||
+            ((current_protocol&IBMPC_PROTOCOL_AT) && (ibmpc_protocol&IBMPC_PROTOCOL_XT))) {
+            if (state == LOOP) {
+                xprintf("[CHG] ");
+                state = INIT;
+            }
+        }
+
         current_protocol = ibmpc_protocol;
+        ibmpc_isr_debug = 0;
     }
 
     switch (state) {
         case INIT:
+            ibmpc_host_disable();
+
             xprintf("I%u ", timer_read());
             keyboard_kind = NONE;
             keyboard_id = 0x0000;
@@ -163,7 +175,31 @@ uint8_t matrix_scan(void)
             matrix_clear();
             clear_keyboard();
 
-            state = XT_RESET;
+            init_time = timer_read();
+            state = WAIT_SETTLE;
+            break;
+        case WAIT_SETTLE:
+            // wait for keyboard to settle after plugin
+            if (timer_elapsed(init_time) > 1000) {
+                state = AT_RESET;
+            }
+            break;
+        case AT_RESET:
+            ibmpc_host_isr_clear();
+            ibmpc_host_enable();
+            wait_ms(1); // keyboard can't respond to command without this
+
+            // SKIDATA-2-DE(and some other keyboards?) stores 'Code Set' setting in nonvlatile memory
+            // and keeps it until receiving reset. Sending reset here may be useful to clear it, perhaps.
+            // https://github.com/tmk/tmk_keyboard/wiki/IBM-PC-AT-Keyboard-Protocol#select-alternate-scan-codesf0
+
+            // reset command
+            if (0xFA == ibmpc_host_send(0xFF)) {
+                state = WAIT_AA;
+            } else {
+                state = XT_RESET;
+            }
+            xprintf("A%u ", timer_read());
             break;
         case XT_RESET:
             // Reset XT-initialize keyboard
@@ -230,19 +266,8 @@ uint8_t matrix_scan(void)
             }
             break;
         case READ_ID:
-            xprintf("R%u ", timer_read());
-
-            // SKIDATA-2-DE(and some other keyboards?) stores 'Code Set' setting in nonvlatile memory
-            // and keeps it until receiving reset. Sending reset here may be useful to clear it, perhaps.
-            // https://github.com/tmk/tmk_keyboard/wiki/IBM-PC-AT-Keyboard-Protocol#select-alternate-scan-codesf0
-            //ibmpc_host_send(0xFF);  // reset command
-            //read_wait(500);         // BAT takes 600-900ms(84-key) or 300-500ms(101/102-key) [8] 4-7, 4-39
-
             keyboard_id = read_keyboard_id();
-            if (ibmpc_error) {
-                xprintf("\nERR:%02X\n", ibmpc_error);
-                ibmpc_error = IBMPC_ERR_NONE;
-            }
+            xprintf("R%u ", timer_read());
 
             if (0x0000 == keyboard_id) {            // CodeSet2 AT(IBM PC AT 84-key)
                 keyboard_kind = PC_AT;
@@ -280,7 +305,7 @@ uint8_t matrix_scan(void)
                 keyboard_kind = PC_AT;
             }
 
-            xprintf("ID:%04X(%d)\n", keyboard_id, keyboard_kind);
+            xprintf("\nID:%04X(%d) ", keyboard_id, keyboard_kind);
 
             state = SETUP;
             break;
@@ -295,6 +320,8 @@ uint8_t matrix_scan(void)
                 case PC_TERMINAL:
                     // Set all keys to make/break type
                     ibmpc_host_send(0xF8);
+                    // This should not be harmful
+                    led_set(host_keyboard_leds());
                     break;
                 default:
                     break;
@@ -314,17 +341,11 @@ uint8_t matrix_scan(void)
                 // Scan Code Set 2 and 3: 0x00
                 // Buffer full(IBMPC_ERR_FULL): 0xFF
                 if (code == 0x00 || code == 0xFF) {
-                    xprintf("\n!OVERRUN![");
-
-                    // read and ignore data
-                    do {
-                        wait_ms(10);
-                    } while ((code = ibmpc_host_recv()) != -1);
-                    xprintf("]\n");
-
                     // clear stuck keys
                     matrix_clear();
                     clear_keyboard();
+
+                    xprintf("\n[OVR] ");
                     break;
                 }
 
@@ -394,9 +415,19 @@ void matrix_clear(void)
 
 void led_set(uint8_t usb_led)
 {
+    // Sending before keyboard recognition may be harmful for XT keyboard
     if (keyboard_kind == NONE) return;
-    //if (keyboard_kind != PC_AT) return;
 
+    // XT keyobard doesn't support any command and it is harmful perhaps
+    // https://github.com/tmk/tmk_keyboard/issues/635#issuecomment-626993437
+    if (keyboard_kind == PC_XT) return;
+
+    // It should be safe to send the command to keyboards with AT protocol
+    // - IBM Terminal doesn't support the command and response with 0xFE but it is not harmful.
+    // - Some other Terminals like G80-2551 supports the command.
+    //   https://geekhack.org/index.php?topic=103648.msg2894921#msg2894921
+
+    // TODO: PC_TERMINAL_IBM_RT support
     uint8_t ibmpc_led = 0;
     if (usb_led &  (1<<USB_LED_SCROLL_LOCK))
         ibmpc_led |= (1<<IBMPC_LED_SCROLL_LOCK);
@@ -730,10 +761,7 @@ static int8_t process_cs2(uint8_t code)
                     break;
                 case 0xAA:  // Self-test passed
                 case 0xFC:  // Self-test failed
-                    // reset or plugin-in new keyboard
-                    state = INIT;
-                    return -1;
-                    break;
+                    // replug or unstable connection probably
                 default:    // normal key make
                     state = INIT;
                     if (code < 0x80) {
@@ -919,7 +947,7 @@ static int8_t process_cs3(uint8_t code)
                         matrix_make(code);
                     } else {
                         xprintf("!CS3_READY!\n");
-                        //return -1;
+                        return -1;
                     }
             }
             break;
@@ -963,7 +991,7 @@ static int8_t process_cs3(uint8_t code)
                         matrix_break(code);
                     } else {
                         xprintf("!CS3_F0!\n");
-                        //return -1;
+                        return -1;
                     }
             }
             break;