diff options
author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-12-26 13:16:24 +0000 |
---|---|---|
committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-12-26 13:16:24 +0000 |
commit | ae70b0edcea8b466894e140839371fb122a4aa92 (patch) | |
tree | 4c0031bf1e4afddba7d9479ebd055d7a6d16ae64 /os/hal/ports/STM32/LLD/RTCv1 | |
parent | 672c4381f55bb8d7fd7ff902dae116c5b9b72373 (diff) | |
download | ChibiOS-ae70b0edcea8b466894e140839371fb122a4aa92.tar.gz ChibiOS-ae70b0edcea8b466894e140839371fb122a4aa92.tar.bz2 ChibiOS-ae70b0edcea8b466894e140839371fb122a4aa92.zip |
Fixed bug #686.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8647 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/ports/STM32/LLD/RTCv1')
-rw-r--r-- | os/hal/ports/STM32/LLD/RTCv1/rtc_lld.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/os/hal/ports/STM32/LLD/RTCv1/rtc_lld.c b/os/hal/ports/STM32/LLD/RTCv1/rtc_lld.c index 16cb9b500..8f5193222 100644 --- a/os/hal/ports/STM32/LLD/RTCv1/rtc_lld.c +++ b/os/hal/ports/STM32/LLD/RTCv1/rtc_lld.c @@ -196,7 +196,7 @@ void rtc_lld_set_prescaler(void) { syssts_t sts;
/* Entering a reentrant critical zone.*/
- sts = chSysGetStatusAndLockX();
+ sts = osalSysGetStatusAndLockX();
rtc_acquire_access();
RTC->PRLH = (uint16_t)((STM32_RTCCLK - 1) >> 16) & 0x000F;
@@ -204,7 +204,7 @@ void rtc_lld_set_prescaler(void) { rtc_release_access();
/* Leaving a reentrant critical zone.*/
- chSysRestoreStatusX(sts);
+ osalSysRestoreStatusX(sts);
}
/**
@@ -290,7 +290,7 @@ void rtc_lld_set_alarm(RTCDriver *rtcp, (void)alarm_number;
/* Entering a reentrant critical zone.*/
- sts = chSysGetStatusAndLockX();
+ sts = osalSysGetStatusAndLockX();
rtc_acquire_access();
if (alarmspec != NULL) {
@@ -304,7 +304,7 @@ void rtc_lld_set_alarm(RTCDriver *rtcp, rtc_release_access();
/* Leaving a reentrant critical zone.*/
- chSysRestoreStatusX(sts);
+ osalSysRestoreStatusX(sts);
}
/**
@@ -327,7 +327,7 @@ void rtc_lld_get_alarm(RTCDriver *rtcp, (void)alarm_number;
/* Entering a reentrant critical zone.*/
- sts = chSysGetStatusAndLockX();
+ sts = osalSysGetStatusAndLockX();
/* Required because access to ALR.*/
rtc_apb1_sync();
@@ -335,7 +335,7 @@ void rtc_lld_get_alarm(RTCDriver *rtcp, alarmspec->tv_sec = ((rtcp->rtc->ALRH << 16) + rtcp->rtc->ALRL);
/* Leaving a reentrant critical zone.*/
- chSysRestoreStatusX(sts);
+ osalSysRestoreStatusX(sts);
}
/**
@@ -353,7 +353,7 @@ void rtc_lld_set_callback(RTCDriver *rtcp, rtccb_t callback) { syssts_t sts;
/* Entering a reentrant critical zone.*/
- sts = chSysGetStatusAndLockX();
+ sts = osalSysGetStatusAndLockX();
if (callback != NULL) {
@@ -373,7 +373,7 @@ void rtc_lld_set_callback(RTCDriver *rtcp, rtccb_t callback) { }
/* Leaving a reentrant critical zone.*/
- chSysRestoreStatusX(sts);
+ osalSysRestoreStatusX(sts);
}
/**
@@ -394,7 +394,7 @@ void rtcSTM32GetSecMsec(RTCDriver *rtcp, uint32_t *tv_sec, uint32_t *tv_msec) { osalDbgCheck((NULL != tv_sec) && (NULL != rtcp));
/* Entering a reentrant critical zone.*/
- sts = chSysGetStatusAndLockX();
+ sts = osalSysGetStatusAndLockX();
/* Required because access to CNT and DIV.*/
rtc_apb1_sync();
@@ -406,7 +406,7 @@ void rtcSTM32GetSecMsec(RTCDriver *rtcp, uint32_t *tv_sec, uint32_t *tv_msec) { } while ((*tv_sec) != (((uint32_t)(rtcp->rtc->CNTH) << 16) + rtcp->rtc->CNTL));
/* Leaving a reentrant critical zone.*/
- chSysRestoreStatusX(sts);
+ osalSysRestoreStatusX(sts);
if (NULL != tv_msec)
*tv_msec = (((uint32_t)STM32_RTCCLK - 1 - time_frac) * 1000) / STM32_RTCCLK;
@@ -427,7 +427,7 @@ void rtcSTM32SetSec(RTCDriver *rtcp, uint32_t tv_sec) { osalDbgCheck(NULL != rtcp);
/* Entering a reentrant critical zone.*/
- sts = chSysGetStatusAndLockX();
+ sts = osalSysGetStatusAndLockX();
rtc_acquire_access();
rtcp->rtc->CNTH = (uint16_t)(tv_sec >> 16);
@@ -435,7 +435,7 @@ void rtcSTM32SetSec(RTCDriver *rtcp, uint32_t tv_sec) { rtc_release_access();
/* Leaving a reentrant critical zone.*/
- chSysRestoreStatusX(sts);
+ osalSysRestoreStatusX(sts);
}
#endif /* HAL_USE_RTC */
|