diff options
| author | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-09-20 15:01:28 +0000 |
|---|---|---|
| committer | barthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-09-20 15:01:28 +0000 |
| commit | 54cde6b85446a97d4e980109483b23a758324a8c (patch) | |
| tree | d3594952ebd8398c0d21ccf6a3af06d52089ad9d /os/various | |
| parent | d4fd78d689f091a5534e755bb26c781289d43b5f (diff) | |
| download | ChibiOS-54cde6b85446a97d4e980109483b23a758324a8c.tar.gz ChibiOS-54cde6b85446a97d4e980109483b23a758324a8c.tar.bz2 ChibiOS-54cde6b85446a97d4e980109483b23a758324a8c.zip | |
RTCv2. Get fat time function moved to driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4701 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/various')
| -rw-r--r-- | os/various/chrtclib.c | 4 | ||||
| -rw-r--r-- | os/various/chrtclib.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/os/various/chrtclib.c b/os/various/chrtclib.c index 888ef3a9b..04b3cb25c 100644 --- a/os/various/chrtclib.c +++ b/os/various/chrtclib.c @@ -328,8 +328,6 @@ uint64_t rtcGetTimeUnixUsec(RTCDriver *rtcp) { return (uint64_t)rtcGetTimeUnixSec(rtcp) * 1000000;
#endif
}
-#endif /* STM32_RTC_IS_CALENDAR */
-#endif /* (defined(STM32F4XX) || defined(STM32F2XX) || defined(STM32L1XX) || defined(STM32F1XX)) */
/**
* @brief Get current time in format suitable for usage in FatFS.
@@ -354,5 +352,7 @@ uint32_t rtcGetTimeFat(RTCDriver *rtcp) { return fattime;
}
+#endif /* STM32_RTC_IS_CALENDAR */
+#endif /* (defined(STM32F4XX) || defined(STM32F2XX) || defined(STM32L1XX) || defined(STM32F1XX)) */
/** @} */
diff --git a/os/various/chrtclib.h b/os/various/chrtclib.h index c41706f87..c6f6c8d45 100644 --- a/os/various/chrtclib.h +++ b/os/various/chrtclib.h @@ -42,7 +42,9 @@ #ifdef __cplusplus
extern "C" {
#endif
+#if !STM32_RTC_IS_CALENDAR
uint32_t rtcGetTimeFat(RTCDriver *rtcp);
+#endif
void rtcGetTimeTm(RTCDriver *rtcp, struct tm *timp);
void rtcSetTimeTm(RTCDriver *rtcp, struct tm *timp);
time_t rtcGetTimeUnixSec(RTCDriver *rtcp);
|