diff options
| author | hathach <[email protected]> | 2018-04-12 18:10:35 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-04-12 18:10:35 +0700 |
| commit | a24615bffcba2272af9d0d75bdefb6a8a6180e89 (patch) | |
| tree | addaecd568c1f9b5d1d402b7083bcd1d1851ca6f | |
| parent | 752a9f45d70959e36cf8c0cf3a5cd0c24731635e (diff) | |
add OSAL_TIMEOUT_CONTROL_XFER = OSAL_TIMEOUT_WAIT_FOREVER
| -rw-r--r-- | tinyusb/common/tusb_verify.h | 2 | ||||
| -rw-r--r-- | tinyusb/device/usbd_pvt.h | 2 | ||||
| -rw-r--r-- | tinyusb/osal/osal.h | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/tinyusb/common/tusb_verify.h b/tinyusb/common/tusb_verify.h index 13b8d39f7..6e530fe79 100644 --- a/tinyusb/common/tusb_verify.h +++ b/tinyusb/common/tusb_verify.h @@ -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 diff --git a/tinyusb/device/usbd_pvt.h b/tinyusb/device/usbd_pvt.h index cf1d822b2..0b9f3e81e 100644 --- a/tinyusb/device/usbd_pvt.h +++ b/tinyusb/device/usbd_pvt.h @@ -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 */ \ diff --git a/tinyusb/osal/osal.h b/tinyusb/osal/osal.h index 7fc747ab9..669159607 100644 --- a/tinyusb/osal/osal.h +++ b/tinyusb/osal/osal.h @@ -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"
|