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

3 files changed, 2 insertions, 415 deletions

diff --git a/os/hal/src/rtc.c b/os/hal/src/rtc.c
index 4b57614a1..d4b13ba62 100644
--- a/os/hal/src/rtc.c
+++ b/os/hal/src/rtc.c
@@ -187,6 +187,8 @@ void rtcSetCallback(RTCDriver *rtcp, rtccb_t callback) {
 

 /**

  * @brief   Get current time in format suitable for usage in FAT file system.

+ * @note    The information about day of week and DST is lost in DOS

+ *          format, the second field loses its least significant bit.

  *

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

  * @return              FAT date/time value.

@@ -194,7 +196,6 @@ void rtcSetCallback(RTCDriver *rtcp, rtccb_t callback) {
  * @api

  */

 uint32_t rtcConvertDateTimeToFAT(const RTCDateTime *timespec) {

-

   uint32_t fattime;

   uint32_t sec, min, hour, tmp;

 

diff --git a/os/various/chrtclib.c b/os/various/chrtclib.c
deleted file mode 100644
index cc95f213a..000000000
--- a/os/various/chrtclib.c
+++ /dev/null
@@ -1,359 +0,0 @@
-/*

-    ChibiOS - Copyright (C) 2006-2014 Giovanni Di Sirio

-

-    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.

-*/

-/*

-   Concepts and parts of this file have been contributed by Uladzimir Pylinsky

-   aka barthess.

- */

-

-/**

- * @file    chrtclib.c

- * @brief   RTC time conversion utilities code.

- *

- * @addtogroup chrtclib

- * @{

- */

-

-#include <time.h>

-

-#include "ch.h"

-#include "hal.h"

-

-#include "chrtclib.h"

-

-#if (defined(STM32F4XX) || defined(STM32F2XX) || defined(STM32L1XX) || \

-     defined(STM32F30X) || defined(STM32F37X) || \

-     defined(STM32F1XX) || defined(STM32F10X_MD) || defined(STM32F10X_LD) || \

-     defined(STM32F10X_HD) || defined(LPC122X) || defined(__DOXYGEN__))

-#if STM32_RTC_IS_CALENDAR

-/**

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

- *

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

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

- *

- * @notapi

- */

-static 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 as defined in time.h

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

- *

- * @notapi

- */

-static 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;

-}

-

-/**

- * @brief   Gets raw time from RTC and converts it to canonicalized format.

- *

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

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

- *

- * @api

- */

-void rtcGetTimeTm(RTCDriver *rtcp, struct tm *timp) {

-#if STM32_RTC_HAS_SUBSECONDS

-  RTCTime timespec = {0,0,FALSE,0};

-#else

-  RTCTime timespec = {0,0,FALSE};

-#endif

-

-  rtcGetTime(rtcp, &timespec);

-  stm32_rtc_bcd2tm(timp, &timespec);

-}

-

-/**

- * @brief   Sets RTC time.

- *

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

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

- *

- * @api

- */

-void rtcSetTimeTm(RTCDriver *rtcp, struct tm *timp) {

-#if STM32_RTC_HAS_SUBSECONDS

-  RTCTime timespec = {0,0,FALSE,0};

-#else

-  RTCTime timespec = {0,0,FALSE};

-#endif

-

-  stm32_rtc_tm2bcd(timp, &timespec);

-  rtcSetTime(rtcp, &timespec);

-}

-

-/**

- * @brief   Gets raw time from RTC and converts it to unix format.

- *

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

- * @return              Unix time value in seconds.

- *

- * @api

- */

-time_t rtcGetTimeUnixSec(RTCDriver *rtcp) {

-#if STM32_RTC_HAS_SUBSECONDS

-  RTCTime timespec = {0,0,FALSE,0};

-#else

-  RTCTime timespec = {0,0,FALSE};

-#endif

-  struct tm timp;

-

-  rtcGetTime(rtcp, &timespec);

-  stm32_rtc_bcd2tm(&timp, &timespec);

-

-  return mktime(&timp);

-}

-

-/**

- * @brief   Sets RTC time.

- *

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

- * @param[in] tv_sec    time specification

- * @return              Unix time value in seconds.

- *

- * @api

- */

-void rtcSetTimeUnixSec(RTCDriver *rtcp, time_t tv_sec) {

-#if STM32_RTC_HAS_SUBSECONDS

-  RTCTime timespec = {0,0,FALSE,0};

-#else

-  RTCTime timespec = {0,0,FALSE};

-#endif

-  struct tm timp;

-

-  localtime_r(&tv_sec, &timp);

-  stm32_rtc_tm2bcd(&timp, &timespec);

-  rtcSetTime(rtcp, &timespec);

-}

