aboutsummaryrefslogtreecommitdiffstats
path: root/os/various/chrtclib.c
diff options
context:
space:
mode:
authorbarthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-09-21 09:26:41 +0000
committerbarthess <barthess@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-09-21 09:26:41 +0000
commit7a68e17dd09c3c148ba9d50a5728491988940d69 (patch)
treec5d616388d1ebe71cf3e4393ec7425c41474c2a4 /os/various/chrtclib.c
parentbf0682028d8b9588b696019f9f54c6f295ab8aef (diff)
downloadChibiOS-7a68e17dd09c3c148ba9d50a5728491988940d69.tar.gz
ChibiOS-7a68e17dd09c3c148ba9d50a5728491988940d69.tar.bz2
ChibiOS-7a68e17dd09c3c148ba9d50a5728491988940d69.zip
RTCv1. Added FAT timestamp support in driver using chrtclib for deviced without hardware calendar.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4706 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/various/chrtclib.c')
-rw-r--r--os/various/chrtclib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/os/various/chrtclib.c b/os/various/chrtclib.c
index 04b3cb25c..04c0b67db 100644
--- a/os/various/chrtclib.c
+++ b/os/various/chrtclib.c
@@ -337,13 +337,13 @@ uint64_t rtcGetTimeUnixUsec(RTCDriver *rtcp) {
*
* @api
*/
-uint32_t rtcGetTimeFat(RTCDriver *rtcp) {
+uint32_t rtcGetTimeFatFromCounter(RTCDriver *rtcp) {
uint32_t fattime;
struct tm timp;
rtcGetTimeTm(rtcp, &timp);
- fattime = (timp.tm_sec) << 1;
+ fattime = (timp.tm_sec) >> 1;
fattime |= (timp.tm_min) << 5;
fattime |= (timp.tm_hour) << 11;
fattime |= (timp.tm_mday) << 16;