Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-09-21 18:57:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[fix] NXP bsp for RT-Thread 5.1.0 fixed up.

Browse Source
This commit is contained in:
StackYuan
2024-03-19 08:13:00 -04:00
committed by Meco Man
parent 8120fa5e31
commit a582c0cc31
39 changed files with 21497 additions and 2942 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/drivers/usb/usbdevice/class/cdc_vcom.c
+8 -12
View File
@@ -756,9 +756,9 @@ static rt_ssize_t _vcom_rb_block_put(struct vcom *data, const rt_uint8_t *buf, r
}
#ifdef RT_USING_SERIAL_V1
static rt_size_t _vcom_tx(struct rt_serial_device *serial, rt_uint8_t *buf, rt_size_t size, int direction)
static rt_ssize_t _vcom_tx(struct rt_serial_device *serial, rt_uint8_t *buf, rt_size_t size, int direction)
#else
static rt_size_t _vcom_tx(struct rt_serial_device *serial, rt_uint8_t *buf, rt_size_t size, rt_uint32_t tx_flag)
static rt_ssize_t _vcom_tx(struct rt_serial_device *serial, rt_uint8_t *buf, rt_size_t size, rt_uint32_t tx_flag)
#endif
{
struct ufunction *func;
@@ -893,18 +893,16 @@ static void vcom_tx_thread_entry(void* parameter)
}
if (!data->connected)
{
if(data->serial.parent.open_flag &
#ifdef RT_USING_SERIAL_V1
#ifndef VCOM_TX_USE_DMA
RT_DEVICE_FLAG_INT_TX
if(data->serial.parent.open_flag & RT_DEVICE_FLAG_INT_TX)
#else
RT_DEVICE_FLAG_DMA_TX
if(data->serial.parent.open_flag & RT_DEVICE_FLAG_DMA_TX)
#endif
#endif
#ifdef RT_USING_SERIAL_V2
RT_DEVICE_FLAG_TX_BLOCKING
if(data->serial.parent.open_flag & RT_DEVICE_FLAG_TX_BLOCKING)
#endif
)
{
/* drop msg */
#ifndef VCOM_TX_USE_DMA
@@ -927,18 +925,16 @@ static void vcom_tx_thread_entry(void* parameter)
{
LOG_D("vcom tx timeout");
}
if(data->serial.parent.open_flag &
#ifdef RT_USING_SERIAL_V1
#ifndef VCOM_TX_USE_DMA
RT_DEVICE_FLAG_INT_TX
if(data->serial.parent.open_flag & RT_DEVICE_FLAG_INT_TX)
#else
RT_DEVICE_FLAG_DMA_TX
if(data->serial.parent.open_flag & RT_DEVICE_FLAG_DMA_TX)
#endif
#endif
#ifdef RT_USING_SERIAL_V2
RT_DEVICE_FLAG_TX_BLOCKING
if(data->serial.parent.open_flag & RT_DEVICE_FLAG_TX_BLOCKING)
#endif
)
{
#ifndef VCOM_TX_USE_DMA
rt_hw_serial_isr(&data->serial,RT_SERIAL_EVENT_TX_DONE);