]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Update ChibiOS to 17.6.3
authorFred Sundvik <fsundvik@gmail.com>
Sat, 20 Jan 2018 16:12:38 +0000 (18:12 +0200)
committerJack Humbert <jack.humb@gmail.com>
Wed, 7 Feb 2018 22:16:01 +0000 (17:16 -0500)
lib/chibios
tmk_core/protocol/chibios/usb_main.c

index 8fce03b3a75c743e5d5c40b9d59c1637c59d22a7..e26cb16a7296a196d7c74eae22cbee00989cb7b6 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 8fce03b3a75c743e5d5c40b9d59c1637c59d22a7
+Subproject commit e26cb16a7296a196d7c74eae22cbee00989cb7b6
index 9bfdf572a10f82b319bc44723df89dd4ae94ad80..6173d3ad1c5993c39b9664238e6b873044a5d624 100644 (file)
@@ -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
 }