aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorUwe Hermann2011-11-12 10:17:31 +0100
committerUwe Hermann2011-11-12 17:53:02 +0100
commitb1819507b7b5d5460d9e340ce4b537bec59d25e0 (patch)
tree21c2ba751c7526a53568fc980ce9bf2b2c13de59 /examples
parentf23d9d07b7651afe859db64e64e2af04e574bcec (diff)
lisa-m/usb_cdcacm: Coding-style/whitespace fixes.
Diffstat (limited to 'examples')
-rw-r--r--examples/stm32/f1/lisa-m/usb_cdcacm/cdcacm.c76
1 files changed, 41 insertions, 35 deletions
diff --git a/examples/stm32/f1/lisa-m/usb_cdcacm/cdcacm.c b/examples/stm32/f1/lisa-m/usb_cdcacm/cdcacm.c
index 7108263..f748734 100644
--- a/examples/stm32/f1/lisa-m/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/f1/lisa-m/usb_cdcacm/cdcacm.c
@@ -24,25 +24,27 @@
#include <libopencm3/usb/cdc.h>
static const struct usb_device_descriptor dev = {
- .bLength = USB_DT_DEVICE_SIZE,
- .bDescriptorType = USB_DT_DEVICE,
- .bcdUSB = 0x0200,
- .bDeviceClass = USB_CLASS_CDC,
- .bDeviceSubClass = 0,
- .bDeviceProtocol = 0,
- .bMaxPacketSize0 = 64,
- .idVendor = 0x0483,
- .idProduct = 0x5740,
- .bcdDevice = 0x0200,
- .iManufacturer = 1,
- .iProduct = 2,
- .iSerialNumber = 3,
- .bNumConfigurations = 1,
+ .bLength = USB_DT_DEVICE_SIZE,
+ .bDescriptorType = USB_DT_DEVICE,
+ .bcdUSB = 0x0200,
+ .bDeviceClass = USB_CLASS_CDC,
+ .bDeviceSubClass = 0,
+ .bDeviceProtocol = 0,
+ .bMaxPacketSize0 = 64,
+ .idVendor = 0x0483,
+ .idProduct = 0x5740,
+ .bcdDevice = 0x0200,
+ .iManufacturer = 1,
+ .iProduct = 2,
+ .iSerialNumber = 3,
+ .bNumConfigurations = 1,
};
-/* This notification endpoint isn't implemented. According to CDC spec its
- * optional, but its absence causes a NULL pointer dereference in Linux cdc_acm
- * driver. */
+/*
+ * This notification endpoint isn't implemented. According to CDC spec it's
+ * optional, but its absence causes a NULL pointer dereference in the
+ * Linux cdc_acm driver.
+ */
static const struct usb_endpoint_descriptor comm_endp[] = {{
.bLength = USB_DT_ENDPOINT_SIZE,
.bDescriptorType = USB_DT_ENDPOINT,
@@ -81,7 +83,7 @@ static const struct {
.bcdCDC = 0x0110,
},
.call_mgmt = {
- .bFunctionLength =
+ .bFunctionLength =
sizeof(struct usb_cdc_call_management_descriptor),
.bDescriptorType = CS_INTERFACE,
.bDescriptorSubtype = USB_CDC_TYPE_CALL_MANAGEMENT,
@@ -99,7 +101,7 @@ static const struct {
.bDescriptorType = CS_INTERFACE,
.bDescriptorSubtype = USB_CDC_TYPE_UNION,
.bControlInterface = 0,
- .bSubordinateInterface0 = 1,
+ .bSubordinateInterface0 = 1,
}
};
@@ -159,10 +161,10 @@ static const char *usb_strings[] = {
"x",
"Black Sphere Technologies",
"CDC-ACM Demo",
- "DEMO"
+ "DEMO",
};
-static int cdcacm_control_request(struct usb_setup_data *req, u8 **buf,
+static int cdcacm_control_request(struct usb_setup_data *req, u8 **buf,
u16 *len, void (**complete)(struct usb_setup_data *req))
{
(void)complete;
@@ -170,13 +172,15 @@ static int cdcacm_control_request(struct usb_setup_data *req, u8 **buf,
switch(req->bRequest) {
case USB_CDC_REQ_SET_CONTROL_LINE_STATE: {
- /* This Linux cdc_acm driver requires this to be implemented
- * even though it's optional in the CDC spec, and we don't
- * advertise it in the ACM functional descriptor. */
+ /*
+ * This Linux cdc_acm driver requires this to be implemented
+ * even though it's optional in the CDC spec, and we don't
+ * advertise it in the ACM functional descriptor.
+ */
char buf[10];
struct usb_cdc_notification *notif = (void*)buf;
- /* We echo signals back to host as notification */
+ /* We echo signals back to host as notification. */
notif->bmRequestType = 0xA1;
notif->bNotification = USB_CDC_NOTIFY_SERIAL_STATE;
notif->wValue = 0;
@@ -184,11 +188,11 @@ static int cdcacm_control_request(struct usb_setup_data *req, u8 **buf,
notif->wLength = 2;
buf[8] = req->wValue & 3;
buf[9] = 0;
- //usbd_ep_write_packet(0x83, buf, 10);
+ // usbd_ep_write_packet(0x83, buf, 10);
return 1;
}
- case USB_CDC_REQ_SET_LINE_CODING:
- if(*len < sizeof(struct usb_cdc_line_coding))
+ case USB_CDC_REQ_SET_LINE_CODING:
+ if (*len < sizeof(struct usb_cdc_line_coding))
return 0;
return 1;
@@ -202,8 +206,10 @@ static void cdcacm_data_rx_cb(u8 ep)
char buf[64];
int len = usbd_ep_read_packet(0x01, buf, 64);
- if(len) {
- while(usbd_ep_write_packet(0x82, buf, len) == 0);
+
+ if (len) {
+ while (usbd_ep_write_packet(0x82, buf, len) == 0)
+ ;
buf[len] = 0;
}
@@ -219,7 +225,7 @@ static void cdcacm_set_config(u16 wValue)
usbd_ep_setup(0x83, USB_ENDPOINT_ATTR_INTERRUPT, 16, NULL);
usbd_register_control_callback(
- USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE,
+ USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE,
USB_REQ_TYPE_TYPE | USB_REQ_TYPE_RECIPIENT,
cdcacm_control_request);
}
@@ -228,15 +234,15 @@ int main(void)
{
int i;
- rcc_clock_setup_in_hsi_out_48mhz();
+ rcc_clock_setup_in_hsi_out_48mhz();
rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
gpio_set(GPIOC, GPIO2);
- gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
+ gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO2);
gpio_set(GPIOC, GPIO5);
- gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
+ gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO5);
usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings);
@@ -246,6 +252,6 @@ int main(void)
__asm__("nop");
gpio_clear(GPIOC, GPIO2);
- while (1)
+ while (1)
usbd_poll();
}