merge common define in osal/osal_cmsis_rtx.h & osal/osal_freeRTOS.h

5 files changed, 33 insertions, 81 deletions

diff --git a/tinyusb/osal/osal.h b/tinyusb/osal/osal.h
index 84a18a685..d68bbf43b 100644
--- a/tinyusb/osal/osal.h
+++ b/tinyusb/osal/osal.h
@@ -70,6 +70,38 @@
   #include "osal_none.h"

 #else

   #define OSAL_VAR

+  #define OSAL_TASK_FUNCTION(task_func) void task_func

+  #define OSAL_TASK_LOOP_BEGIN \

+    while(1) {

+

+  #define OSAL_TASK_LOOP_END \

+    }

+

+  //------------- Sub Task -------------//

+  #define OSAL_SUBTASK_BEGIN // TODO refractor move

+  #define OSAL_SUBTASK_END \

+    return TUSB_ERROR_NONE;

+

+  #define SUBTASK_EXIT(error)   return error;

+

+  #define OSAL_SUBTASK_INVOKED_AND_WAIT(subtask, status) \

+    status = subtask

+

+  //------------- Sub Task Assert -------------//

+  #define SUBTASK_ASSERT_STATUS(sts) ASSERT_STATUS(sts)

+  #define SUBTASK_ASSERT(condition)  ASSERT(condition, TUSB_ERROR_OSAL_TASK_FAILED)

+

+  #define _SUBTASK_ASSERT_ERROR_HANDLER(error, func_call)\

+      func_call; return error

+

+  #define SUBTASK_ASSERT_STATUS_WITH_HANDLER(sts, func_call) \

+      ASSERT_DEFINE_WITH_HANDLER(_SUBTASK_ASSERT_ERROR_HANDLER, func_call, tusb_error_t status = (tusb_error_t)(sts),\

+                                 TUSB_ERROR_NONE == status, status, "%s", TUSB_ErrorStr[status])

+

+  #define SUBTASK_ASSERT_WITH_HANDLER(condition, func_call) \

+      ASSERT_DEFINE_WITH_HANDLER(_SUBTASK_ASSERT_ERROR_HANDLER, func_call, ,\

+                                 condition, TUSB_ERROR_OSAL_TASK_FAILED, "%s", "evaluated to false")

+

   #if TUSB_CFG_OS == TUSB_OS_FREERTOS

     #include "osal_freeRTOS.h"

   #elif TUSB_CFG_OS == TUSB_OS_CMSIS_RTX

diff --git a/tinyusb/osal/osal_cmsis_rtx.h b/tinyusb/osal/osal_cmsis_rtx.h
index b2b2258f2..74682e3ee 100644
--- a/tinyusb/osal/osal_cmsis_rtx.h
+++ b/tinyusb/osal/osal_cmsis_rtx.h
@@ -61,9 +61,6 @@
 //--------------------------------------------------------------------+
 // TASK API
 //--------------------------------------------------------------------+
-#define OSAL_TASK_FUNCTION(task_func) \
-  void task_func
-
 typedef osThreadDef_t osal_task_t;
 
 #define OSAL_TASK_DEF(task_code, task_stack_depth, task_prio) \
@@ -79,38 +76,6 @@ static inline tusb_error_t osal_task_create(const osal_task_t *task)
 
 #define osal_task_delay(msec)   osDelay(msec)
 
-#define OSAL_TASK_LOOP_BEGIN \
-  while(1) {
-
-#define OSAL_TASK_LOOP_END \
-  }
-
-//------------- Sub Task -------------//
-#define OSAL_SUBTASK_BEGIN // TODO refractor move
-#define OSAL_SUBTASK_END \
-  return TUSB_ERROR_NONE;
-
-#define SUBTASK_EXIT(error)   return error;
-
-#define OSAL_SUBTASK_INVOKED_AND_WAIT(subtask, status) \
-  status = subtask
-
-//------------- Sub Task Assert -------------//
-#define SUBTASK_ASSERT_STATUS(sts) ASSERT_STATUS(sts)
-#define SUBTASK_ASSERT(condition)  ASSERT(condition, TUSB_ERROR_OSAL_TASK_FAILED)
-
-#define _SUBTASK_ASSERT_ERROR_HANDLER(error, func_call)\
-    func_call; return error
-
-#define SUBTASK_ASSERT_STATUS_WITH_HANDLER(sts, func_call) \
-    ASSERT_DEFINE_WITH_HANDLER(_SUBTASK_ASSERT_ERROR_HANDLER, func_call, tusb_error_t status = (tusb_error_t)(sts),\
-                               TUSB_ERROR_NONE == status, status, "%s", TUSB_ErrorStr[status])
-
-#define SUBTASK_ASSERT_WITH_HANDLER(condition, func_call) \
-    ASSERT_DEFINE_WITH_HANDLER(_SUBTASK_ASSERT_ERROR_HANDLER, func_call, ,\
-                               condition, TUSB_ERROR_OSAL_TASK_FAILED, "%s", "evaluated to false")
-
-
 //--------------------------------------------------------------------+
 // Semaphore API
 //--------------------------------------------------------------------+
