andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add OSAL_TIMEOUT_CONTROL_XFER = OSAL_TIMEOUT_WAIT_FOREVER

Browse Source
This commit is contained in:
hathach
2018-04-12 18:10:35 +07:00
parent 752a9f45d7
commit a24615bffc
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tinyusb/common/tusb_verify.h
View File

@@ -173,7 +173,7 @@ static inline void verify_breakpoint(void)
#define ASERT_ERR_1ARGS(_error) VERIFY_ERR_DEF2(_error, verify_breakpoint())
#define ASERT_ERR_2ARGS(_error, _ret) VERIFY_ERR_DEF3(_error, verify_breakpoint(), _ret)
#define TU_ASSERT_ERR(...) GET_3RD_ARG(__VA_ARGS__, ASERT_ERR_2ARGS, ASERT_ERR_1ARGS)(__VA_ARGS__)
#define TU_ASSERT_ERR(...) GET_3RD_ARG(__VA_ARGS__, ASERT_ERR_2ARGS, ASERT_ERR_1ARGS)(__VA_ARGS__)
/*------------------------------------------------------------------*/
/* ASSERT HDLR

2
tinyusb/device/usbd_pvt.h
View File

@@ -60,7 +60,7 @@ void usbd_task( void* param);
if (_len) { \
tusb_error_t err;\
dcd_control_xfer(_rhport, _dir, _buffer, _len);\
osal_semaphore_wait( _usbd_ctrl_sem, OSAL_TIMEOUT_NORMAL, &err );\
osal_semaphore_wait( _usbd_ctrl_sem, OSAL_TIMEOUT_CONTROL_XFER, &err );\
STASK_ASSERT_ERR( err );\
}\
/* No need to wait for status to complete therefore */ \

4
tinyusb/osal/osal.h
View File

@@ -52,10 +52,12 @@
enum
{
OSAL_TIMEOUT_NOTIMEOUT = 0, // return immediately
OSAL_TIMEOUT_NORMAL = 100, // default timeout
OSAL_TIMEOUT_NORMAL = 10, // default timeout
OSAL_TIMEOUT_WAIT_FOREVER = 0xFFFFFFFFUL
};
#define OSAL_TIMEOUT_CONTROL_XFER OSAL_TIMEOUT_WAIT_FOREVER
#if CFG_TUSB_OS == OPT_OS_NONE
#include "osal_none.h"