alvierahman90/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update ChibiOS to 17.6.3

Browse Source
This commit is contained in:
Fred Sundvik 2018-01-20 18:12:38 +02:00 committed by Jack Humbert
parent ad01e3c03a
commit 6a9617b1c6
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/chibios

@ -1 +1 @@
Subproject commit 8fce03b3a75c743e5d5c40b9d59c1637c59d22a7 Subproject commit e26cb16a7296a196d7c74eae22cbee00989cb7b6

11
tmk_core/protocol/chibios/usb_main.c
View File

@ -778,10 +778,6 @@ static const USBEndpointConfig nkro_ep_config = {
* TODO: maybe disable some things when connection is lost? */ * TODO: maybe disable some things when connection is lost? */
static void usb_event_cb(USBDriver *usbp, usbevent_t event) { static void usb_event_cb(USBDriver *usbp, usbevent_t event) {
switch(event) { switch(event) {
case USB_EVENT_RESET:
//TODO: from ISR! print("[R]");
return;
case USB_EVENT_ADDRESS: case USB_EVENT_ADDRESS:
return; return;
@ -804,12 +800,15 @@ static void usb_event_cb(USBDriver *usbp, usbevent_t event) {
#endif /* NKRO_ENABLE */ #endif /* NKRO_ENABLE */
osalSysUnlockFromISR(); osalSysUnlockFromISR();
return; return;
case USB_EVENT_SUSPEND: case USB_EVENT_SUSPEND:
//TODO: from ISR! print("[S]"); //TODO: from ISR! print("[S]");
#ifdef SLEEP_LED_ENABLE #ifdef SLEEP_LED_ENABLE
sleep_led_enable(); sleep_led_enable();
#endif /* SLEEP_LED_ENABLE */ #endif /* SLEEP_LED_ENABLE */
/* Falls into.*/
case USB_EVENT_UNCONFIGURED:
/* Falls into.*/
case USB_EVENT_RESET:
return; return;
case USB_EVENT_WAKEUP: case USB_EVENT_WAKEUP:
@ -1032,7 +1031,7 @@ void init_usb_driver(USBDriver *usbp) {
chVTObjectInit(&keyboard_idle_timer); chVTObjectInit(&keyboard_idle_timer);
#ifdef CONSOLE_ENABLE #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); chVTObjectInit(&console_flush_timer);
#endif #endif
} }