From 80fd3b0b240a8840fbca1cc3cc70e76f5b52b888 Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 19 May 2015 00:32:58 +0900 Subject: ibm4704_usb: Fix protocol handling --- converter/ibm4704_usb/matrix.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) (limited to 'converter/ibm4704_usb/matrix.c') diff --git a/converter/ibm4704_usb/matrix.c b/converter/ibm4704_usb/matrix.c index 5f928d716f..155df9c38f 100644 --- a/converter/ibm4704_usb/matrix.c +++ b/converter/ibm4704_usb/matrix.c @@ -67,35 +67,31 @@ uint8_t matrix_cols(void) static void enable_break(void) { - uint8_t ret; print("Enable break: "); // valid scancode: 00-79h for (uint8_t code = 0; code < 0x7A; code++) { - while (ibm4704_send(0x80|code)) _delay_ms(1); - // get none when ok, get FD when out of bound - _delay_ms(5); - if ((ret = ibm4704_recv()) != 0xff) { - xprintf("c%02X:r%02X ", code, ret); - } - _delay_ms(1); + while (ibm4704_send(0x80|code)) _delay_ms(10); + _delay_ms(5); // wait for response + // No response(FF) when ok, FD when out of bound + xprintf("s%02X:r%02X ", code, ibm4704_recv()); } - _delay_us(1000); - while (ibm4704_send(0xFF)) { _delay_ms(1); } // End + while (ibm4704_send(0xFF)) { _delay_ms(10); } // End print("End\n"); } -void matrix_init(void) -{ - debug_enable = true; +void matrix_setup(void) +{ ibm4704_init(); - matrix_clear(); +} - _delay_ms(2000); // wait for starting up debug console +void matrix_init(void) +{ + debug_enable = true; print("IBM 4704 converter\n"); - while (ibm4704_send(0xFE)) _delay_ms(1); // resend - _delay_ms(5); + matrix_clear(); + _delay_ms(2000); // wait for keyboard starting up xprintf("Keyboard ID: %02X\n", ibm4704_recv()); enable_break(); } -- cgit v1.2.3