diff --git a/tinyusb/osal/osal_common.h b/tinyusb/osal/osal_common.h
index 8a6853ca8..6135e3ce8 100644
--- a/tinyusb/osal/osal_common.h
+++ b/tinyusb/osal/osal_common.h
@@ -36,12 +36,6 @@
 */
 /**************************************************************************/
 
-/** \file
- *  \brief TBD
- *
- *  \note TBD
- */
-
 /** \ingroup TBD
  *  \defgroup TBD
  *  \brief TBD
diff --git a/tinyusb/osal/osal_freeRTOS.h b/tinyusb/osal/osal_freeRTOS.h
index add9292f0..42e2c4075 100644
--- a/tinyusb/osal/osal_freeRTOS.h
+++ b/tinyusb/osal/osal_freeRTOS.h
@@ -36,12 +36,6 @@
 */
 /**************************************************************************/
 
-/** \file
- *  \brief TBD
- *
- *  \note TBD
- */
-
 /** \ingroup TBD
  *  \defgroup TBD
  *  \brief TBD
@@ -72,9 +66,6 @@ extern "C" {
 //--------------------------------------------------------------------+
 // TASK API
 //--------------------------------------------------------------------+
-#define OSAL_TASK_FUNCTION(task_func) \
-  void task_func
-
 typedef struct {
   char const * name;
   pdTASK_CODE code;
@@ -105,37 +96,6 @@ static inline void osal_task_delay(uint32_t msec)
   vTaskDelay( (TUSB_CFG_OS_TICKS_PER_SECOND * msec) / 1000 );
 }
 
-#define OSAL_TASK_LOOP_BEGIN \
-  while(1) {
-
-#define OSAL_TASK_LOOP_END \
-  }
-
-//------------- Sub Task -------------//
-#define OSAL_SUBTASK_BEGIN // TODO refractor move
-#define OSAL_SUBTASK_END \
-  return TUSB_ERROR_NONE;
-
-#define SUBTASK_EXIT(error)   return error;
-
-#define OSAL_SUBTASK_INVOKED_AND_WAIT(subtask, status) \
-  status = subtask
-
-//------------- Sub Task Assert -------------//
-#define SUBTASK_ASSERT_STATUS(sts) ASSERT_STATUS(sts)
-#define SUBTASK_ASSERT(condition)  ASSERT(condition, TUSB_ERROR_OSAL_TASK_FAILED)
-
-#define _SUBTASK_ASSERT_ERROR_HANDLER(error, func_call)\
-    func_call; return error
-
-#define SUBTASK_ASSERT_STATUS_WITH_HANDLER(sts, func_call) \
-    ASSERT_DEFINE_WITH_HANDLER(_SUBTASK_ASSERT_ERROR_HANDLER, func_call, tusb_error_t status = (tusb_error_t)(sts),\
-                               TUSB_ERROR_NONE == status, status, "%s", TUSB_ErrorStr[status])
-
-#define SUBTASK_ASSERT_WITH_HANDLER(condition, func_call) \
-    ASSERT_DEFINE_WITH_HANDLER(_SUBTASK_ASSERT_ERROR_HANDLER, func_call, ,\
-                               condition, TUSB_ERROR_OSAL_TASK_FAILED, "%s", "evaluated to false")
-
 //--------------------------------------------------------------------+
 // Semaphore API
 //--------------------------------------------------------------------+
diff --git a/tinyusb/osal/osal_none.c b/tinyusb/osal/osal_none.c
index 3e20f6a58..068de840b 100644
--- a/tinyusb/osal/osal_none.c
+++ b/tinyusb/osal/osal_none.c
@@ -37,6 +37,7 @@
 /**************************************************************************/
 
 #include "tusb_option.h"
+#include "osal.h" // TODO refractor
 
 #if TUSB_CFG_OS == TUSB_OS_NONE