libs/rt-thread-official
libs/rt-thread-official
4
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-02-22 05:15:23 +08:00
Code Issues Releases Wiki Activity

Merge pull request #1195 from ChunfengMu/fix_bugs

Browse Source 
1:解决未使用串口设备时，bulkout端点接收数据触发断言的问题。
This commit is contained in:
ZYH 2018-01-30 10:25:41 +08:00 committed by GitHub
commit d5ddcb13e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
components/drivers/usb/usbdevice/class/cdc_vcom.c
View File

@ -74,14 +74,14 @@ static struct ucdc_line_coding line_coding;
struct vcom struct vcom
{ {
struct rt_serial_device serial; struct rt_serial_device serial;
uep_t ep_out; uep_t ep_out;
uep_t ep_in; uep_t ep_in;
uep_t ep_cmd; uep_t ep_cmd;
rt_bool_t connected; rt_bool_t connected;
rt_bool_t in_sending; rt_bool_t in_sending;
struct rt_completion wait; struct rt_completion wait;
rt_uint8_t rx_rbp[CDC_RX_BUFSIZE]; rt_uint8_t rx_rbp[CDC_RX_BUFSIZE];
struct rt_ringbuffer rx_ringbuffer; struct rt_ringbuffer rx_ringbuffer;
rt_uint8_t tx_rbp[CDC_TX_BUFSIZE]; rt_uint8_t tx_rbp[CDC_TX_BUFSIZE];
struct rt_ringbuffer tx_ringbuffer; struct rt_ringbuffer tx_ringbuffer;
@ -298,16 +298,20 @@ static rt_err_t _ep_out_handler(ufunction_t func, rt_size_t size)
RT_ASSERT(func != RT_NULL); RT_ASSERT(func != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("_ep_out_handler %d\n", size)); RT_DEBUG_LOG(RT_DEBUG_USB, ("_ep_out_handler %d\n", size));
data = (struct vcom*)func->user_data; data = (struct vcom*)func->user_data;
/* receive data from USB VCOM */ /* ensure serial is active */
level = rt_hw_interrupt_disable(); if(data->serial.parent.open_flag & RT_DEVICE_FLAG_ACTIVATED)
{
/* receive data from USB VCOM */
level = rt_hw_interrupt_disable();
rt_ringbuffer_put(&data->rx_ringbuffer, data->ep_out->buffer, size); rt_ringbuffer_put(&data->rx_ringbuffer, data->ep_out->buffer, size);
rt_hw_interrupt_enable(level); rt_hw_interrupt_enable(level);
/* notify receive data */ /* notify receive data */
rt_hw_serial_isr(&data->serial,RT_SERIAL_EVENT_RX_IND); rt_hw_serial_isr(&data->serial,RT_SERIAL_EVENT_RX_IND);
}
data->ep_out->request.buffer = data->ep_out->buffer; data->ep_out->request.buffer = data->ep_out->buffer;
data->ep_out->request.size = EP_MAXPACKET(data->ep_out); data->ep_out->request.size = EP_MAXPACKET(data->ep_out);
@ -879,7 +883,7 @@ static void rt_usb_vcom_init(struct ufunction *func)
rt_ringbuffer_init(&data->rx_ringbuffer, data->rx_rbp, CDC_RX_BUFSIZE); rt_ringbuffer_init(&data->rx_ringbuffer, data->rx_rbp, CDC_RX_BUFSIZE);
rt_ringbuffer_init(&data->tx_ringbuffer, data->tx_rbp, CDC_TX_BUFSIZE); rt_ringbuffer_init(&data->tx_ringbuffer, data->tx_rbp, CDC_TX_BUFSIZE);
rt_event_init(&data->tx_event, "vom", RT_IPC_FLAG_FIFO); rt_event_init(&data->tx_event, "vcom", RT_IPC_FLAG_FIFO);
config.baud_rate = BAUD_RATE_115200; config.baud_rate = BAUD_RATE_115200;
config.data_bits = DATA_BITS_8; config.data_bits = DATA_BITS_8;