Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-20 12:33:27 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Correct naming of fields in struct alm_rdalarm_s. Should not be the same as the corresponding fields of struct alm_setalarm_s. The whole purpose of that naming convention is to keep the field names unique.

Browse Source
This commit is contained in:
Gregory Nutt
2017-09-03 09:51:47 -06:00
parent f42a8a38eb
commit 789e204141
9 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/stm32/stm32_rtc_lowerhalf.c
+2 -2
View File
@@ -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);
arch/arm/src/stm32/stm32f40xxx_alarm.h
+2 -2
View File
@@ -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 */
};
/****************************************************************************
arch/arm/src/stm32/stm32f40xxx_rtcc.c
+5 -5
View File
@@ -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;
}
arch/arm/src/stm32f7/stm32_alarm.h
+2 -2
View File
@@ -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 */
};
/****************************************************************************
arch/arm/src/stm32f7/stm32_rtc.c
+5 -5
View File
@@ -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;
}
arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c
+2 -2
View File
@@ -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);
arch/arm/src/stm32l4/stm32l4_rtc.h
+2 -2
View File
@@ -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 */
arch/arm/src/stm32l4/stm32l4_rtc_lowerhalf.c
+2 -2
View File
@@ -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);
arch/arm/src/stm32l4/stm32l4_rtcc.c
+5 -5
View File
@@ -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;
}