summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2018-01-20 17:12:38 +0100
committerJack Humbert <jack.humb@gmail.com>2018-02-07 23:16:01 +0100
commit6a9617b1c6fc298397e3bf9aef61cd0de55e36c8 (patch)
treebb6bca2c8edd91d8b2ced25e5554ca7f76dbaeaf
parentad01e3c03a5213a46d5e6bd14cbb3c3231f68c78 (diff)
downloadqmk_firmware-6a9617b1c6fc298397e3bf9aef61cd0de55e36c8.tar.gz
qmk_firmware-6a9617b1c6fc298397e3bf9aef61cd0de55e36c8.tar.xz
Update ChibiOS to 17.6.3
m---------lib/chibios0
-rw-r--r--tmk_core/protocol/chibios/usb_main.c11
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/chibios b/lib/chibios
-Subproject 8fce03b3a75c743e5d5c40b9d59c1637c59d22a
+Subproject e26cb16a7296a196d7c74eae22cbee00989cb7b
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 9bfdf572a..6173d3ad1 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -778,10 +778,6 @@ static const USBEndpointConfig nkro_ep_config = {
* TODO: maybe disable some things when connection is lost? */
static void usb_event_cb(USBDriver *usbp, usbevent_t event) {
switch(event) {
- case USB_EVENT_RESET:
- //TODO: from ISR! print("[R]");
- return;
-
case USB_EVENT_ADDRESS:
return;
@@ -804,12 +800,15 @@ static void usb_event_cb(USBDriver *usbp, usbevent_t event) {
#endif /* NKRO_ENABLE */
osalSysUnlockFromISR();
return;
-
case USB_EVENT_SUSPEND:
//TODO: from ISR! print("[S]");
#ifdef SLEEP_LED_ENABLE
sleep_led_enable();
#endif /* SLEEP_LED_ENABLE */
+ /* Falls into.*/
+ case USB_EVENT_UNCONFIGURED:
+ /* Falls into.*/
+ case USB_EVENT_RESET:
return;
case USB_EVENT_WAKEUP:
@@ -1032,7 +1031,7 @@ void init_usb_driver(USBDriver *usbp) {
chVTObjectInit(&keyboard_idle_timer);
#ifdef CONSOLE_ENABLE
- obqObjectInit(&console_buf_queue, console_queue_buffer, CONSOLE_EPSIZE, CONSOLE_QUEUE_CAPACITY, console_queue_onotify, (void*)usbp);
+ obqObjectInit(&console_buf_queue, false, console_queue_buffer, CONSOLE_EPSIZE, CONSOLE_QUEUE_CAPACITY, console_queue_onotify, (void*)usbp);
chVTObjectInit(&console_flush_timer);
#endif
}