RTC. High level staff moved to chrtclib.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/sdc_dev2@4032 35acf78f-673a-0410-8e92-d51de3d6d3f4

7 files changed, 1 insertions, 171 deletions

diff --git a/os/hal/include/rtc.h b/os/hal/include/rtc.h
index 3acce33e4..9b5cba848 100644
--- a/os/hal/include/rtc.h
+++ b/os/hal/include/rtc.h
@@ -151,7 +151,6 @@ extern "C" {
   void rtcInit(void);

   void rtcSetTime(RTCDriver *rtcp, const RTCTime *timespec);

   void rtcGetTime(RTCDriver *rtcp, RTCTime *timespec);

-  uint32_t rtcGetFatTime(RTCDriver *rtcp);

 #if RTC_ALARMS > 0

   void rtcSetAlarm(RTCDriver *rtcp,

                    rtcalarm_t alarm,

diff --git a/os/hal/platforms/STM32/RTCv1/rtc_lld.c b/os/hal/platforms/STM32/RTCv1/rtc_lld.c
index 6496cfae9..a417194b1 100644
--- a/os/hal/platforms/STM32/RTCv1/rtc_lld.c
+++ b/os/hal/platforms/STM32/RTCv1/rtc_lld.c
@@ -291,29 +291,6 @@ void rtc_lld_set_callback(RTCDriver *rtcp, rtccb_t callback) {
     rtcp->callback = NULL;

   }

 }

-

-/**

- * @brief   Get current time in format suitable for usage in FatFS.

- *

- * @param[in] timespec  pointer to RTCTime structure

- * @return              FAT time value.

- *

- * @api

- */

-uint32_t rtc_lld_calc_fat_time(RTCTime *timespec){

-  uint32_t fattime = 0;

-  struct tm *timp;

-

-  timp = localtime((time_t *)(timespec->tv_sec));

-

-  fattime |= (timp->tm_sec / 2);

-  fattime |= (timp->tm_min) << 5;

-  fattime |= (timp->tm_hour) << 11;

-  fattime |= (timp->tm_mday) << 16;

-  fattime |= (timp->tm_mon + 1) << 21;

-  fattime |= (timp->tm_year - 80) << 25;

-  return fattime;

-}

 #endif /* HAL_USE_RTC */

 

 /** @} */

diff --git a/os/hal/platforms/STM32/RTCv1/rtc_lld.h b/os/hal/platforms/STM32/RTCv1/rtc_lld.h
index 64287d978..4944ff735 100644
--- a/os/hal/platforms/STM32/RTCv1/rtc_lld.h
+++ b/os/hal/platforms/STM32/RTCv1/rtc_lld.h
@@ -178,7 +178,6 @@ extern "C" {
                          rtcalarm_t alarm,

                          RTCAlarm *alarmspec);

   void rtc_lld_set_callback(RTCDriver *rtcp, rtccb_t callback);

-  uint32_t rtc_lld_calc_fat_time(RTCTime *timespec);

 #ifdef __cplusplus

 }

 #endif

diff --git a/os/hal/platforms/STM32/RTCv2/rtc_lld.c b/os/hal/platforms/STM32/RTCv2/rtc_lld.c
index c2268fd82..870734fba 100644
--- a/os/hal/platforms/STM32/RTCv2/rtc_lld.c
+++ b/os/hal/platforms/STM32/RTCv2/rtc_lld.c
@@ -264,126 +264,6 @@ void rtcGetPeriodicWakeup_v2(RTCDriver *rtcp, RTCWakeup *wakeupspec){
   wakeupspec->wakeup |= (((uint32_t)rtcp->id_rtc->CR) & 0x7) << 16;

 }

 

-/**

- * @brief   Get current time in format suitable for usage in FatFS.

- *

- * @param[in] timespec  pointer to RTCTime structure

- * @return              FAT time value.

- *

- * @api

- */

-uint32_t rtc_lld_calc_fat_time(RTCTime *timespec){

-  uint32_t fattime = 0;

-  struct tm timp;

-

-  stm32_rtc_bcd2tm(&timp, timespec);

-

-  fattime |= (timp.tm_sec / 2);

-  fattime |= (timp.tm_min) << 5;

-  fattime |= (timp.tm_hour) << 11;

-  fattime |= (timp.tm_mday) << 16;

-  fattime |= (timp.tm_mon + 1) << 21;

-  fattime |= (timp.tm_year - 80) << 25;

-  return fattime;

-}

