riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14879 from benpicco/cpu/kinetis/rtc_mktimr

Browse Source 
cpu/kinetis: RTC use rtc_mktime()
This commit is contained in:
Alexandre Abadie 2020-09-25 21:48:16 +02:00 committed by GitHub
commit 6a2b2aab5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cpu/kinetis/periph/rtc.c
View File

@ -20,8 +20,6 @@
* @} * @}
*/ */
#include <stdint.h>
#include <time.h>
#include "cpu.h" #include "cpu.h"
#include "periph/rtc.h" #include "periph/rtc.h"
#include "periph/rtt.h" #include "periph/rtt.h"
@ -41,7 +39,7 @@ static rtc_state_t rtc_callback;
* *
* @param[inout] arg argument passed from the RTT interrupt * @param[inout] arg argument passed from the RTT interrupt
*/ */
static void rtc_cb(void* arg); static void rtc_cb(void *arg);
void rtc_init(void) void rtc_init(void)
{ {
@ -50,38 +48,38 @@ void rtc_init(void)
int rtc_set_time(struct tm *time) int rtc_set_time(struct tm *time)
{ {
time_t t = mktime(time); uint32_t t = rtc_mktime(time);
rtt_set_counter((uint32_t)t); rtt_set_counter(t);
return 0; return 0;
} }
int rtc_get_time(struct tm *time) int rtc_get_time(struct tm *time)
{ {
time_t t = (time_t)rtt_get_counter(); uint32_t t = rtt_get_counter();
gmtime_r(&t, time); rtc_localtime(t, time);
return 0; return 0;
} }
int rtc_set_alarm(struct tm *time, rtc_alarm_cb_t cb, void *arg) int rtc_set_alarm(struct tm *time, rtc_alarm_cb_t cb, void *arg)
{ {
time_t t = mktime(time); uint32_t t = rtc_mktime(time);
rtc_callback.cb = cb; rtc_callback.cb = cb;
rtt_set_alarm((uint32_t)t, rtc_cb, arg); rtt_set_alarm(t, rtc_cb, arg);
return 0; return 0;
} }
int rtc_get_alarm(struct tm *time) int rtc_get_alarm(struct tm *time)
{ {
time_t t = (time_t)rtt_get_alarm(); uint32_t t = rtt_get_alarm();
gmtime_r(&t, time); rtc_localtime(t, time);
return 0; return 0;
} }
@ -102,7 +100,7 @@ void rtc_poweroff(void)
rtt_poweroff(); rtt_poweroff();
} }
static void rtc_cb(void* arg) static void rtc_cb(void *arg)
{ {
if (rtc_callback.cb != NULL) { if (rtc_callback.cb != NULL) {
rtc_callback.cb(arg); rtc_callback.cb(arg);