From 58b849c451ac1281c14bfc535ab7f411a0b736e0 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Wed, 25 Jan 2017 19:32:15 -0500 Subject: Move intrinsic RTC implmentation differences to driver files Some drivers set tm_wday just fine and do not need it coerced to be correct. Others set tm_yday, so don't overwrite what the driver sets; just zero it inside if it can't fill the field. Move calls to set_day_of_week() to the sorts of drivers that presumably required the hammer (FS#11814) in get_time() where the weekday isn't locked to the date. Change-Id: Idd0ded6bfc9d9f48fcc1a6074068164c42fcf24a --- firmware/drivers/rtc/rtc_pcf50606.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'firmware/drivers/rtc/rtc_pcf50606.c') diff --git a/firmware/drivers/rtc/rtc_pcf50606.c b/firmware/drivers/rtc/rtc_pcf50606.c index cb6697207b..2c751e5b01 100644 --- a/firmware/drivers/rtc/rtc_pcf50606.c +++ b/firmware/drivers/rtc/rtc_pcf50606.c @@ -24,6 +24,7 @@ #include "kernel.h" #include "system.h" #include "pcf50606.h" +#include "timefuncs.h" void rtc_init(void) { @@ -47,9 +48,9 @@ int rtc_read_datetime(struct tm *tm) tm->tm_sec = buf[0]; tm->tm_min = buf[1]; tm->tm_hour = buf[2]; - tm->tm_wday = buf[3]; tm->tm_mday = buf[4]; tm->tm_mon = buf[5] - 1; + tm->tm_yday = 0; /* Not implemented for now */ #ifdef IRIVER_H300_SERIES /* Special kludge to coexist with the iriver firmware. The iriver firmware stores the date as 1965+nn, and allows a range of 1980..2064. We use @@ -60,6 +61,8 @@ int rtc_read_datetime(struct tm *tm) tm->tm_year = buf[6] + 100; #endif /* IRIVER_H300_SERIES */ + set_day_of_week(tm); + return rc; } -- cgit v1.2.3