diff --git a/arch/arm/src/stm32/stm32_rtc_lowerhalf.c b/arch/arm/src/stm32/stm32_rtc_lowerhalf.c index 8f2b74ace99..6a445b80f9f 100644 --- a/arch/arm/src/stm32/stm32_rtc_lowerhalf.c +++ b/arch/arm/src/stm32/stm32_rtc_lowerhalf.c @@ -727,8 +727,8 @@ static int stm32_rdalarm(FAR struct rtc_lowerhalf_s *lower, sched_lock(); - lowerinfo.as_id = alarminfo->id; - lowerinfo.as_time = alarminfo->time; + lowerinfo.ar_id = alarminfo->id; + lowerinfo.ar_time = alarminfo->time; ret = stm32_rtc_rdalarm(&lowerinfo); diff --git a/arch/arm/src/stm32/stm32f40xxx_alarm.h b/arch/arm/src/stm32/stm32f40xxx_alarm.h index 353fbc0b11c..cd45cbc1c8a 100644 --- a/arch/arm/src/stm32/stm32f40xxx_alarm.h +++ b/arch/arm/src/stm32/stm32f40xxx_alarm.h @@ -77,8 +77,8 @@ struct alm_setalarm_s struct alm_rdalarm_s { - int as_id; /* enum alm_id_e */ - FAR struct rtc_time *as_time; /* Argument for storing ALARM RTC time */ + int ar_id; /* enum alm_id_e */ + FAR struct rtc_time *ar_time; /* Argument for storing ALARM RTC time */ }; /**************************************************************************** diff --git a/arch/arm/src/stm32/stm32f40xxx_rtcc.c b/arch/arm/src/stm32/stm32f40xxx_rtcc.c index 2d780f876a7..db2e7e232be 100644 --- a/arch/arm/src/stm32/stm32f40xxx_rtcc.c +++ b/arch/arm/src/stm32/stm32f40xxx_rtcc.c @@ -1617,15 +1617,15 @@ int stm32_rtc_rdalarm(FAR struct alm_rdalarm_s *alminfo) int ret = -EINVAL; ASSERT(alminfo != NULL); - DEBUGASSERT(RTC_ALARM_LAST > alminfo->as_id); + DEBUGASSERT(RTC_ALARM_LAST > alminfo->ar_id); - switch (alminfo->as_id) + switch (alminfo->ar_id) { case RTC_ALARMA: { alarmreg = STM32_RTC_ALRMAR; ret = stm32_rtc_getalarmdatetime(alarmreg, - (struct tm *)alminfo->as_time); + (struct tm *)alminfo->ar_time); } break; @@ -1633,12 +1633,12 @@ int stm32_rtc_rdalarm(FAR struct alm_rdalarm_s *alminfo) { alarmreg = STM32_RTC_ALRMBR; ret = stm32_rtc_getalarmdatetime(alarmreg, - (struct tm *)alminfo->as_time); + (struct tm *)alminfo->ar_time); } break; default: - rtcerr("ERROR: Invalid ALARM%d\n", alminfo->as_id); + rtcerr("ERROR: Invalid ALARM%d\n", alminfo->ar_id); break; } diff --git a/arch/arm/src/stm32f7/stm32_alarm.h b/arch/arm/src/stm32f7/stm32_alarm.h index a898f074784..a2d8c297cdd 100644 --- a/arch/arm/src/stm32f7/stm32_alarm.h +++ b/arch/arm/src/stm32f7/stm32_alarm.h @@ -76,8 +76,8 @@ struct alm_setalarm_s struct alm_rdalarm_s { - int as_id; /* enum alm_id_e */ - FAR struct rtc_time *as_time; /* Argument for storing ALARM RTC time */ + int ar_id; /* enum alm_id_e */ + FAR struct rtc_time *ar_time; /* Argument for storing ALARM RTC time */ }; /**************************************************************************** diff --git a/arch/arm/src/stm32f7/stm32_rtc.c b/arch/arm/src/stm32f7/stm32_rtc.c index 97762f4d5ad..42e4d0af8a0 100644 --- a/arch/arm/src/stm32f7/stm32_rtc.c +++ b/arch/arm/src/stm32f7/stm32_rtc.c @@ -1624,15 +1624,15 @@ int stm32_rtc_rdalarm(FAR struct alm_rdalarm_s *alminfo) int ret = -EINVAL; ASSERT(alminfo != NULL); - DEBUGASSERT(RTC_ALARM_LAST > alminfo->as_id); + DEBUGASSERT(RTC_ALARM_LAST > alminfo->ar_id); - switch (alminfo->as_id) + switch (alminfo->ar_id) { case RTC_ALARMA: { alarmreg = STM32_RTC_ALRMAR; ret = stm32_rtc_getalarmdatetime(alarmreg, - (struct tm *)alminfo->as_time); + (struct tm *)alminfo->ar_time); } break; @@ -1640,12 +1640,12 @@ int stm32_rtc_rdalarm(FAR struct alm_rdalarm_s *alminfo) { alarmreg = STM32_RTC_ALRMBR; ret = stm32_rtc_getalarmdatetime(alarmreg, - (struct tm *)alminfo->as_time); + (struct tm *)alminfo->ar_time); } break; default: - rtcerr("ERROR: Invalid ALARM%d\n", alminfo->as_id); + rtcerr("ERROR: Invalid ALARM%d\n", alminfo->ar_id); break; } diff --git a/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c b/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c index 6812a0fdcb3..03a0d518f28 100644 --- a/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c +++ b/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c @@ -556,8 +556,8 @@ static int stm32_rdalarm(FAR struct rtc_lowerhalf_s *lower, sched_lock(); - lowerinfo.as_id = alarminfo->id; - lowerinfo.as_time = alarminfo->time; + lowerinfo.ar_id = alarminfo->id; + lowerinfo.ar_time = alarminfo->time; ret = stm32_rtc_rdalarm(&lowerinfo); diff --git a/arch/arm/src/stm32l4/stm32l4_rtc.h b/arch/arm/src/stm32l4/stm32l4_rtc.h index de363ba41d2..d988c0c1756 100644 --- a/arch/arm/src/stm32l4/stm32l4_rtc.h +++ b/arch/arm/src/stm32l4/stm32l4_rtc.h @@ -90,8 +90,8 @@ struct alm_setalarm_s struct alm_rdalarm_s { - int as_id; /* enum alm_id_e */ - FAR struct rtc_time *as_time; /* Argument for storing ALARM RTC time */ + int ar_id; /* enum alm_id_e */ + FAR struct rtc_time *ar_time; /* Argument for storing ALARM RTC time */ }; #endif /* CONFIG_RTC_ALARM */ diff --git a/arch/arm/src/stm32l4/stm32l4_rtc_lowerhalf.c b/arch/arm/src/stm32l4/stm32l4_rtc_lowerhalf.c index 9f499eb6f8b..1abb96583e3 100644 --- a/arch/arm/src/stm32l4/stm32l4_rtc_lowerhalf.c +++ b/arch/arm/src/stm32l4/stm32l4_rtc_lowerhalf.c @@ -533,8 +533,8 @@ static int stm32l4_rdalarm(FAR struct rtc_lowerhalf_s *lower, sched_lock(); - lowerinfo.as_id = alarminfo->id; - lowerinfo.as_time = alarminfo->time; + lowerinfo.ar_id = alarminfo->id; + lowerinfo.ar_time = alarminfo->time; ret = stm32l4_rtc_rdalarm(&lowerinfo); diff --git a/arch/arm/src/stm32l4/stm32l4_rtcc.c b/arch/arm/src/stm32l4/stm32l4_rtcc.c index 5fbab089611..7cdfc186f77 100644 --- a/arch/arm/src/stm32l4/stm32l4_rtcc.c +++ b/arch/arm/src/stm32l4/stm32l4_rtcc.c @@ -1544,15 +1544,15 @@ int stm32l4_rtc_rdalarm(FAR struct alm_rdalarm_s *alminfo) int ret = -EINVAL; ASSERT(alminfo != NULL); - DEBUGASSERT(RTC_ALARM_LAST > alminfo->as_id); + DEBUGASSERT(RTC_ALARM_LAST > alminfo->ar_id); - switch (alminfo->as_id) + switch (alminfo->ar_id) { case RTC_ALARMA: { alarmreg = STM32L4_RTC_ALRMAR; ret = stm32l4_rtc_getalarmdatetime(alarmreg, - (struct tm *)alminfo->as_time); + (struct tm *)alminfo->ar_time); } break; @@ -1560,12 +1560,12 @@ int stm32l4_rtc_rdalarm(FAR struct alm_rdalarm_s *alminfo) { alarmreg = STM32L4_RTC_ALRMBR; ret = stm32l4_rtc_getalarmdatetime(alarmreg, - (struct tm *)alminfo->as_time); + (struct tm *)alminfo->ar_time); } break; default: - rtcerr("ERROR: Invalid ALARM%d\n", alminfo->as_id); + rtcerr("ERROR: Invalid ALARM%d\n", alminfo->ar_id); break; }