libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Modified bsp/stm32/libraries/HAL_Drivers/drv_usbd.c 

Modified   components/drivers/usb/usbdevice/class/cdc_vcom.c
修复cdc在v1v2的serial框架下接收发送错误的问题.stm32下usbd添加更多的ep_id,以支持复合设备.
This commit is contained in:
myshow2258 2022-11-01 11:37:07 +08:00 committed by Man, Jianting (Meco)
parent d1c353f6b6
commit 87be8fdba8
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bsp/stm32/libraries/HAL_Drivers/drv_usbd.c
View File

@ -28,12 +28,22 @@ static struct ep_id _ep_pool[] =
#else #else
{0x1, USB_EP_ATTR_BULK, USB_DIR_IN, 64, ID_UNASSIGNED}, {0x1, USB_EP_ATTR_BULK, USB_DIR_IN, 64, ID_UNASSIGNED},
{0x1, USB_EP_ATTR_BULK, USB_DIR_OUT, 64, ID_UNASSIGNED}, {0x1, USB_EP_ATTR_BULK, USB_DIR_OUT, 64, ID_UNASSIGNED},
#endif {0x2, USB_EP_ATTR_BULK, USB_DIR_IN, 64, ID_UNASSIGNED},
{0x2, USB_EP_ATTR_INT, USB_DIR_IN, 64, ID_UNASSIGNED}, {0x2, USB_EP_ATTR_BULK, USB_DIR_OUT, 64, ID_UNASSIGNED},
{0x2, USB_EP_ATTR_INT, USB_DIR_OUT, 64, ID_UNASSIGNED},
{0x3, USB_EP_ATTR_BULK, USB_DIR_IN, 64, ID_UNASSIGNED}, {0x3, USB_EP_ATTR_BULK, USB_DIR_IN, 64, ID_UNASSIGNED},
#if !defined(SOC_SERIES_STM32F1)
{0x3, USB_EP_ATTR_BULK, USB_DIR_OUT, 64, ID_UNASSIGNED}, {0x3, USB_EP_ATTR_BULK, USB_DIR_OUT, 64, ID_UNASSIGNED},
#endif
{0x4, USB_EP_ATTR_INT, USB_DIR_IN, 64, ID_UNASSIGNED},
{0x4, USB_EP_ATTR_INT, USB_DIR_OUT, 64, ID_UNASSIGNED},
{0x5, USB_EP_ATTR_INT, USB_DIR_IN, 64, ID_UNASSIGNED},
{0x5, USB_EP_ATTR_INT, USB_DIR_OUT, 64, ID_UNASSIGNED},
{0x6, USB_EP_ATTR_INT, USB_DIR_IN, 64, ID_UNASSIGNED},
{0x6, USB_EP_ATTR_INT, USB_DIR_OUT, 64, ID_UNASSIGNED},
{0x7, USB_EP_ATTR_BULK, USB_DIR_IN, 64, ID_UNASSIGNED},
{0x8, USB_EP_ATTR_BULK, USB_DIR_IN, 64, ID_UNASSIGNED},
{0x9, USB_EP_ATTR_BULK, USB_DIR_IN, 64, ID_UNASSIGNED},
#if !defined(SOC_SERIES_STM32F1)
{0x9, USB_EP_ATTR_BULK, USB_DIR_OUT, 64, ID_UNASSIGNED},
#endif #endif
{0xFF, USB_EP_ATTR_TYPE_MASK, USB_DIR_MASK, 0, ID_ASSIGNED }, {0xFF, USB_EP_ATTR_TYPE_MASK, USB_DIR_MASK, 0, ID_ASSIGNED },
}; };

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

@ -100,7 +100,7 @@ static struct udevice_descriptor dev_desc =
USB_CLASS_CDC, //bDeviceClass; USB_CLASS_CDC, //bDeviceClass;
0x00, //bDeviceSubClass; 0x00, //bDeviceSubClass;
0x00, //bDeviceProtocol; 0x00, //bDeviceProtocol;
CDC_MAX_PACKET_SIZE, //bMaxPacketSize0; CDC_MAX_PACKET_SIZE, //bMaxPacketSize0;
_VENDOR_ID, //idVendor; _VENDOR_ID, //idVendor;
_PRODUCT_ID, //idProduct; _PRODUCT_ID, //idProduct;
USB_BCD_DEVICE, //bcdDevice; USB_BCD_DEVICE, //bcdDevice;
@ -498,6 +498,10 @@ static rt_err_t _function_enable(ufunction_t func)
data->ep_out->buffer = rt_malloc(CDC_RX_BUFSIZE); data->ep_out->buffer = rt_malloc(CDC_RX_BUFSIZE);
RT_ASSERT(data->ep_out->buffer != RT_NULL); RT_ASSERT(data->ep_out->buffer != RT_NULL);
#ifdef RT_USING_SERIAL_V2
data->serial.serial_rx = &data->rx_ringbuffer;
#endif
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);
@ -882,10 +886,15 @@ static void vcom_tx_thread_entry(void* parameter)
if (!data->connected) if (!data->connected)
{ {
if(data->serial.parent.open_flag & if(data->serial.parent.open_flag &
#ifdef RT_USING_SERIAL_V1
#ifndef VCOM_TX_USE_DMA #ifndef VCOM_TX_USE_DMA
RT_DEVICE_FLAG_INT_TX RT_DEVICE_FLAG_INT_TX
#else #else
RT_DEVICE_FLAG_DMA_TX RT_DEVICE_FLAG_DMA_TX
#endif
#endif
#ifdef RT_USING_SERIAL_V2
RT_DEVICE_FLAG_TX_BLOCKING
#endif #endif
) )
{ {
@ -911,10 +920,15 @@ static void vcom_tx_thread_entry(void* parameter)
RT_DEBUG_LOG(RT_DEBUG_USB, ("vcom tx timeout\n")); RT_DEBUG_LOG(RT_DEBUG_USB, ("vcom tx timeout\n"));
} }
if(data->serial.parent.open_flag & if(data->serial.parent.open_flag &
#ifdef RT_USING_SERIAL_V1
#ifndef VCOM_TX_USE_DMA #ifndef VCOM_TX_USE_DMA
RT_DEVICE_FLAG_INT_TX RT_DEVICE_FLAG_INT_TX
#else #else
RT_DEVICE_FLAG_DMA_TX RT_DEVICE_FLAG_DMA_TX
#endif
#endif
#ifdef RT_USING_SERIAL_V2
RT_DEVICE_FLAG_TX_BLOCKING
#endif #endif
) )
{ {