Fix RTC test failures by removing critical sect

Remove the critical section in mbed_rtc_time.c and instead use a
mutex to protect this. This function does not need to be interrupt
safe, just thread safe.

This fixes crashes on the GCC_ARM toolchain on the RTC test due to
trying to lock the GCC environment mutex while in a critical section.
Prior to this patch, this failure was likely to occur on STM and LPC
processor families.
pull/2302/head
Russ Butler 2016-07-28 13:35:35 -05:00
parent 4047ff9576
commit 1da259af3b
1 changed files with 12 additions and 8 deletions

View File

@ -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();
}