-

-/**

- * @brief   Gets raw time from RTC and converts it to unix format.

- *

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

- * @return              Unix time value in microseconds.

- *

- * @api

- */

-uint64_t rtcGetTimeUnixUsec(RTCDriver *rtcp) {

-#if STM32_RTC_HAS_SUBSECONDS

-  uint64_t result = 0;

-  RTCTime timespec = {0,0,FALSE,0};

-  struct tm timp;

-

-  rtcGetTime(rtcp, &timespec);

-  stm32_rtc_bcd2tm(&timp, &timespec);

-

-  result = (uint64_t)mktime(&timp) * 1000000;

-  return result + timespec.tv_msec * 1000;

-#else

-  return (uint64_t)rtcGetTimeUnixSec(rtcp) * 1000000;

-#endif

-}

-

-#else /* STM32_RTC_IS_CALENDAR */

-/**

- * @brief   Gets raw time from RTC and converts it to canonicalized format.

- *

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

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

- *

- * @api

- */

-void rtcGetTimeTm(RTCDriver *rtcp, struct tm *timp) {

-  RTCTime timespec = {0};

-

-  rtcGetTime(rtcp, &timespec);

-  localtime_r((time_t *)&(timespec.tv_sec), timp);

-}

-

-/**

- * @brief   Sets RTC time.

- *

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

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

- *

- * @api

- */

-void rtcSetTimeTm(RTCDriver *rtcp, struct tm *timp) {

-  RTCTime timespec = {0};

-

-  timespec.tv_sec = mktime(timp);

-#if !defined(LPC122X)

-  timespec.tv_msec = 0;

-#endif

-  rtcSetTime(rtcp, &timespec);

-}

-

-/**

- * @brief   Gets raw time from RTC and converts it to unix format.

- *

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

- * @return              Unix time value in seconds.

- *

- * @api

- */

-time_t rtcGetTimeUnixSec(RTCDriver *rtcp) {

-  RTCTime timespec = {0};

-

-  rtcGetTime(rtcp, &timespec);

-  return timespec.tv_sec;

-}

-

-/**

- * @brief   Sets RTC time.

- *

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

- * @param[in] tv_sec    time specification

- * @return              Unix time value in seconds.

- *

- * @api

- */

-void rtcSetTimeUnixSec(RTCDriver *rtcp, time_t tv_sec) {

-  RTCTime timespec = {0};

-

-  timespec.tv_sec = tv_sec;

-#if !defined(LPC122X)

-  timespec.tv_msec = 0;

-#endif

-  rtcSetTime(rtcp, &timespec);

-}

-

-/**

- * @brief   Gets raw time from RTC and converts it to unix format.

- *

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

- * @return              Unix time value in microseconds.

- *

- * @api

- */

-uint64_t rtcGetTimeUnixUsec(RTCDriver *rtcp) {

-#if STM32_RTC_HAS_SUBSECONDS

-  uint64_t result = 0;

-  RTCTime timespec = {0,0};

-

-  rtcGetTime(rtcp, &timespec);

-  result = (uint64_t)timespec.tv_sec * 1000000;

-  return result + timespec.tv_msec * 1000;

-#else

-  return (uint64_t)rtcGetTimeUnixSec(rtcp) * 1000000;

-#endif

-}

-

-/**

- * @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 rtcGetTimeFatFromCounter(RTCDriver *rtcp) {

-  uint32_t fattime;

-  struct tm timp;

-

-  rtcGetTimeTm(rtcp, &timp);

-

-  fattime  = (timp.tm_sec)       >> 1;

-  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 /* 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
deleted file mode 100644
index 6b7acf25d..000000000
--- a/os/various/chrtclib.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*

-    ChibiOS - Copyright (C) 2006-2014 Giovanni Di Sirio

-

-    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.

-*/

-/*

-   Concepts and parts of this file have been contributed by Uladzimir Pylinsky

-   aka barthess.

- */

-

-/**

- * @file    chrtclib.h

- * @brief   RTC time conversion utilities header.

- *

- * @addtogroup chrtclib

- * @{

- */

-

-#ifndef CHRTCLIB_H_

-#define CHRTCLIB_H_

-

-#include <time.h>

-

-/*===========================================================================*/

-/* External declarations.                                                    */

-/*===========================================================================*/

-

-#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);

-  uint64_t rtcGetTimeUnixUsec(RTCDriver *rtcp);

-  void rtcSetTimeUnixSec(RTCDriver *rtcp, time_t tv_sec);

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* CHRTCLIB_H_ */

-

-/** @} */