summaryrefslogtreecommitdiff
path: root/components/drivers/usb
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2018-10-29 10:25:22 +0800
committerGitHub <[email protected]>2018-10-29 10:25:22 +0800
commit05b58271b0f089fe2f599da124ecc651bee78d54 (patch)
tree5147f79d7842d1af21cea7a82bf8d3b6abb6fdbb /components/drivers/usb
parent125195c870f71b8e5c8841be25a0675a863dee62 (diff)
parent4f14dc91864c9f22daea52c8a1282b2bf6e89467 (diff)
Merge pull request #1930 from zhang-peter/master
Add RT_VCOM_TX_TIMEOUT and some configure to Kconfig
Diffstat (limited to 'components/drivers/usb')
-rw-r--r--components/drivers/usb/usbdevice/class/cdc_vcom.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/components/drivers/usb/usbdevice/class/cdc_vcom.c b/components/drivers/usb/usbdevice/class/cdc_vcom.c
index c83043314e..336cfcb152 100644
--- a/components/drivers/usb/usbdevice/class/cdc_vcom.c
+++ b/components/drivers/usb/usbdevice/class/cdc_vcom.c
@@ -22,7 +22,12 @@
#ifdef RT_USB_DEVICE_CDC
-#define TX_TIMEOUT 1000
+#ifdef RT_VCOM_TX_TIMEOUT
+#define VCOM_TX_TIMEOUT RT_VCOM_TX_TIMEOUT
+#else /*!RT_VCOM_TX_TIMEOUT*/
+#define VCOM_TX_TIMEOUT 1000
+#endif /*RT_VCOM_TX_TIMEOUT*/
+
#define CDC_RX_BUFSIZE 128
#define CDC_MAX_PACKET_SIZE 64
#define VCOM_DEVICE "vcom"
@@ -880,7 +885,7 @@ static void vcom_tx_thread_entry(void* parameter)
rt_usbd_io_request(func->device, data->ep_in, &data->ep_in->request);
- if (rt_completion_wait(&data->wait, TX_TIMEOUT) != RT_EOK)
+ if (rt_completion_wait(&data->wait, VCOM_TX_TIMEOUT) != RT_EOK)
{
RT_DEBUG_LOG(RT_DEBUG_USB, ("vcom tx timeout\n"));
}