andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RTC. Fixed bug 3568626. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4694 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
barthess 2012-09-19 12:25:05 +00:00
parent 23973e3f9a
commit 892e73121a
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
os/various/chrtclib.c
View File

@ -213,8 +213,10 @@ void rtcSetTimeUnixSec(RTCDriver *rtcp, time_t tv_sec) {
#else #else
RTCTime timespec = {0,0,FALSE}; RTCTime timespec = {0,0,FALSE};
#endif #endif
struct tm timp;
stm32_rtc_tm2bcd(localtime(&tv_sec), &timespec); localtime_r(&tv_sec, &timp);
stm32_rtc_tm2bcd(&timp, &timespec);
rtcSetTime(rtcp, &timespec); rtcSetTime(rtcp, &timespec);
} }
@ -255,8 +257,7 @@ void rtcGetTimeTm(RTCDriver *rtcp, struct tm *timp) {
RTCTime timespec = {0,0}; RTCTime timespec = {0,0};
rtcGetTime(rtcp, &timespec); rtcGetTime(rtcp, &timespec);
if (timp != NULL) /* this comparison needed to avoid compiler warning */ localtime_r((time_t *)&(timespec.tv_sec), timp);
timp = localtime((time_t *)&(timespec.tv_sec));
} }
/** /**
@ -339,17 +340,18 @@ uint64_t rtcGetTimeUnixUsec(RTCDriver *rtcp) {
* @api * @api
*/ */
uint32_t rtcGetTimeFat(RTCDriver *rtcp) { uint32_t rtcGetTimeFat(RTCDriver *rtcp) {
uint32_t fattime = 0; uint32_t fattime;
struct tm *timp = NULL; struct tm timp;
rtcGetTimeTm(rtcp, 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;
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; return fattime;
} }