From 4d116a04e94cf0d19317d5b44e4fa9f34a3e5594 Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 28 Apr 2015 11:27:10 +0900 Subject: Squashed 'tmk_core/' changes from b9e0ea0..caca2c0 caca2c0 Add mouse support to ADB 5b0835a Merge commit '1fe4406f374291ab2e86e95a97341fd9c475fcb8' f2f7556 Remove unneeded tap delays #201 8124195 Fix URL of HID Usage Tables pdf 0bb4679 Fix typo of doc/keycode.txt b24fa1a Fix handling of consumer usage #199 6ae1a3d Improve anti-ghosting behavior for fast typing a4c9763 Fix dfu-programmer parameters b62b3f2 Move ring_buffer.h file 6ec424f Fix debug print 502fb0c Fix ibm4704 protocol with using interrupt git-subtree-dir: tmk_core git-subtree-split: caca2c01553394d959550034c817520d575c7fa0 --- protocol/adb.c | 24 +++++++++- protocol/adb.h | 4 ++ protocol/ibm4704.c | 135 +++++++++++++++++++++++++++++++---------------------- protocol/pjrc.mk | 4 ++ 4 files changed, 109 insertions(+), 58 deletions(-) (limited to 'protocol') diff --git a/protocol/adb.c b/protocol/adb.c index bbff66df03..5c6c99b4fc 100644 --- a/protocol/adb.c +++ b/protocol/adb.c @@ -60,6 +60,7 @@ static inline void place_bit1(void); static inline void send_byte(uint8_t data); static inline uint16_t wait_data_lo(uint16_t us); static inline uint16_t wait_data_hi(uint16_t us); +static inline uint16_t adb_host_dev_recv(uint8_t device); void adb_host_init(void) @@ -121,12 +122,33 @@ bool adb_host_psw(void) // // [from Apple IIgs Hardware Reference Second Edition] +enum { + ADDR_KEYB = 0x20, + ADDR_MOUSE = 0x30 +}; + uint16_t adb_host_kbd_recv(void) +{ + return adb_host_dev_recv(ADDR_KEYB); +} + +#ifdef ADB_MOUSE_ENABLE +void adb_mouse_init(void) { + return; +} + +uint16_t adb_host_mouse_recv(void) +{ + return adb_host_dev_recv(ADDR_MOUSE); +} +#endif + +static inline uint16_t adb_host_dev_recv(uint8_t device) { uint16_t data = 0; cli(); attention(); - send_byte(0x2C); // Addr:Keyboard(0010), Cmd:Talk(11), Register0(00) + send_byte(device|0x0C); // Addr:Keyboard(0010)/Mouse(0011), Cmd:Talk(11), Register0(00) place_bit0(); // Stopbit(0) if (!wait_data_hi(500)) { // Service Request(310us Adjustable Keyboard): just ignored sei(); diff --git a/protocol/adb.h b/protocol/adb.h index bfe598bbf1..b4b3633cf4 100644 --- a/protocol/adb.h +++ b/protocol/adb.h @@ -56,7 +56,11 @@ POSSIBILITY OF SUCH DAMAGE. void adb_host_init(void); bool adb_host_psw(void); uint16_t adb_host_kbd_recv(void); +uint16_t adb_host_mouse_recv(void); void adb_host_listen(uint8_t cmd, uint8_t data_h, uint8_t data_l); void adb_host_kbd_led(uint8_t led); +void adb_mouse_task(void); +void adb_mouse_init(void); + #endif diff --git a/protocol/ibm4704.c b/protocol/ibm4704.c index 10e229fd15..a10a5e74d9 100644 --- a/protocol/ibm4704.c +++ b/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%02X\n", state, data); +DONE: + state = INIT; + data = 0; + parity = false; +RETURN: + return; } diff --git a/protocol/pjrc.mk b/protocol/pjrc.mk index 36585de7df..2b1ba2cbfb 100644 --- a/protocol/pjrc.mk +++ b/protocol/pjrc.mk @@ -11,6 +11,10 @@ ifdef MOUSEKEY_ENABLE SRC += $(PJRC_DIR)/usb_mouse.c endif +ifdef ADB_MOUSE_ENABLE + SRC += $(PJRC_DIR)/usb_mouse.c +endif + ifdef PS2_MOUSE_ENABLE SRC += $(PJRC_DIR)/usb_mouse.c endif -- cgit v1.2.3