-

-/**

- * @brief     Converts from STM32 BCD to canonicalized time format.

- *

- * @param[out] timp     pointer to a @p tm structure defined in time.h

- * @param[in]  timespec pointer to a @p RTCTime structure

- *

- * @api

- */

-void stm32_rtc_bcd2tm(struct tm *timp, RTCTime *timespec){

-  uint32_t tv_time = timespec->tv_time;

-  uint32_t tv_date = timespec->tv_date;

-

-#if CH_DBG_ENABLE_CHECKS

-  timp->tm_isdst = 0;

-  timp->tm_wday  = 0;

-  timp->tm_mday  = 0;

-  timp->tm_yday  = 0;

-  timp->tm_mon   = 0;

-  timp->tm_year  = 0;

-  timp->tm_sec   = 0;

-  timp->tm_min   = 0;

-  timp->tm_hour  = 0;

-#endif

-

-  timp->tm_isdst = -1;

-

-  timp->tm_wday = (tv_date & RTC_DR_WDU) >> RTC_DR_WDU_OFFSET;

-  if(timp->tm_wday == 7)

-    timp->tm_wday = 0;

-

-  timp->tm_mday =  (tv_date & RTC_DR_DU) >> RTC_DR_DU_OFFSET;

-  timp->tm_mday += ((tv_date & RTC_DR_DT) >> RTC_DR_DT_OFFSET) * 10;

-

-  timp->tm_mon  =  (tv_date & RTC_DR_MU) >> RTC_DR_MU_OFFSET;

-  timp->tm_mon  += ((tv_date & RTC_DR_MT) >> RTC_DR_MT_OFFSET) * 10;

-  timp->tm_mon  -= 1;

-

-  timp->tm_year =  (tv_date & RTC_DR_YU) >> RTC_DR_YU_OFFSET;

-  timp->tm_year += ((tv_date & RTC_DR_YT) >> RTC_DR_YT_OFFSET) * 10;

-  timp->tm_year += 2000 - 1900;

-

-  timp->tm_sec  =  (tv_time & RTC_TR_SU) >> RTC_TR_SU_OFFSET;

-  timp->tm_sec  += ((tv_time & RTC_TR_ST) >> RTC_TR_ST_OFFSET) * 10;

-

-  timp->tm_min  =  (tv_time & RTC_TR_MNU) >> RTC_TR_MNU_OFFSET;

-  timp->tm_min  += ((tv_time & RTC_TR_MNT) >> RTC_TR_MNT_OFFSET) * 10;

-

-  timp->tm_hour =  (tv_time & RTC_TR_HU) >> RTC_TR_HU_OFFSET;

-  timp->tm_hour += ((tv_time & RTC_TR_HT) >> RTC_TR_HT_OFFSET) * 10;

-  timp->tm_hour += 12 * ((tv_time & RTC_TR_PM) >> RTC_TR_PM_OFFSET);

-}

-

-/**

- * @brief     Converts from canonicalized to STM32 BCD time format.

- *

- * @param[in]  timp     pointer to a @p tm structure defined in time.h

- * @param[out] timespec pointer to a @p RTCTime structure

- *

- * @api

- */

