From eedf21e82112147f153372cb08d1514d889c1d82 Mon Sep 17 00:00:00 2001 From: dragonmux Date: Thu, 11 Aug 2022 01:28:54 +0100 Subject: [PATCH] usb_serial: run clang-format on the code --- src/platforms/common/usb_serial.c | 34 ++++++++++++------------------- src/platforms/common/usb_serial.h | 2 +- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/src/platforms/common/usb_serial.c b/src/platforms/common/usb_serial.c index 38cd8e0..ad4f1f7 100644 --- a/src/platforms/common/usb_serial.c +++ b/src/platforms/common/usb_serial.c @@ -86,10 +86,10 @@ static enum usbd_request_return_codes debug_uart_control_request(usbd_device *de case USB_CDC_REQ_SET_CONTROL_LINE_STATE: usb_serial_set_state(dev, req->wIndex, CDCACM_UART_ENDPOINT); #ifdef USBUSART_DTR_PIN - gpio_set_val(USBUSART_PORT, USBUSART_DTR_PIN, !(req->wValue & 1)); + gpio_set_val(USBUSART_PORT, USBUSART_DTR_PIN, !(req->wValue & 1U)); #endif #ifdef USBUSART_RTS_PIN - gpio_set_val(USBUSART_PORT, USBUSART_RTS_PIN, !((req->wValue >> 1) & 1)); + gpio_set_val(USBUSART_PORT, USBUSART_RTS_PIN, !((req->wValue >> 1U) & 1U)); #endif return USBD_REQ_HANDLED; case USB_CDC_REQ_SET_LINE_CODING: @@ -121,36 +121,28 @@ void usb_serial_set_state(usbd_device *const dev, const uint16_t iface, const ui usbd_ep_write_packet(dev, ep, buf, sizeof(buf)); } -void usb_serial_set_config(usbd_device *dev, uint16_t wValue) +void usb_serial_set_config(usbd_device *dev, uint16_t value) { - usb_config = wValue; + usb_config = value; /* GDB interface */ #if defined(STM32F4) || defined(LM4F) - usbd_ep_setup(dev, CDCACM_GDB_ENDPOINT, USB_ENDPOINT_ATTR_BULK, - CDCACM_PACKET_SIZE, gdb_usb_out_cb); + usbd_ep_setup(dev, CDCACM_GDB_ENDPOINT, USB_ENDPOINT_ATTR_BULK, CDCACM_PACKET_SIZE, gdb_usb_out_cb); #else - usbd_ep_setup(dev, CDCACM_GDB_ENDPOINT, USB_ENDPOINT_ATTR_BULK, - CDCACM_PACKET_SIZE, NULL); + usbd_ep_setup(dev, CDCACM_GDB_ENDPOINT, USB_ENDPOINT_ATTR_BULK, CDCACM_PACKET_SIZE, NULL); #endif - usbd_ep_setup(dev, CDCACM_GDB_ENDPOINT | USB_REQ_TYPE_IN, - USB_ENDPOINT_ATTR_BULK, CDCACM_PACKET_SIZE, NULL); - usbd_ep_setup(dev, (CDCACM_GDB_ENDPOINT + 1) | USB_REQ_TYPE_IN, - USB_ENDPOINT_ATTR_INTERRUPT, 16, NULL); + usbd_ep_setup(dev, CDCACM_GDB_ENDPOINT | USB_REQ_TYPE_IN, USB_ENDPOINT_ATTR_BULK, CDCACM_PACKET_SIZE, NULL); + usbd_ep_setup(dev, (CDCACM_GDB_ENDPOINT + 1) | USB_REQ_TYPE_IN, USB_ENDPOINT_ATTR_INTERRUPT, 16, NULL); /* Serial interface */ - usbd_ep_setup(dev, CDCACM_UART_ENDPOINT, USB_ENDPOINT_ATTR_BULK, - CDCACM_PACKET_SIZE / 2, usbuart_usb_out_cb); - usbd_ep_setup(dev, CDCACM_UART_ENDPOINT | USB_REQ_TYPE_IN, - USB_ENDPOINT_ATTR_BULK, - CDCACM_PACKET_SIZE, usbuart_usb_in_cb); - usbd_ep_setup(dev, (CDCACM_UART_ENDPOINT + 1) | USB_REQ_TYPE_IN, - USB_ENDPOINT_ATTR_INTERRUPT, 16, NULL); + usbd_ep_setup(dev, CDCACM_UART_ENDPOINT, USB_ENDPOINT_ATTR_BULK, CDCACM_PACKET_SIZE / 2, usbuart_usb_out_cb); + usbd_ep_setup( + dev, CDCACM_UART_ENDPOINT | USB_REQ_TYPE_IN, USB_ENDPOINT_ATTR_BULK, CDCACM_PACKET_SIZE, usbuart_usb_in_cb); + usbd_ep_setup(dev, (CDCACM_UART_ENDPOINT + 1) | USB_REQ_TYPE_IN, USB_ENDPOINT_ATTR_INTERRUPT, 16, NULL); #if defined(PLATFORM_HAS_TRACESWO) /* Trace interface */ - usbd_ep_setup(dev, TRACE_ENDPOINT | USB_REQ_TYPE_IN, USB_ENDPOINT_ATTR_BULK, - 64, trace_buf_drain); + usbd_ep_setup(dev, TRACE_ENDPOINT | USB_REQ_TYPE_IN, USB_ENDPOINT_ATTR_BULK, 64, trace_buf_drain); #endif usbd_register_control_callback(dev, USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE, diff --git a/src/platforms/common/usb_serial.h b/src/platforms/common/usb_serial.h index 8cc11e5..ee49456 100644 --- a/src/platforms/common/usb_serial.h +++ b/src/platforms/common/usb_serial.h @@ -32,7 +32,7 @@ #include #include "usb.h" -void usb_serial_set_config(usbd_device *dev, uint16_t wValue); +void usb_serial_set_config(usbd_device *dev, uint16_t value); bool gdb_uart_get_dtr(void);