pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #96 from petejohanson/core/usb-hid-error-release-semaphore

Browse source 
Fix for locking when USB sends fail (e.g. on BLE only)
This commit is contained in:
Pete Johanson 2020-08-18 17:55:06 -04:00 committed by GitHub
commit 1ae9e9d817
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/src/usb_hid.c
View file

@ -11,18 +11,42 @@
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
static enum usb_dc_status_code usb_status; static enum usb_dc_status_code usb_status = USB_DC_UNKNOWN;
static struct device *hid_dev; static struct device *hid_dev;
static K_SEM_DEFINE(hid_sem, 1, 1);
static void in_ready_cb(void)
{
k_sem_give(&hid_sem);
}
static const struct hid_ops ops =
{
.int_in_ready = in_ready_cb,
};
int zmk_usb_hid_send_report(const u8_t *report, size_t len) int zmk_usb_hid_send_report(const u8_t *report, size_t len)
{ {
if (usb_status == USB_DC_SUSPEND) switch(usb_status) {
{ case USB_DC_SUSPEND:
return usb_wakeup_request(); return usb_wakeup_request();
} case USB_DC_ERROR:
case USB_DC_RESET:
case USB_DC_DISCONNECTED:
case USB_DC_UNKNOWN:
return -ENODEV;
default:
k_sem_take(&hid_sem, K_MSEC(30));
int err = hid_int_ep_write(hid_dev, report, len, NULL);
return hid_int_ep_write(hid_dev, report, len, NULL); if (err) {
k_sem_give(&hid_sem);
}
return err;
}
} }
void usb_hid_status_cb(enum usb_dc_status_code status, const u8_t *params) void usb_hid_status_cb(enum usb_dc_status_code status, const u8_t *params)
@ -43,7 +67,7 @@ static int zmk_usb_hid_init(struct device *_arg)
usb_hid_register_device(hid_dev, usb_hid_register_device(hid_dev,
zmk_hid_report_desc, sizeof(zmk_hid_report_desc), zmk_hid_report_desc, sizeof(zmk_hid_report_desc),
NULL); &ops);
usb_hid_init(hid_dev); usb_hid_init(hid_dev);