RTX5: moved Timer Thread creation to osKernelStart

ARM-software · Apr 3, 2017 · 1b483a0 · 1b483a0
1 parent fe6dfc7
commit 1b483a0
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 19 deletions.
diff --git a/CMSIS/RTOS2/RTX/Include/rtx_os.h b/CMSIS/RTOS2/RTX/Include/rtx_os.h
@@ -308,6 +308,7 @@ typedef struct {
     osRtxTimer_t                *list;  ///< Active Timer List
     osRtxThread_t             *thread;  ///< Timer Thread
     osRtxMessageQueue_t           *mq;  ///< Timer Message Queue
+    void                (*tick)(void);  ///< Timer Tick Function
   } timer;
   struct {                              ///< ISR Post Processing Queue
     uint16_t                      max;  ///< Maximum Items
@@ -339,6 +340,7 @@ typedef struct {
     osRtxMpInfo_t        *memory_pool;  ///< Memory Pool Control Blocks
     osRtxMpInfo_t      *message_queue;  ///< Message Queue Control Blocks
   } mpi;
+  uint32_t                    padding;
 } osRtxInfo_t;
 
 extern osRtxInfo_t osRtxInfo;           ///< OS Runtime Information

diff --git a/CMSIS/RTOS2/RTX/Source/rtx_kernel.c b/CMSIS/RTOS2/RTX/Source/rtx_kernel.c
@@ -260,6 +260,17 @@ osStatus_t svcRtxKernelStart (void) {
     }
   }
 
+  // Create Timer Thread
+  if (osRtxConfig.timer_mq_mcnt != 0U) {
+    if (osRtxInfo.timer.thread == NULL) {
+      osRtxInfo.timer.thread = svcRtxThreadNew(osRtxTimerThread, NULL, osRtxConfig.timer_thread_attr);
+      if (osRtxInfo.timer.thread == NULL) {
+        EvrRtxKernelError(osError);
+        return osError;
+      }
+    }
+  }
+
   // Switch to Ready Thread with highest Priority
   thread = osRtxThreadListGet(&osRtxInfo.thread.ready);
   if (thread == NULL) {
@@ -433,7 +444,7 @@ void svcRtxKernelResume (uint32_t sleep_ticks) {
         sleep_ticks -= timer->tick;
       timer->tick = 1U;
       do {
-        osRtxTimerTick();
+        osRtxInfo.timer.tick();
         if (sleep_ticks == 0U) {
           break;
         }

diff --git a/CMSIS/RTOS2/RTX/Source/rtx_lib.c b/CMSIS/RTOS2/RTX/Source/rtx_lib.c
@@ -197,6 +197,11 @@ static const osMessageQueueAttr_t os_timer_mq_attr = {
   (uint32_t)sizeof(os_timer_mq_data)
 };
 
+#else
+
+extern void osRtxTimerThread (void *argument);
+       void osRtxTimerThread (void *argument) {}
+
 #endif  // ((OS_TIMER_THREAD_STACK_SIZE != 0) && (OS_TIMER_CB_QUEUE != 0))
 
 

diff --git a/CMSIS/RTOS2/RTX/Source/rtx_system.c b/CMSIS/RTOS2/RTX/Source/rtx_system.c
@@ -124,7 +124,9 @@ void osRtxTick_Handler (void) {
   osRtxInfo.kernel.tick++;
 
   // Process Timers
-  osRtxTimerTick();
+  if (osRtxInfo.timer.tick != NULL) {
+    osRtxInfo.timer.tick();
+  }
 
   // Process Thread Delays
   osRtxThreadDelayTick();

diff --git a/CMSIS/RTOS2/RTX/Source/rtx_timer.c b/CMSIS/RTOS2/RTX/Source/rtx_timer.c
@@ -110,11 +110,16 @@ void osRtxTimerTick (void) {
 }
 
 /// Timer Thread
-__NO_RETURN void osRtxTimerThread (void *argument) {
+__WEAK void osRtxTimerThread (void *argument) {
   os_timer_finfo_t finfo;
   osStatus_t       status;
   (void)           argument;
 
+  osRtxInfo.timer.mq = osMessageQueueNew(osRtxConfig.timer_mq_mcnt, sizeof(os_timer_finfo_t), osRtxConfig.timer_mq_attr);
+  if (osRtxInfo.timer.mq == NULL) {
+    return;
+  }
+  osRtxInfo.timer.tick = osRtxTimerTick;
   for (;;) {
     status = osMessageQueueGet(osRtxInfo.timer.mq, &finfo, NULL, osWaitForever);
     if (status == osOK) {
@@ -141,22 +146,10 @@ osTimerId_t svcRtxTimerNew (osTimerFunc_t func, osTimerType_t type, void *argume
   uint8_t     flags;
   const char *name;
 
-  // Create common timer message queue if not yet active
-  if (osRtxInfo.timer.mq == NULL) {
-    osRtxInfo.timer.mq = svcRtxMessageQueueNew(osRtxConfig.timer_mq_mcnt, sizeof(os_timer_finfo_t), osRtxConfig.timer_mq_attr);
-    if (osRtxInfo.timer.mq == NULL) {
-      EvrRtxTimerError(NULL, osErrorResource);
-      return NULL;
-    }
-  }
-
-  // Create common timer thread if not yet active
-  if (osRtxInfo.timer.thread == NULL) {
-    osRtxInfo.timer.thread = svcRtxThreadNew(osRtxTimerThread, NULL, osRtxConfig.timer_thread_attr);
-    if (osRtxInfo.timer.thread == NULL) {
-      EvrRtxTimerError(NULL, osErrorResource);
-      return NULL;
-    }
+  // Check Timer Thread and MessageQueue
+  if ((osRtxInfo.timer.thread == NULL) || (osRtxInfo.timer.mq == NULL)) {
+    EvrRtxTimerError(NULL, osErrorResource);
+    return NULL;
   }
 
   // Check parameters