-void stm32_rtc_tm2bcd(struct tm *timp, RTCTime *timespec){

-  uint32_t v = 0;

-

-  timespec->tv_date = 0;

-  timespec->tv_time = 0;

-

-  v = timp->tm_year - 100;

-  timespec->tv_date |= ((v / 10) << RTC_DR_YT_OFFSET) & RTC_DR_YT;

-  timespec->tv_date |= (v % 10) << RTC_DR_YU_OFFSET;

-

-  if (timp->tm_wday == 0)

-    v = 7;

-  else

-    v = timp->tm_wday;

-  timespec->tv_date |= (v << RTC_DR_WDU_OFFSET) & RTC_DR_WDU;

-

-  v = timp->tm_mon + 1;

-  timespec->tv_date |= ((v / 10) << RTC_DR_MT_OFFSET) & RTC_DR_MT;

-  timespec->tv_date |= (v % 10) << RTC_DR_MU_OFFSET;

-

-  v = timp->tm_mday;

-  timespec->tv_date |= ((v / 10) << RTC_DR_DT_OFFSET) & RTC_DR_DT;

-  timespec->tv_date |= (v % 10) << RTC_DR_DU_OFFSET;

-

-  v = timp->tm_hour;

-  timespec->tv_time |= ((v / 10) << RTC_TR_HT_OFFSET) & RTC_TR_HT;

-  timespec->tv_time |= (v % 10) << RTC_TR_HU_OFFSET;

-

-  v = timp->tm_min;

-  timespec->tv_time |= ((v / 10) << RTC_TR_MNT_OFFSET) & RTC_TR_MNT;

-  timespec->tv_time |= (v % 10) << RTC_TR_MNU_OFFSET;

-

-  v = timp->tm_sec;

-  timespec->tv_time |= ((v / 10) << RTC_TR_ST_OFFSET) & RTC_TR_ST;

-  timespec->tv_time |= (v % 10) << RTC_TR_SU_OFFSET;

-}

-

 #endif /* HAL_USE_RTC */

 

 /** @} */

diff --git a/os/hal/platforms/STM32/RTCv2/rtc_lld.h b/os/hal/platforms/STM32/RTCv2/rtc_lld.h
index 88959294c..4cae5744d 100644
--- a/os/hal/platforms/STM32/RTCv2/rtc_lld.h
+++ b/os/hal/platforms/STM32/RTCv2/rtc_lld.h
@@ -35,8 +35,6 @@
 

 #if HAL_USE_RTC || defined(__DOXYGEN__)

 

-#include <time.h>

-

 /*===========================================================================*/

 /* Driver constants.                                                         */

 /*===========================================================================*/

@@ -200,9 +198,6 @@ extern "C" {
                          RTCAlarm *alarmspec);

   void rtcSetPeriodicWakeup_v2(RTCDriver *rtcp, RTCWakeup *wakeupspec);

   void rtcGetPeriodicWakeup_v2(RTCDriver *rtcp, RTCWakeup *wakeupspec);

-  uint32_t rtc_lld_calc_fat_time(RTCTime *timespec);

-  void stm32_rtc_bcd2tm(struct tm *timp, RTCTime *timespec);

-  void stm32_rtc_tm2bcd(struct tm *timp, RTCTime *timespec);

 #ifdef __cplusplus

 }

 #endif

diff --git a/os/hal/platforms/STM32F1xx/hal_lld.h b/os/hal/platforms/STM32F1xx/hal_lld.h
index 4a375ab4e..c8d87b7c5 100644
--- a/os/hal/platforms/STM32F1xx/hal_lld.h
+++ b/os/hal/platforms/STM32F1xx/hal_lld.h
@@ -88,7 +88,7 @@
 /* RTC attributes.*/

 #define STM32_HAS_RTC           TRUE

 #define STM32_RTC_HAS_SUBSECONDS TRUE

-#define STM32_RTC_IS_CALENDAR   TRUE

+#define STM32_RTC_IS_CALENDAR   FALSE

 /** @} */

 

 /*===========================================================================*/

diff --git a/os/hal/src/rtc.c b/os/hal/src/rtc.c
index a6601fd1c..01f88e82d 100644
--- a/os/hal/src/rtc.c
+++ b/os/hal/src/rtc.c
@@ -101,26 +101,6 @@ void rtcGetTime(RTCDriver *rtcp, RTCTime *timespec) {
   chSysUnlock();

 }

 

-/**

- * @brief   Get current time in format suitable for usage in FatFS.

- *

- * @param[in] rtcp      pointer to RTC driver structure

- * @return              FAT time value.

- *

- * @api

- */

-uint32_t rtcGetFatTime(RTCDriver *rtcp) {

-  RTCTime timespec;

-

-  chDbgCheck((rtcp != NULL), "rtcGetTime");

-

-  chSysLock();

-  rtcGetTimeI(rtcp, &timespec);

-  chSysUnlock();

-

-  return rtc_lld_calc_fat_time(&timespec);

-}

-

 #if (RTC_ALARMS > 0) || defined(__DOXYGEN__)

 /**

  * @brief   Set alarm time.