diff options
| author | hathach <[email protected]> | 2018-04-12 17:55:15 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-04-12 17:55:15 +0700 |
| commit | 752a9f45d70959e36cf8c0cf3a5cd0c24731635e (patch) | |
| tree | 518c66e1efc12a0cf74ff256a96ccedecb9ef4ef /tinyusb/osal | |
| parent | 6d8f4bca47d31ba4d114aa216042913031c56f1a (diff) | |
rename ASSERT_ERR to TU_ASSERT_ERR to prevent conflict with user code
Diffstat (limited to 'tinyusb/osal')
| -rw-r--r-- | tinyusb/osal/osal.h | 4 | ||||
| -rw-r--r-- | tinyusb/osal/osal_none.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tinyusb/osal/osal.h b/tinyusb/osal/osal.h index 93d50699d..7fc747ab9 100644 --- a/tinyusb/osal/osal.h +++ b/tinyusb/osal/osal.h @@ -51,8 +51,8 @@ enum
{
- OSAL_TIMEOUT_NOTIMEOUT = 0, // return immediately
- OSAL_TIMEOUT_NORMAL = 10*5, // default is 10 msec, FIXME [CMSIS-RTX] easily timeout with 10 msec
+ OSAL_TIMEOUT_NOTIMEOUT = 0, // return immediately
+ OSAL_TIMEOUT_NORMAL = 100, // default timeout
OSAL_TIMEOUT_WAIT_FOREVER = 0xFFFFFFFFUL
};
diff --git a/tinyusb/osal/osal_none.h b/tinyusb/osal/osal_none.h index f8a0ace19..b79816130 100644 --- a/tinyusb/osal/osal_none.h +++ b/tinyusb/osal/osal_none.h @@ -119,11 +119,11 @@ static inline osal_task_t osal_task_create(osal_func_t code, const char* name, u //------------- Sub Task Assert -------------//
#define STASK_RETURN(error) do { TASK_RESTART; return error; } while(0)
-#define STASK_ASSERT_ERR(_err) VERIFY_ERR_HDLR(_err, TASK_RESTART)
-#define STASK_ASSERT_ERR_HDLR(_err, _func) VERIFY_ERR_HDLR(_err, _func; TASK_RESTART )
+#define STASK_ASSERT_ERR(_err) VERIFY_ERR_HDLR(_err, verify_breakpoint(); TASK_RESTART)
+#define STASK_ASSERT_ERR_HDLR(_err, _func) VERIFY_ERR_HDLR(_err, verify_breakpoint(); _func; TASK_RESTART )
-#define STASK_ASSERT(_cond) VERIFY_HDLR(_cond, TASK_RESTART)
-#define STASK_ASSERT_HDLR(_cond, _func) VERIFY_HDLR(_cond, _func; TASK_RESTART)
+#define STASK_ASSERT(_cond) VERIFY_HDLR(_cond, verify_breakpoint(); TASK_RESTART)
+#define STASK_ASSERT_HDLR(_cond, _func) VERIFY_HDLR(_cond, verify_breakpoint(); _func; TASK_RESTART)
//--------------------------------------------------------------------+
// QUEUE API
|