From 4dfc42565c2d1f5b900d8d725126bfde886a8423 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 20 Aug 2016 23:04:53 +0100 Subject: tidy --- app/usb.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) (limited to 'app/usb.c') diff --git a/app/usb.c b/app/usb.c index bf4bbfb..6f3d8e7 100644 --- a/app/usb.c +++ b/app/usb.c @@ -20,13 +20,13 @@ const struct usb_device_descriptor dev = { const struct usb_interface ifaces[] = { { - .num_altsetting = 1, - .altsetting = comm_iface, - }, + .num_altsetting = 1, + .altsetting = comm_iface, + }, { - .num_altsetting = 1, - .altsetting = data_iface, -}, + .num_altsetting = 1, + .altsetting = data_iface, + }, { .num_altsetting = 1, .altsetting = &dfu_iface, @@ -146,13 +146,15 @@ usb_control_request (usbd_device * usbd_dev, struct usb_setup_data *req, int class_control_request (usbd_device * usbd_dev, struct usb_setup_data *req, - uint8_t ** buf, uint16_t * len, - int (**complete) (usbd_device * usbd_dev, - struct usb_setup_data * req)) + uint8_t ** buf, uint16_t * len, + int (**complete) (usbd_device * usbd_dev, + struct usb_setup_data * req)) { - if (cdcacm_control_request(usbd_dev,req,buf,len,complete)) return 1; - if (dfu_control_request(usbd_dev,req,buf,len,complete)) return 1; + if (cdcacm_control_request (usbd_dev, req, buf, len, complete)) + return 1; + if (dfu_control_request (usbd_dev, req, buf, len, complete)) + return 1; return 0; } @@ -162,9 +164,10 @@ usb_set_config (usbd_device * usbd_dev, uint16_t wValue) (void) wValue; (void) usbd_dev; - usbd_ep_setup(usbd_dev, 0x01, USB_ENDPOINT_ATTR_BULK, 64, cdcacm_data_rx_cb); - usbd_ep_setup(usbd_dev, 0x82, USB_ENDPOINT_ATTR_BULK, 64, NULL); - usbd_ep_setup(usbd_dev, 0x83, USB_ENDPOINT_ATTR_INTERRUPT, 16, NULL); + usbd_ep_setup (usbd_dev, 0x01, USB_ENDPOINT_ATTR_BULK, 64, + cdcacm_data_rx_cb); + usbd_ep_setup (usbd_dev, 0x82, USB_ENDPOINT_ATTR_BULK, 64, NULL); + usbd_ep_setup (usbd_dev, 0x83, USB_ENDPOINT_ATTR_INTERRUPT, 16, NULL); usbd_register_control_callback (usbd_dev, USB_REQ_TYPE_STANDARD | @@ -205,6 +208,6 @@ usb_run (void) for (;;) { usbd_poll (usbd_dev); - serial_poll(); + serial_poll (); } } -- cgit v1.2.3