summaryrefslogtreecommitdiff
path: root/components/drivers/usb/usbdevice/class/cdc_vcom.c
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2021-05-28 16:20:08 +0800
committerGitHub <[email protected]>2021-05-28 16:20:08 +0800
commit92beddf3bccf6346e26aa097f82464456fb8e6bd (patch)
tree197e4a108118dda016ea02274172f0c40e7ee8ed /components/drivers/usb/usbdevice/class/cdc_vcom.c
parentb18a99b44240ec3152011e159cc24a5af8dff0ce (diff)
parent03f4d40e30f3c94e1db0b3a65b3610dee695694a (diff)
Merge pull request #4737 from mysterywolf/3,1,xformatv3.1.5
[lts 3.1.x] format codes
Diffstat (limited to 'components/drivers/usb/usbdevice/class/cdc_vcom.c')
-rw-r--r--components/drivers/usb/usbdevice/class/cdc_vcom.c74
1 files changed, 37 insertions, 37 deletions
diff --git a/components/drivers/usb/usbdevice/class/cdc_vcom.c b/components/drivers/usb/usbdevice/class/cdc_vcom.c
index ca9576ed2e..73a6629a66 100644
--- a/components/drivers/usb/usbdevice/class/cdc_vcom.c
+++ b/components/drivers/usb/usbdevice/class/cdc_vcom.c
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2012-10-02 Yi Qiu first version
- * 2012-12-12 heyuanjie87 change endpoints and function handler
+ * 2012-12-12 heyuanjie87 change endpoints and function handler
* 2013-06-25 heyuanjie87 remove SOF mechinism
* 2013-07-20 Yi Qiu do more test
* 2016-02-01 Urey Fix some error
@@ -142,23 +142,23 @@ const static struct ucdc_comm_descriptor _comm_desc =
USB_DESC_LENGTH_INTERFACE,
USB_DESC_TYPE_INTERFACE,
USB_DYNAMIC,
- 0x00,
+ 0x00,
0x01,
USB_CDC_CLASS_COMM,
USB_CDC_SUBCLASS_ACM,
USB_CDC_PROTOCOL_V25TER,
0x00,
},
- /* Header Functional Descriptor */
+ /* Header Functional Descriptor */
{
- 0x05,
+ 0x05,
USB_CDC_CS_INTERFACE,
USB_CDC_SCS_HEADER,
0x0110,
},
- /* Call Management Functional Descriptor */
+ /* Call Management Functional Descriptor */
{
- 0x05,
+ 0x05,
USB_CDC_CS_INTERFACE,
USB_CDC_SCS_CALL_MGMT,
0x00,
@@ -171,7 +171,7 @@ const static struct ucdc_comm_descriptor _comm_desc =
USB_CDC_SCS_ACM,
0x02,
},
- /* Union Functional Descriptor */
+ /* Union Functional Descriptor */
{
0x05,
USB_CDC_CS_INTERFACE,
@@ -179,7 +179,7 @@ const static struct ucdc_comm_descriptor _comm_desc =
USB_DYNAMIC,
USB_DYNAMIC,
},
- /* Endpoint Descriptor */
+ /* Endpoint Descriptor */
{
USB_DESC_LENGTH_ENDPOINT,
USB_DESC_TYPE_ENDPOINT,
@@ -200,27 +200,27 @@ const static struct ucdc_data_descriptor _data_desc =
USB_DESC_TYPE_INTERFACE,
USB_DYNAMIC,
0x00,
- 0x02,
+ 0x02,
USB_CDC_CLASS_DATA,
- 0x00,
- 0x00,
- 0x00,
+ 0x00,
+ 0x00,
+ 0x00,
},
/* endpoint, bulk out */
{
- USB_DESC_LENGTH_ENDPOINT,
+ USB_DESC_LENGTH_ENDPOINT,
USB_DESC_TYPE_ENDPOINT,
USB_DYNAMIC | USB_DIR_OUT,
- USB_EP_ATTR_BULK,
+ USB_EP_ATTR_BULK,
USB_CDC_BUFSIZE,
- 0x00,
+ 0x00,
},
/* endpoint, bulk in */
{
USB_DESC_LENGTH_ENDPOINT,
USB_DESC_TYPE_ENDPOINT,
USB_DYNAMIC | USB_DIR_IN,
- USB_EP_ATTR_BULK,
+ USB_EP_ATTR_BULK,
USB_CDC_BUFSIZE,
0x00,
},
@@ -249,11 +249,11 @@ static void _vcom_reset_state(ufunction_t func)
{
struct vcom* data;
int lvl;
-
+
RT_ASSERT(func != RT_NULL)
data = (struct vcom*)func->user_data;
-
+
lvl = rt_hw_interrupt_disable();
data->connected = RT_FALSE;
data->in_sending = RT_FALSE;
@@ -295,9 +295,9 @@ static rt_err_t _ep_in_handler(ufunction_t func, rt_size_t size)
return RT_EOK;
}
-
+
rt_completion_done(&data->wait);
-
+
return RT_EOK;
}
@@ -392,7 +392,7 @@ static rt_err_t _cdc_set_line_coding_callback(udevice_t device, rt_size_t size)
RT_DEBUG_LOG(RT_DEBUG_USB, ("_cdc_set_line_coding_callback\n"));
dcd_ep0_send_status(device->dcd);
-
+
return RT_EOK;
}
@@ -434,7 +434,7 @@ static rt_err_t _interface_handler(ufunction_t func, ureq_t setup)
RT_ASSERT(setup != RT_NULL);
data = (struct vcom*)func->user_data;
-
+
switch(setup->bRequest)
{
case CDC_SEND_ENCAPSULATED_COMMAND:
@@ -484,17 +484,17 @@ static rt_err_t _function_enable(ufunction_t func)
RT_DEBUG_LOG(RT_DEBUG_USB, ("cdc function enable\n"));
_vcom_reset_state(func);
-
+
data = (struct vcom*)func->user_data;
data->ep_out->buffer = rt_malloc(CDC_RX_BUFSIZE);
RT_ASSERT(data->ep_out->buffer != RT_NULL);
data->ep_out->request.buffer = data->ep_out->buffer;
data->ep_out->request.size = EP_MAXPACKET(data->ep_out);
-
+
data->ep_out->request.req_type = UIO_REQUEST_READ_BEST;
rt_usbd_io_request(func->device, data->ep_out, &data->ep_out->request);
-
+
return RT_EOK;
}
@@ -519,7 +519,7 @@ static rt_err_t _function_disable(ufunction_t func)
if(data->ep_out->buffer != RT_NULL)
{
rt_free(data->ep_out->buffer);
- data->ep_out->buffer = RT_NULL;
+ data->ep_out->buffer = RT_NULL;
}
return RT_EOK;
@@ -540,7 +540,7 @@ static struct ufunction_ops ops =
*
* @return RT_EOK on successful.
*/
-static rt_err_t _cdc_descriptor_config(ucdc_comm_desc_t comm,
+static rt_err_t _cdc_descriptor_config(ucdc_comm_desc_t comm,
rt_uint8_t cintf_nr, ucdc_data_desc_t data, rt_uint8_t dintf_nr)
{
comm->call_mgmt_desc.data_interface = dintf_nr;
@@ -580,19 +580,19 @@ ufunction_t rt_usbd_function_cdc_create(udevice_t device)
}
/* set usb device string description */
rt_usbd_device_set_string(device, _ustring);
-
+
/* create a cdc function */
func = rt_usbd_function_new(device, &dev_desc, &ops);
-
+
/* support HS */
rt_usbd_device_set_qualifier(device, &dev_qualifier);
-
+
/* allocate memory for cdc vcom data */
data = (struct vcom*)rt_malloc(sizeof(struct vcom));
RT_ASSERT(data != RT_NULL);
rt_memset(data, 0, sizeof(struct vcom));
func->user_data = (void*)data;
-
+
/* initilize vcom */
rt_usb_vcom_init(func);
@@ -642,7 +642,7 @@ ufunction_t rt_usbd_function_cdc_create(udevice_t device)
/* add the cdc data interface to cdc function */
rt_usbd_function_add_interface(func, intf_data);
-
+
return func;
}
@@ -678,7 +678,7 @@ static int _vcom_getc(struct rt_serial_device *serial)
rt_uint32_t level;
struct ufunction *func;
struct vcom *data;
-
+
func = (struct ufunction*)serial->parent.user_data;
data = (struct vcom*)func->user_data;
@@ -914,7 +914,7 @@ static void rt_usb_vcom_init(struct ufunction *func)
rt_err_t result = RT_EOK;
struct serial_configure config;
struct vcom *data = (struct vcom*)func->user_data;
-
+
/* initialize ring buffer */
rt_ringbuffer_init(&data->rx_ringbuffer, data->rx_rbp, CDC_RX_BUFSIZE);
rt_ringbuffer_init(&data->tx_ringbuffer, data->tx_rbp, CDC_TX_BUFSIZE);
@@ -948,9 +948,9 @@ static void rt_usb_vcom_init(struct ufunction *func)
vcom_thread_stack, VCOM_TASK_STK_SIZE,
16, 20);
result = rt_thread_startup(&vcom_thread);
- RT_ASSERT(result == RT_EOK);
+ RT_ASSERT(result == RT_EOK);
}
-struct udclass vcom_class =
+struct udclass vcom_class =
{
.rt_usbd_function_create = rt_usbd_function_cdc_create
};