diff options
Diffstat (limited to 'app/usb.c')
| -rw-r--r-- | app/usb.c | 31 |
1 files changed, 18 insertions, 13 deletions
@@ -25,7 +25,7 @@ const struct usb_interface ifaces[] = { { .num_altsetting = 1, .altsetting = &consumer_iface, - }, + }, { .num_altsetting = 1, .altsetting = &dfu_iface, @@ -62,14 +62,16 @@ usbd_device *usbd_dev; static int usb_control_class_request (usbd_device * usbd_dev, struct usb_setup_data *req, - uint8_t ** buf, uint16_t * len, - void (**complete) (usbd_device * usbd_dev, - struct usb_setup_data * req)) + uint8_t ** buf, uint16_t * len, + void (**complete) (usbd_device * usbd_dev, + struct usb_setup_data * req)) { - if (keyboard_control_request(usbd_dev,req,buf,len,complete)) return 1; - if (dfu_control_request(usbd_dev,req,buf,len,complete)) return 1; + if (keyboard_control_request (usbd_dev, req, buf, len, complete)) + return 1; + if (dfu_control_request (usbd_dev, req, buf, len, complete)) + return 1; -return 0; + return 0; } static int @@ -90,9 +92,9 @@ usb_control_request (usbd_device * usbd_dev, struct usb_setup_data *req, consumer_get_descriptor (buf, len); return 1; } - - *len = 0; - return 0; + + *len = 0; + return 0; *len = 0; @@ -106,11 +108,14 @@ usb_set_config (usbd_device * usbd_dev, uint16_t wValue) (void) wValue; (void) usbd_dev; - usbd_ep_setup (usbd_dev, KEYBOARD_EP, USB_ENDPOINT_ATTR_INTERRUPT, KEYBOARD_EP_TXN_SIZE, NULL); - usbd_ep_setup (usbd_dev, CONSUMER_EP, USB_ENDPOINT_ATTR_INTERRUPT, CONSUMER_EP_TXN_SIZE, NULL); + usbd_ep_setup (usbd_dev, KEYBOARD_EP, USB_ENDPOINT_ATTR_INTERRUPT, + KEYBOARD_EP_TXN_SIZE, NULL); + usbd_ep_setup (usbd_dev, CONSUMER_EP, USB_ENDPOINT_ATTR_INTERRUPT, + CONSUMER_EP_TXN_SIZE, NULL); usbd_register_control_callback (usbd_dev, - USB_REQ_TYPE_STANDARD | USB_REQ_TYPE_INTERFACE, + USB_REQ_TYPE_STANDARD | + USB_REQ_TYPE_INTERFACE, USB_REQ_TYPE_TYPE | USB_REQ_TYPE_RECIPIENT, usb_control_request); |