diff options
| author | tmk <hasu@tmk-kbd.com> | 2015-05-19 00:32:58 +0900 |
|---|---|---|
| committer | tmk <hasu@tmk-kbd.com> | 2015-05-19 00:39:44 +0900 |
| commit | 80fd3b0b240a8840fbca1cc3cc70e76f5b52b888 (patch) | |
| tree | 92cbbfe97ca83ab5646c8cd48758207cdeceb615 /tmk_core | |
| parent | 6b588eb7f7893500e18686e673dbf12b511dc975 (diff) | |
| download | qmk_firmware-80fd3b0b240a8840fbca1cc3cc70e76f5b52b888.tar.gz qmk_firmware-80fd3b0b240a8840fbca1cc3cc70e76f5b52b888.zip | |
ibm4704_usb: Fix protocol handling
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/protocol/ibm4704.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/tmk_core/protocol/ibm4704.c b/tmk_core/protocol/ibm4704.c index a2c6700477..6a03cd4419 100644 --- a/tmk_core/protocol/ibm4704.c +++ b/tmk_core/protocol/ibm4704.c @@ -21,9 +21,10 @@ uint8_t ibm4704_error = 0; void ibm4704_init(void) { + inhibit(); // keep keyboard from sending IBM4704_INT_INIT(); IBM4704_INT_ON(); - idle(); + idle(); // allow keyboard sending } /* @@ -132,8 +133,8 @@ Stop bit: Keyboard pulls down Data line to lo after 9th clock. ISR(IBM4704_INT_VECT) { static enum { - STOP, BIT0, BIT1, BIT2, BIT3, BIT4, BIT5, BIT6, BIT7, PARITY - } state = STOP; + BIT0, BIT1, BIT2, BIT3, BIT4, BIT5, BIT6, BIT7, PARITY, STOP + } state = BIT0; // LSB first static uint8_t data = 0; // Odd parity @@ -141,11 +142,7 @@ ISR(IBM4704_INT_VECT) ibm4704_error = 0; - switch (state++) { - case STOP: - // Data:Low - WAIT(data_lo, 10, state); - break; + switch (state) { case BIT0: case BIT1: case BIT2: @@ -166,6 +163,10 @@ ISR(IBM4704_INT_VECT) } if (!parity) goto ERROR; + break; + case STOP: + // Data:Low + WAIT(data_lo, 100, state); rbuf_enqueue(data); ibm4704_error = IBM4704_ERR_NONE; goto DONE; @@ -173,13 +174,14 @@ ISR(IBM4704_INT_VECT) default: goto ERROR; } + state++; goto RETURN; ERROR: ibm4704_error = state; while (ibm4704_send(0xFE)) _delay_ms(1); // resend xprintf("R:%02X%02X\n", state, data); DONE: - state = STOP; + state = BIT0; data = 0; parity = false; RETURN: |