Merge pull request #2302 from c1728p9/fix_rtc

sg- · web-flow · commit 6973ee6fb863 · 2016-07-28T16:09:37.000-05:00
Fix RTC test for LPC and STM families on GCC
diff --git a/hal/api/AnalogIn.h b/hal/api/AnalogIn.h
@@ -22,6 +22,7 @@
 
 #include "analogin_api.h"
 #include "SingletonPtr.h"
+#include "PlatformMutex.h"
 
 namespace mbed {
 
diff --git a/hal/api/AnalogOut.h b/hal/api/AnalogOut.h
@@ -21,6 +21,7 @@
 #if DEVICE_ANALOGOUT
 
 #include "analogout_api.h"
+#include "PlatformMutex.h"
 
 namespace mbed {
 
diff --git a/hal/api/BusIn.h b/hal/api/BusIn.h
@@ -18,6 +18,7 @@
 
 #include "platform.h"
 #include "DigitalIn.h"
+#include "PlatformMutex.h"
 
 namespace mbed {
 
diff --git a/hal/api/BusInOut.h b/hal/api/BusInOut.h
@@ -17,6 +17,7 @@
 #define MBED_BUSINOUT_H
 
 #include "DigitalInOut.h"
+#include "PlatformMutex.h"
 
 namespace mbed {
 
diff --git a/hal/api/BusOut.h b/hal/api/BusOut.h
@@ -17,6 +17,7 @@
 #define MBED_BUSOUT_H
 
 #include "DigitalOut.h"
+#include "PlatformMutex.h"
 
 namespace mbed {
 
diff --git a/hal/api/CAN.h b/hal/api/CAN.h
@@ -23,6 +23,7 @@
 #include "can_api.h"
 #include "can_helper.h"
 #include "Callback.h"
+#include "PlatformMutex.h"
 
 namespace mbed {
 
diff --git a/hal/api/FileBase.h b/hal/api/FileBase.h
@@ -42,6 +42,7 @@ typedef long off_t;
 
 #include "platform.h"
 #include "SingletonPtr.h"
+#include "PlatformMutex.h"
 
 namespace mbed {
 
diff --git a/hal/api/I2C.h b/hal/api/I2C.h
@@ -22,6 +22,7 @@
 
 #include "i2c_api.h"
 #include "SingletonPtr.h"
+#include "PlatformMutex.h"
 
 #if DEVICE_I2C_ASYNCH
 #include "CThunk.h"
diff --git a/hal/api/InterruptManager.h b/hal/api/InterruptManager.h
@@ -1,10 +1,9 @@
 #ifndef MBED_INTERRUPTMANAGER_H
 #define MBED_INTERRUPTMANAGER_H
 
-#include "platform.h"
-
 #include "cmsis.h"
 #include "CallChain.h"
+#include "PlatformMutex.h"
 #include <string.h>
 
 namespace mbed {
diff --git a/hal/api/LocalFileSystem.h b/hal/api/LocalFileSystem.h
@@ -21,6 +21,7 @@
 #if DEVICE_LOCALFILESYSTEM
 
 #include "FileSystemLike.h"
+#include "PlatformMutex.h"
 
 namespace mbed {
 
diff --git a/hal/api/PlatformMutex.h b/hal/api/PlatformMutex.h
@@ -0,0 +1,46 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2013 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef PLATFORM_MUTEX_H
+#define PLATFORM_MUTEX_H
+
+#ifdef MBED_CONF_RTOS_PRESENT
+#include "Mutex.h"
+typedef rtos::Mutex PlatformMutex;
+#else
+/** A stub mutex for when an RTOS is not present
+*/
+class PlatformMutex {
+public:
+    PlatformMutex() {
+        // Stub
+
+    }
+    ~PlatformMutex() {
+        // Stub
+    }
+
+    void lock() {
+        // Do nothing
+    }
+
+    void unlock() {
+        // Do nothing
+    }
+};
+
+#endif
+
+#endif
diff --git a/hal/api/SPI.h b/hal/api/SPI.h
@@ -20,6 +20,7 @@
 
 #if DEVICE_SPI
 
+#include "PlatformMutex.h"
 #include "spi_api.h"
 
 #if DEVICE_SPI_ASYNCH
diff --git a/hal/api/Serial.h b/hal/api/Serial.h
@@ -22,6 +22,7 @@
 
 #include "Stream.h"
 #include "SerialBase.h"
+#include "PlatformMutex.h"
 #include "serial_api.h"
 
 namespace mbed {
diff --git a/hal/api/platform.h b/hal/api/platform.h
@@ -25,31 +25,4 @@
 #include <cstdio>
 #include <cstring>
 
-#ifdef MBED_CONF_RTOS_PRESENT
-#include "Mutex.h"
-typedef rtos::Mutex PlatformMutex;
-#else
-/** A stub mutex for when an RTOS is not present
-*/
-class PlatformMutex {
-public:
-    PlatformMutex() {
-        // Stub
-
-    }
-    ~PlatformMutex() {
-        // Stub
-    }
-
-    void lock() {
-        // Do nothing
-    }
-
-    void unlock() {
-        // Do nothing
-    }
-};
-
-#endif
-
 #endif
diff --git a/hal/common/mbed_rtc_time.cpp b/hal/common/mbed_rtc_time.cpp
@@ -19,6 +19,10 @@
 #include "critical.h"
 #include "rtc_time.h"
 #include "us_ticker_api.h"
+#include "SingletonPtr.h"
+#include "PlatformMutex.h"
+
+static SingletonPtr<PlatformMutex> _mutex;
 
 #if DEVICE_RTC
 static void (*_rtc_init)(void) = rtc_init;
@@ -42,7 +46,7 @@ time_t time(time_t *timer)
 #endif
 
 {
-    core_util_critical_section_enter();
+    _mutex->lock();
     if (_rtc_isenabled != NULL) {
         if (!(_rtc_isenabled())) {
             set_time(0);
@@ -57,36 +61,36 @@ time_t time(time_t *timer)
     if (timer != NULL) {
         *timer = t;
     }
-    core_util_critical_section_exit();
+    _mutex->unlock();
     return t;
 }
 
 void set_time(time_t t) {
-    core_util_critical_section_enter();
+    _mutex->lock();
     if (_rtc_init != NULL) {
         _rtc_init();
     }
     if (_rtc_write != NULL) {
         _rtc_write(t);
     }
-    core_util_critical_section_exit();
+    _mutex->unlock();
 }
 
 clock_t clock() {
-    core_util_critical_section_enter();
+    _mutex->lock();
     clock_t t = us_ticker_read();
     t /= 1000000 / CLOCKS_PER_SEC; // convert to processor time
-    core_util_critical_section_exit();
+    _mutex->unlock();
     return t;
 }
 
 void attach_rtc(time_t (*read_rtc)(void), void (*write_rtc)(time_t), void (*init_rtc)(void), int (*isenabled_rtc)(void)) {
-    core_util_critical_section_enter();
+    _mutex->lock();
     _rtc_read = read_rtc;
     _rtc_write = write_rtc;
     _rtc_init = init_rtc;
     _rtc_isenabled = isenabled_rtc;
-    core_util_critical_section_exit();
+    _mutex->unlock();
 }
 
 
diff --git a/hal/common/retarget.cpp b/hal/common/retarget.cpp
@@ -22,6 +22,7 @@
 #include "semihost_api.h"
 #include "mbed_interface.h"
 #include "SingletonPtr.h"
+#include "PlatformMutex.h"
 #if DEVICE_STDIO_MESSAGES
 #include <stdio.h>
 #endif
diff --git a/libraries/fs/fat/FATDirHandle.h b/libraries/fs/fat/FATDirHandle.h
@@ -23,7 +23,7 @@
 #define MBED_FATDIRHANDLE_H
 
 #include "DirHandle.h"
-#include "platform.h"
+#include "PlatformMutex.h"
 
 using namespace mbed;
 
diff --git a/libraries/fs/fat/FATFileHandle.h b/libraries/fs/fat/FATFileHandle.h
@@ -23,7 +23,7 @@
 #define MBED_FATFILEHANDLE_H
 
 #include "FileHandle.h"
-#include "platform.h"
+#include "PlatformMutex.h"
 
 using namespace mbed;
 
diff --git a/libraries/fs/fat/FATFileSystem.h b/libraries/fs/fat/FATFileSystem.h
@@ -26,7 +26,7 @@
 #include "FileHandle.h"
 #include "ff.h"
 #include <stdint.h>
-#include "platform.h"
+#include "PlatformMutex.h"
 
 using namespace mbed;
 
