rename ASSERT_ERR to TU_ASSERT_ERR to prevent conflict with user code

2018-04-12 17:55:15 +07:00
parent 6d8f4bca47
commit 752a9f45d7
12 changed files with 43 additions and 39 deletions
--- 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
 };