Removing unused rt_OsEventObserver

Author: SenRamakri

rtos/TARGET_CORTEX/rtx5/RTX/Include/rtx_os.h

@@ -127,7 +127,6 @@ typedef struct osRtxThread_s {
   uint32_t                         sp;  ///< Current Stack Pointer
   uint32_t                thread_addr;  ///< Thread entry address
   uint32_t                  tz_memory;  ///< TrustZone Memory Identifier
-  void                       *context;  ///< Context for OsEventObserver objects
 } osRtxThread_t;
 
 

rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_M3/irq_cm3.S

@@ -80,15 +80,6 @@ SVC_ContextSwitch:
 #ifdef FEATURE_UVISOR
         CPSID I // The call to the thread switch helper and PSP loading must be atomic.
 #endif
-        /* The call to thread_switch_helper can clobber R2 and R3, but we don't
-         * want to clobber R2 or R3. We can't save R2 and R3 to the stack (as
-         * the stack we save them onto is likely to be inaccessible after the
-         * call to thread_switch_helper). So, we just re-obtain the values from
-         * osRtxInfo again. */
-        BL       thread_switch_helper
-        LDR      R3,=osRtxInfo+I_T_RUN_OFS // Load address of osRtxInfo.run
-        LDM      R3,{R1,R2}             // Load osRtxInfo.thread.run: curr & next
-
         STR      R2,[R3]                // osRtxInfo.thread.run: curr = next
 
 SVC_ContextRestore:

rtos/TARGET_CORTEX/rtx5/RTX/Source/TOOLCHAIN_GCC/TARGET_RTOS_M4_M7/irq_cm4f.S

@@ -97,15 +97,6 @@ SVC_ContextSwitch:
 #ifdef FEATURE_UVISOR
         CPSID I // The call to the thread switch helper and PSP loading must be atomic.
 #endif
-        /* The call to thread_switch_helper can clobber R2 and R3, but we don't
-         * want to clobber R2 or R3. We can't save R2 and R3 to the stack (as
-         * the stack we save them onto is likely to be inaccessible after the
-         * call to thread_switch_helper). So, we just re-obtain the values from
-         * osRtxInfo again. */
-        BL       thread_switch_helper
-        LDR      R3,=osRtxInfo+I_T_RUN_OFS // Load address of osRtxInfo.run
-        LDM      R3,{R1,R2}             // Load osRtxInfo.thread.run: curr & next
-
         STR      R2,[R3]                // osRtxInfo.thread.run: curr = next
 
 SVC_ContextRestore:

rtos/TARGET_CORTEX/rtx5/RTX/Source/rt_OsEventObserver.c

@@ -24,8 +24,6 @@
  */
 
 #include "rtx_lib.h"
-#include "rt_OsEventObserver.h"
-
 
 //  OS Runtime Information
 osRtxInfo_t osRtxInfo __attribute__((section(".data.os"))) =
@@ -579,13 +577,6 @@ osStatus_t osKernelStart (void) {
     EvrRtxKernelError((int32_t)osErrorISR);
     status = osErrorISR;
   } else {
-    /* Call the pre-start event (from unprivileged mode) if the handler exists
-    * and the kernel is not running. */
-    /* FIXME osEventObs needs to be readable but not writable from unprivileged
-    * code. */
-    if (osKernelGetState() != osKernelRunning && osEventObs && osEventObs->pre_start) {
-      osEventObs->pre_start();
-    }
     status = __svcKernelStart();
   }
   return status;

rtos/TARGET_CORTEX/rtx5/RTX/Source/rt_OsEventObserver.h

@@ -24,7 +24,6 @@
  */
 
 #include "rtx_lib.h"
-#include "rt_OsEventObserver.h"
 
 //  OS Runtime Object Memory Usage
 #if ((defined(OS_OBJ_MEM_USAGE) && (OS_OBJ_MEM_USAGE != 0)))
@@ -426,17 +425,6 @@ void osRtxThreadSwitch (os_thread_t *thread) {
   osRtxInfo.thread.run.next = thread;
   osRtxThreadStackCheck();
   EvrRtxThreadSwitched(thread);
-
-  if (osEventObs && osEventObs->thread_switch) {
-    osEventObs->thread_switch(thread->context);
-  }
-}
-
-/// Notify the OS event observer of an imminent thread switch.
-void thread_switch_helper(void) {
-  if (osEventObs && osEventObs->thread_switch) {
-    osEventObs->thread_switch(osRtxInfo.thread.run.next->context);
-  }
 }
 
 /// Dispatch specified Thread or Ready Thread with Highest Priority.
@@ -810,13 +798,6 @@ osThreadId_t svcRtxThreadNew (osThreadFunc_t func, void *argument, const osThrea
     EvrRtxThreadError(NULL, (int32_t)osErrorNoMemory);
   }
 
-  /* Notify the OS event observer of a new thread. */
-  if (osEventObs && osEventObs->thread_create) {
-    thread->context = osEventObs->thread_create((int)thread, context);
-  } else {
-    thread->context = context;
-  }
-
   if (thread != NULL) {
     osRtxThreadDispatch(thread);
   }
@@ -1326,10 +1307,6 @@ static osStatus_t svcRtxThreadTerminate (osThreadId_t thread_id) {
       break;
   }
 
-  if (osEventObs && osEventObs->thread_destroy) {
-    osEventObs->thread_destroy(thread->context);
-  }
-
   if (status == osOK) {
     // Release owned Mutexes
     osRtxMutexOwnerRelease(thread->mutex_list);