Move SysTimer to platform, for non-RTOS use

Author: kjbracey

TESTS/mbedmicro-rtos-mbed/systimer/main.cpp

@@ -26,7 +26,7 @@
 extern "C" {
 #include "rtx_lib.h"
 }
-#include "rtos/TARGET_CORTEX/SysTimer.h"
+#include "platform/SysTimer.h"
 
 #define TEST_TICKS 42UL
 #define DELAY_DELTA_US 2500ULL
@@ -44,7 +44,7 @@ using namespace utest::v1;
 const us_timestamp_t DELAY_US = 1000000ULL * TEST_TICKS / OS_TICK_FREQ;
 
 // Override the handler() -- the SysTick interrupt must not be set as pending by the test code.
-class SysTimerTest: public rtos::internal::SysTimer {
+class SysTimerTest: public mbed::internal::SysTimer {
 private:
     Semaphore _sem;
     virtual void handler()

rtos/TARGET_CORTEX/SysTimer.cpp renamed to platform/SysTimer.cpp

@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#include "rtos/TARGET_CORTEX/SysTimer.h"
+#include "platform/SysTimer.h"
 
 #if MBED_TICKLESS
 
@@ -55,7 +55,7 @@ extern "C" IRQn_Type mbed_get_m0_tick_irqn(void);
 extern "C" IRQn_ID_t mbed_get_a9_tick_irqn(void);
 #endif
 
-namespace rtos {
+namespace mbed {
 namespace internal {
 
 SysTimer::SysTimer() :

rtos/TARGET_CORTEX/SysTimer.h renamed to platform/SysTimer.h

@@ -27,7 +27,7 @@
 #include "platform/NonCopyable.h"
 #include "drivers/TimerEvent.h"
 
-namespace rtos {
+namespace mbed {
 namespace internal {
 
 /**

rtos/LICENSE.md

@@ -7,8 +7,6 @@ Files licensed under MIT:
 - TARGET_CORTEX/mbed_rtos_storage.h
 - TARGET_CORTEX/mbed_rtx_conf.h
 - TARGET_CORTEX/mbed_rtx_idle.cpp
-- TARGET_CORTEX/SysTimer.h
-- TARGET_CORTEX/SysTimer.cpp
 - ConditionVariable.cpp
 - ConditionVariable.h
 - EventFlags.cpp

rtos/TARGET_CORTEX/mbed_rtx_idle.cpp

@@ -46,20 +46,20 @@ extern "C" {
 #error Low power ticker required when MBED_CONF_TARGET_TICKLESS_FROM_US_TICKER is false
 #endif
 
-#include "rtos/TARGET_CORTEX/SysTimer.h"
+#include "platform/SysTimer.h"
 
-    static rtos::internal::SysTimer *os_timer;
-    static uint64_t os_timer_data[sizeof(rtos::internal::SysTimer) / 8];
+    static mbed::internal::SysTimer *os_timer;
+    static uint64_t os_timer_data[sizeof(mbed::internal::SysTimer) / 8];
 
     // Enable System Timer.
     void OS_Tick_Enable(void)
     {
         // Do not use SingletonPtr since this relies on the RTOS
         if (NULL == os_timer) {
 #if MBED_CONF_TARGET_TICKLESS_FROM_US_TICKER
-            os_timer = new (os_timer_data) rtos::internal::SysTimer(get_us_ticker_data());
+            os_timer = new (os_timer_data) mbed::internal::SysTimer(get_us_ticker_data());
 #else
-            os_timer = new (os_timer_data) rtos::internal::SysTimer(get_lp_ticker_data());
+            os_timer = new (os_timer_data) mbed::internal::SysTimer(get_lp_ticker_data());
 #endif
             os_timer->setup_irq();
         }