From d42aa47809c97a77c49e9396201c2b5c3956bb54 Mon Sep 17 00:00:00 2001 From: tmk Date: Mon, 27 Oct 2014 21:39:02 +0900 Subject: Fix ibm4704 protocol with using interrupt --- tmk_core/protocol/ibm4704.c | 135 +++++++++++++++++++++++++------------------- 1 file changed, 78 insertions(+), 57 deletions(-) (limited to 'tmk_core') diff --git a/tmk_core/protocol/ibm4704.c b/tmk_core/protocol/ibm4704.c index 10e229fd1..152d7e61b 100644 --- a/tmk_core/protocol/ibm4704.c +++ b/tmk_core/protocol/ibm4704.c @@ -4,6 +4,7 @@ Copyright 2010,2011,2012,2013 Jun WAKO #include #include #include "debug.h" +#include "ring_buffer.h" #include "ibm4704.h" @@ -20,7 +21,9 @@ uint8_t ibm4704_error = 0; void ibm4704_init(void) { - inhibit(); + IBM4704_INT_INIT(); + IBM4704_INT_ON(); + idle(); } /* @@ -47,6 +50,8 @@ uint8_t ibm4704_send(uint8_t data) bool parity = true; // odd parity ibm4704_error = 0; + IBM4704_INT_OFF(); + /* Request to send */ idle(); clock_lo(); @@ -57,7 +62,6 @@ uint8_t ibm4704_send(uint8_t data) /* Data bit */ for (uint8_t i = 0; i < 8; i++) { WAIT(clock_hi, 100, 0x40+i); - //_delay_us(5); if (data&(1<= 0x30) { - xprintf("x%02X ", ibm4704_error); + idle(); + if (ibm4704_error > 0x30) { + xprintf("S:%02X ", ibm4704_error); } - _delay_us(200); // wait to recover clock to hi + IBM4704_INT_ON(); return -1; } -/* receive data when host want else inhibit communication */ +/* wait forever to receive data */ uint8_t ibm4704_recv_response(void) { - // 250 * 100us(wait start bit in ibm4704_recv) - uint8_t data = 0; - uint8_t try = 250; - do { - data = ibm4704_recv(); - } while (try-- && ibm4704_error); - return data; + while (!rbuf_has_data()) { + _delay_ms(1); + } + return rbuf_dequeue(); } /* @@ -121,49 +122,69 @@ Stop bit: Keyboard pulls down Data line to lo after 9th clock. */ uint8_t ibm4704_recv(void) { - uint8_t data = 0; - bool parity = true; // odd parity - ibm4704_error = IBM4704_ERR_NONE; - - idle(); - _delay_us(5); // wait for line settles - - /* start bit */ - WAIT(clock_lo, 100, 0x11); // wait for keyboard to send - WAIT(data_hi, 100, 0x12); // can be delayed that long - - WAIT(clock_hi, 100, 0x13); // first rising edge which can take longer - /* data */ - for (uint8_t i = 0; i < 8; i++) { - WAIT(clock_hi, 100, 0x20+i); - //_delay_us(5); - if (data_in()) { - parity = !parity; - data |= (1< 0x12) { - xprintf("x%02X ", ibm4704_error); + ibm4704_error = 0; + // return unless falling edge + if (clock_in()) { goto RETURN; } // why this occurs? + + state++; + switch (state) { + case START: + // Data:Low + WAIT(data_hi, 10, state); + break; + case BIT0: + case BIT1: + case BIT2: + case BIT3: + case BIT4: + case BIT5: + case BIT6: + case BIT7: + data >>= 1; + if (data_in()) { + data |= 0x80; + parity = !parity; + } + break; + case PARITY: + if (data_in()) { + parity = !parity; + } + if (!parity) + goto ERROR; + rbuf_enqueue(data); + ibm4704_error = IBM4704_ERR_NONE; + goto DONE; + break; + default: + goto ERROR; } - inhibit(); - _delay_us(200); // wait to recover clock to hi - return -1; + goto RETURN; +ERROR: + ibm4704_error = state; + while (ibm4704_send(0xFE)) _delay_ms(1); // resend + xprintf("R:%02X\n", data); +DONE: + state = INIT; + data = 0; + parity = false; +RETURN: + return; } -- cgit v1.2.3-70-g09d2 From d5482f29f46174bfa8854653f8a6cab5af97085e Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 28 Oct 2014 14:41:45 +0900 Subject: Fix debug print --- converter/ibm4704_usb/config.h | 21 +++++---------------- converter/ibm4704_usb/matrix.c | 2 +- tmk_core/protocol/ibm4704.c | 2 +- 3 files changed, 7 insertions(+), 18 deletions(-) (limited to 'tmk_core') diff --git a/converter/ibm4704_usb/config.h b/converter/ibm4704_usb/config.h index 812d95c67..4f267b3b7 100644 --- a/converter/ibm4704_usb/config.h +++ b/converter/ibm4704_usb/config.h @@ -41,9 +41,7 @@ along with this program. If not, see . -/* - * Busywait - */ +/* Pin configuration */ #define IBM4704_CLOCK_PORT PORTD #define IBM4704_CLOCK_PIN PIND #define IBM4704_CLOCK_DDR DDRD @@ -53,19 +51,10 @@ along with this program. If not, see . #define IBM4704_DATA_DDR DDRD #define IBM4704_DATA_BIT 0 -/* - * Pin interrupt - */ -#define IBM4704_INT_INIT() do { \ - EICRA |= ((1< Date: Wed, 22 Apr 2015 14:35:20 +0900 Subject: Move ring_buffer.h file --- common/ring_buffer.h | 53 -------------------------------------------------- tmk_core/ring_buffer.h | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 53 deletions(-) delete mode 100644 common/ring_buffer.h create mode 100644 tmk_core/ring_buffer.h (limited to 'tmk_core') diff --git a/common/ring_buffer.h b/common/ring_buffer.h deleted file mode 100644 index 7bdebbcf3..000000000 --- a/common/ring_buffer.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef RING_BUFFER_H -#define RING_BUFFER_H -/*-------------------------------------------------------------------- - * Ring buffer to store scan codes from keyboard - *------------------------------------------------------------------*/ -#define RBUF_SIZE 32 -static uint8_t rbuf[RBUF_SIZE]; -static uint8_t rbuf_head = 0; -static uint8_t rbuf_tail = 0; -static inline void rbuf_enqueue(uint8_t data) -{ - uint8_t sreg = SREG; - cli(); - uint8_t next = (rbuf_head + 1) % RBUF_SIZE; - if (next != rbuf_tail) { - rbuf[rbuf_head] = data; - rbuf_head = next; - } else { - print("rbuf: full\n"); - } - SREG = sreg; -} -static inline uint8_t rbuf_dequeue(void) -{ - uint8_t val = 0; - - uint8_t sreg = SREG; - cli(); - if (rbuf_head != rbuf_tail) { - val = rbuf[rbuf_tail]; - rbuf_tail = (rbuf_tail + 1) % RBUF_SIZE; - } - SREG = sreg; - - return val; -} -static inline bool rbuf_has_data(void) -{ - uint8_t sreg = SREG; - cli(); - bool has_data = (rbuf_head != rbuf_tail); - SREG = sreg; - return has_data; -} -static inline void rbuf_clear(void) -{ - uint8_t sreg = SREG; - cli(); - rbuf_head = rbuf_tail = 0; - SREG = sreg; -} - -#endif /* RING_BUFFER_H */ diff --git a/tmk_core/ring_buffer.h b/tmk_core/ring_buffer.h new file mode 100644 index 000000000..7bdebbcf3 --- /dev/null +++ b/tmk_core/ring_buffer.h @@ -0,0 +1,53 @@ +#ifndef RING_BUFFER_H +#define RING_BUFFER_H +/*-------------------------------------------------------------------- + * Ring buffer to store scan codes from keyboard + *------------------------------------------------------------------*/ +#define RBUF_SIZE 32 +static uint8_t rbuf[RBUF_SIZE]; +static uint8_t rbuf_head = 0; +static uint8_t rbuf_tail = 0; +static inline void rbuf_enqueue(uint8_t data) +{ + uint8_t sreg = SREG; + cli(); + uint8_t next = (rbuf_head + 1) % RBUF_SIZE; + if (next != rbuf_tail) { + rbuf[rbuf_head] = data; + rbuf_head = next; + } else { + print("rbuf: full\n"); + } + SREG = sreg; +} +static inline uint8_t rbuf_dequeue(void) +{ + uint8_t val = 0; + + uint8_t sreg = SREG; + cli(); + if (rbuf_head != rbuf_tail) { + val = rbuf[rbuf_tail]; + rbuf_tail = (rbuf_tail + 1) % RBUF_SIZE; + } + SREG = sreg; + + return val; +} +static inline bool rbuf_has_data(void) +{ + uint8_t sreg = SREG; + cli(); + bool has_data = (rbuf_head != rbuf_tail); + SREG = sreg; + return has_data; +} +static inline void rbuf_clear(void) +{ + uint8_t sreg = SREG; + cli(); + rbuf_head = rbuf_tail = 0; + SREG = sreg; +} + +#endif /* RING_BUFFER_H */ -- cgit v1.2.3-70-g09d2