diff options
author | QMK Bot <hello@qmk.fm> | 2021-04-10 16:34:58 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-04-10 16:34:58 +0000 |
commit | 34323ecd8b4daa37723d662e2af84a6b81f3d618 (patch) | |
tree | 9dac9aca569477c09855df2309b4fd17d5b9f8b5 /tmk_core/protocol/chibios/usb_driver.c | |
parent | d5a8431af4fa3f64c457eca467ce3e969a08292b (diff) | |
parent | 7daa2e210cc7fc121259535d724962c9896c5f3a (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core/protocol/chibios/usb_driver.c')
-rw-r--r-- | tmk_core/protocol/chibios/usb_driver.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tmk_core/protocol/chibios/usb_driver.c b/tmk_core/protocol/chibios/usb_driver.c index eb72f8ff6d..40bfb8eb2b 100644 --- a/tmk_core/protocol/chibios/usb_driver.c +++ b/tmk_core/protocol/chibios/usb_driver.c @@ -81,17 +81,17 @@ static bool qmkusb_start_receive(QMKUSBDriver *qmkusbp) { */ static size_t _write(void *ip, const uint8_t *bp, size_t n) { - output_buffers_queue_t *obqueue = &((QMKUSBDriver *)ip)->obqueue; - chSysLock(); - const bool full = obqIsFullI(obqueue); - chSysUnlock(); - if (full || bqIsSuspendedX(obqueue)) { - /* Discard any writes while the queue is suspended or full, i.e. the hidraw - interface is not open. If we tried to send with an infinite timeout, we - would deadlock the keyboard otherwise. */ - return -1; - } - return obqWriteTimeout(obqueue, bp, n, TIME_INFINITE); + output_buffers_queue_t *obqueue = &((QMKUSBDriver *)ip)->obqueue; + chSysLock(); + const bool full = obqIsFullI(obqueue); + chSysUnlock(); + if (full || bqIsSuspendedX(obqueue)) { + /* Discard any writes while the queue is suspended or full, i.e. the hidraw + interface is not open. If we tried to send with an infinite timeout, we + would deadlock the keyboard otherwise. */ + return -1; + } + return obqWriteTimeout(obqueue, bp, n, TIME_INFINITE); } static size_t _read(void *ip, uint8_t *bp, size_t n) { return ibqReadTimeout(&((QMKUSBDriver *)ip)->ibqueue, bp, n, TIME_INFINITE); } |