From 095b28e006e6a44d734c36f36a6ef4d6744065b5 Mon Sep 17 00:00:00 2001 From: Rasmus Schults Date: Sun, 8 Apr 2018 00:07:26 +0300 Subject: Loop based vusb_transfer_keyboard --- tmk_core/protocol/vusb/vusb.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c index 35c0620d65..60e48c3a9c 100644 --- a/tmk_core/protocol/vusb/vusb.c +++ b/tmk_core/protocol/vusb/vusb.c @@ -27,6 +27,7 @@ along with this program. If not, see . #include "host_driver.h" #include "vusb.h" #include "bootloader.h" +#include static uint8_t vusb_keyboard_leds = 0; @@ -46,22 +47,26 @@ typedef struct { static keyboard_report_t keyboard_report; // sent to PC +#define VUSB_TRANSFER_KEYBOARD_MAX_TRIES 10 + /* transfer keyboard report from buffer */ void vusb_transfer_keyboard(void) { - if (usbInterruptIsReady()) { - if (kbuf_head != kbuf_tail) { - usbSetInterrupt((void *)&kbuf[kbuf_tail], sizeof(report_keyboard_t)); - kbuf_tail = (kbuf_tail + 1) % KBUF_SIZE; - if (debug_keyboard) { - print("V-USB: kbuf["); pdec(kbuf_tail); print("->"); pdec(kbuf_head); print("]("); - phex((kbuf_head < kbuf_tail) ? (KBUF_SIZE - kbuf_tail + kbuf_head) : (kbuf_head - kbuf_tail)); - print(")\n"); + for (int i = 0; i < VUSB_TRANSFER_KEYBOARD_MAX_TRIES; i++) { + if (usbInterruptIsReady()) { + if (kbuf_head != kbuf_tail) { + usbSetInterrupt((void *)&kbuf[kbuf_tail], sizeof(report_keyboard_t)); + kbuf_tail = (kbuf_tail + 1) % KBUF_SIZE; + if (debug_keyboard) { + print("V-USB: kbuf["); pdec(kbuf_tail); print("->"); pdec(kbuf_head); print("]("); + phex((kbuf_head < kbuf_tail) ? (KBUF_SIZE - kbuf_tail + kbuf_head) : (kbuf_head - kbuf_tail)); + print(")\n"); + } } + break; } - } else { - usbPoll(); - vusb_transfer_keyboard(); + usbPoll(); + _delay_ms(1); } } -- cgit v1.2.1