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

Merge pull request #15413 from benpicco/cpu/efm32_rtc_helper

Browse Source 
cpu/efm32: RTC Series 0: use RTC helper functions
This commit is contained in:
benpicco 2020-11-11 17:19:59 +01:00 committed by GitHub
commit 38552ed41a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cpu/efm32/periph/rtc_series0.c
View File

@ -34,7 +34,7 @@
typedef struct { typedef struct {
rtc_alarm_cb_t alarm_cb; /**< callback called from RTC interrupt */ rtc_alarm_cb_t alarm_cb; /**< callback called from RTC interrupt */
void *alarm_arg; /**< argument passed to the callback */ void *alarm_arg; /**< argument passed to the callback */
time_t alarm; /**< scheduled alarm (may be deferred) */ uint32_t alarm; /**< scheduled alarm (may be deferred) */
uint8_t overflows; /**< number of overflows */ uint8_t overflows; /**< number of overflows */
} rtc_state_t; } rtc_state_t;
@ -95,7 +95,7 @@ void rtc_init(void)
int rtc_set_time(struct tm *time) int rtc_set_time(struct tm *time)
{ {
time_t timestamp = mktime(time); time_t timestamp = rtc_mktime(time);
rtc_state.overflows = (timestamp >> RTC_SHIFT_VALUE); rtc_state.overflows = (timestamp >> RTC_SHIFT_VALUE);
RTC->CNT = timestamp & RTC_MAX_VALUE; RTC->CNT = timestamp & RTC_MAX_VALUE;
@ -109,7 +109,7 @@ int rtc_get_time(struct tm *time)
timestamp = timestamp + (rtc_state.overflows << RTC_SHIFT_VALUE); timestamp = timestamp + (rtc_state.overflows << RTC_SHIFT_VALUE);
gmtime_r((time_t *) &timestamp, time); rtc_localtime(timestamp, time);
return 0; return 0;
} }
@ -118,7 +118,7 @@ int rtc_set_alarm(struct tm *time, rtc_alarm_cb_t cb, void *arg)
{ {
rtc_state.alarm_cb = cb; rtc_state.alarm_cb = cb;
rtc_state.alarm_arg = arg; rtc_state.alarm_arg = arg;
rtc_state.alarm = mktime(time); rtc_state.alarm = rtc_mktime(time);
/* alarm may not be in reach of current time, so defer if needed */ /* alarm may not be in reach of current time, so defer if needed */
_set_alarm(); _set_alarm();
@ -128,7 +128,7 @@ int rtc_set_alarm(struct tm *time, rtc_alarm_cb_t cb, void *arg)
int rtc_get_alarm(struct tm *time) int rtc_get_alarm(struct tm *time)
{ {
gmtime_r((time_t *) &rtc_state.alarm, time); rtc_localtime(rtc_state.alarm, time);
return 0; return 0;
} }