Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-01 07:45:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

arch/arm/src: Change ASSERT macros to DEBUGASSERT.

Browse Source
This commit is contained in:
Juha Niskanen
2018-06-06 06:33:55 -06:00
committed by Gregory Nutt
parent 88cf9f1d3f
commit e0aa6ed48c
9 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/kinetis/kinetis_rtc_lowerhalf.c
+2 -2
View File
@@ -385,7 +385,7 @@ static int kinetis_setrelative(FAR struct rtc_lowerhalf_s *lower,
struct timespec ts; struct timespec ts;
int ret = -EINVAL; int ret = -EINVAL;
ASSERT(lower != NULL && alarminfo != NULL); DEBUGASSERT(lower != NULL && alarminfo != NULL);
DEBUGASSERT(alarminfo->id == RTC_ALARMA); DEBUGASSERT(alarminfo->id == RTC_ALARMA);
if ((alarminfo->id == RTC_ALARMA ) && if ((alarminfo->id == RTC_ALARMA ) &&
@@ -519,7 +519,7 @@ static int kinetis_rdalarm(FAR struct rtc_lowerhalf_s *lower,
struct timespec ts; struct timespec ts;
int ret = -EINVAL; int ret = -EINVAL;
ASSERT(lower != NULL && alarminfo != NULL && alarminfo->time != NULL); DEBUGASSERT(lower != NULL && alarminfo != NULL && alarminfo->time != NULL);
DEBUGASSERT(alarminfo->id == RTC_ALARMA); DEBUGASSERT(alarminfo->id == RTC_ALARMA);
if (alarminfo->id == RTC_ALARMA) if (alarminfo->id == RTC_ALARMA)
arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c
+1 -1
View File
@@ -566,7 +566,7 @@ static int lpc54_setperiodic(FAR struct rtc_lowerhalf_s *lower,
FAR struct lpc54_lowerhalf_s *priv; FAR struct lpc54_lowerhalf_s *priv;
int ret; int ret;
ASSERT(lower != NULL && alarminfo != NULL); DEBUGASSERT(lower != NULL && alarminfo != NULL);
priv = (FAR struct lpc54_lowerhalf_s *)lower; priv = (FAR struct lpc54_lowerhalf_s *)lower;
ret = nxsem_wait(&priv->devsem); ret = nxsem_wait(&priv->devsem);
arch/arm/src/stm32/stm32_rtc_lowerhalf.c
+3 -3
View File
@@ -535,7 +535,7 @@ static int stm32_setrelative(FAR struct rtc_lowerhalf_s *lower,
time_t seconds; time_t seconds;
int ret = -EINVAL; int ret = -EINVAL;
ASSERT(lower != NULL && alarminfo != NULL); DEBUGASSERT(lower != NULL && alarminfo != NULL);
DEBUGASSERT(alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB); DEBUGASSERT(alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB);
if ((alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB) && if ((alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB) &&
@@ -759,7 +759,7 @@ static int stm32_rdalarm(FAR struct rtc_lowerhalf_s *lower,
struct alm_rdalarm_s lowerinfo; struct alm_rdalarm_s lowerinfo;
int ret = -EINVAL; int ret = -EINVAL;
ASSERT(lower != NULL && alarminfo != NULL && alarminfo->time != NULL); DEBUGASSERT(lower != NULL && alarminfo != NULL && alarminfo->time != NULL);
DEBUGASSERT(alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB); DEBUGASSERT(alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB);
if (alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB) if (alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB)
@@ -847,7 +847,7 @@ static int stm32_setperiodic(FAR struct rtc_lowerhalf_s *lower,
FAR struct stm32_lowerhalf_s *priv; FAR struct stm32_lowerhalf_s *priv;
int ret; int ret;
ASSERT(lower != NULL && alarminfo != NULL); DEBUGASSERT(lower != NULL && alarminfo != NULL);
priv = (FAR struct stm32_lowerhalf_s *)lower; priv = (FAR struct stm32_lowerhalf_s *)lower;
ret = nxsem_wait(&priv->devsem); ret = nxsem_wait(&priv->devsem);
arch/arm/src/stm32/stm32f40xxx_rtcc.c
+3 -3
View File
@@ -878,7 +878,7 @@ static int stm32_rtc_getalarmdatetime(rtc_alarmreg_t reg, FAR struct tm *tp)
{ {
uint32_t data, tmp; uint32_t data, tmp;
ASSERT(tp != NULL); DEBUGASSERT(tp != NULL);
/* Sample the data time register. */ /* Sample the data time register. */
@@ -1435,7 +1435,7 @@ int stm32_rtc_setalarm(FAR struct alm_setalarm_s *alminfo)
rtc_alarmreg_t alarmreg; rtc_alarmreg_t alarmreg;
int ret = -EINVAL; int ret = -EINVAL;
ASSERT(alminfo != NULL); DEBUGASSERT(alminfo != NULL);
DEBUGASSERT(RTC_ALARM_LAST > alminfo->as_id); DEBUGASSERT(RTC_ALARM_LAST > alminfo->as_id);
/* Make sure the alarm interrupt is enabled at the NVIC */ /* Make sure the alarm interrupt is enabled at the NVIC */
@@ -1627,7 +1627,7 @@ int stm32_rtc_rdalarm(FAR struct alm_rdalarm_s *alminfo)
rtc_alarmreg_t alarmreg; rtc_alarmreg_t alarmreg;
int ret = -EINVAL; int ret = -EINVAL;
ASSERT(alminfo != NULL); DEBUGASSERT(alminfo != NULL);
DEBUGASSERT(RTC_ALARM_LAST > alminfo->ar_id); DEBUGASSERT(RTC_ALARM_LAST > alminfo->ar_id);
switch (alminfo->ar_id) switch (alminfo->ar_id)
arch/arm/src/stm32/stm32l15xxx_rtcc.c
+3 -3
View File
@@ -828,7 +828,7 @@ static int stm32_rtc_getalarmdatetime(rtc_alarmreg_t reg, FAR struct tm *tp)
{ {
uint32_t data, tmp; uint32_t data, tmp;
ASSERT(tp != NULL); DEBUGASSERT(tp != NULL);
/* Sample the data time register. */ /* Sample the data time register. */
@@ -1410,7 +1410,7 @@ int stm32_rtc_setalarm(FAR struct alm_setalarm_s *alminfo)
rtc_alarmreg_t alarmreg; rtc_alarmreg_t alarmreg;
int ret = -EINVAL; int ret = -EINVAL;
ASSERT(alminfo != NULL); DEBUGASSERT(alminfo != NULL);
DEBUGASSERT(RTC_ALARM_LAST > alminfo->as_id); DEBUGASSERT(RTC_ALARM_LAST > alminfo->as_id);
/* Make sure the alarm interrupt is enabled at the NVIC */ /* Make sure the alarm interrupt is enabled at the NVIC */
@@ -1602,7 +1602,7 @@ int stm32_rtc_rdalarm(FAR struct alm_rdalarm_s *alminfo)
rtc_alarmreg_t alarmreg; rtc_alarmreg_t alarmreg;
int ret = -EINVAL; int ret = -EINVAL;
ASSERT(alminfo != NULL); DEBUGASSERT(alminfo != NULL);
DEBUGASSERT(RTC_ALARM_LAST > alminfo->ar_id); DEBUGASSERT(RTC_ALARM_LAST > alminfo->ar_id);
switch (alminfo->ar_id) switch (alminfo->ar_id)
arch/arm/src/stm32f7/stm32_rtc.c
+3 -3
View File
@@ -871,7 +871,7 @@ static int stm32_rtc_getalarmdatetime(rtc_alarmreg_t reg, FAR struct tm *tp)
{ {
uint32_t data, tmp; uint32_t data, tmp;
ASSERT(tp != NULL); DEBUGASSERT(tp != NULL);
/* Sample the data time register. */ /* Sample the data time register. */
@@ -1485,7 +1485,7 @@ int stm32_rtc_setalarm(FAR struct alm_setalarm_s *alminfo)
rtc_alarmreg_t alarmreg; rtc_alarmreg_t alarmreg;
int ret = -EINVAL; int ret = -EINVAL;
ASSERT(alminfo != NULL); DEBUGASSERT(alminfo != NULL);
DEBUGASSERT(RTC_ALARM_LAST > alminfo->as_id); DEBUGASSERT(RTC_ALARM_LAST > alminfo->as_id);
/* REVISIT: Should test that the time is in the future */ /* REVISIT: Should test that the time is in the future */
@@ -1673,7 +1673,7 @@ int stm32_rtc_rdalarm(FAR struct alm_rdalarm_s *alminfo)
rtc_alarmreg_t alarmreg; rtc_alarmreg_t alarmreg;
int ret = -EINVAL; int ret = -EINVAL;
ASSERT(alminfo != NULL); DEBUGASSERT(alminfo != NULL);
DEBUGASSERT(RTC_ALARM_LAST > alminfo->ar_id); DEBUGASSERT(RTC_ALARM_LAST > alminfo->ar_id);
switch (alminfo->ar_id) switch (alminfo->ar_id)
arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c
+3 -3
View File
@@ -452,7 +452,7 @@ static int stm32_setrelative(FAR struct rtc_lowerhalf_s *lower,
time_t seconds; time_t seconds;
int ret = -EINVAL; int ret = -EINVAL;
ASSERT(lower != NULL && alarminfo != NULL); DEBUGASSERT(lower != NULL && alarminfo != NULL);
DEBUGASSERT(alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB); DEBUGASSERT(alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB);
if ((alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB) && if ((alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB) &&
@@ -578,7 +578,7 @@ static int stm32_rdalarm(FAR struct rtc_lowerhalf_s *lower,
struct alm_rdalarm_s lowerinfo; struct alm_rdalarm_s lowerinfo;
int ret = -EINVAL; int ret = -EINVAL;
ASSERT(lower != NULL && alarminfo != NULL && alarminfo->time != NULL); DEBUGASSERT(lower != NULL && alarminfo != NULL && alarminfo->time != NULL);
DEBUGASSERT(alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB); DEBUGASSERT(alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB);
if (alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB) if (alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB)
@@ -667,7 +667,7 @@ static int stm32_setperiodic(FAR struct rtc_lowerhalf_s *lower,
FAR struct stm32_lowerhalf_s *priv; FAR struct stm32_lowerhalf_s *priv;
int ret; int ret;
ASSERT(lower != NULL && alarminfo != NULL); DEBUGASSERT(lower != NULL && alarminfo != NULL);
priv = (FAR struct stm32_lowerhalf_s *)lower; priv = (FAR struct stm32_lowerhalf_s *)lower;
ret = nxsem_wait(&priv->devsem); ret = nxsem_wait(&priv->devsem);
arch/arm/src/stm32l4/stm32l4_rtc.c
+3 -3
View File
@@ -807,7 +807,7 @@ static int stm32l4_rtc_getalarmdatetime(rtc_alarmreg_t reg, FAR struct tm *tp)
{ {
uint32_t data, tmp; uint32_t data, tmp;
ASSERT(tp != NULL); DEBUGASSERT(tp != NULL);
/* Sample the data time register. */ /* Sample the data time register. */
@@ -1367,7 +1367,7 @@ int stm32l4_rtc_setalarm(FAR struct alm_setalarm_s *alminfo)
rtc_alarmreg_t alarmreg; rtc_alarmreg_t alarmreg;
int ret = -EINVAL; int ret = -EINVAL;
ASSERT(alminfo != NULL); DEBUGASSERT(alminfo != NULL);
DEBUGASSERT(RTC_ALARM_LAST > alminfo->as_id); DEBUGASSERT(RTC_ALARM_LAST > alminfo->as_id);
/* Make sure the alarm interrupt is enabled at the NVIC */ /* Make sure the alarm interrupt is enabled at the NVIC */
@@ -1559,7 +1559,7 @@ int stm32l4_rtc_rdalarm(FAR struct alm_rdalarm_s *alminfo)
rtc_alarmreg_t alarmreg; rtc_alarmreg_t alarmreg;
int ret = -EINVAL; int ret = -EINVAL;
ASSERT(alminfo != NULL); DEBUGASSERT(alminfo != NULL);
DEBUGASSERT(RTC_ALARM_LAST > alminfo->ar_id); DEBUGASSERT(RTC_ALARM_LAST > alminfo->ar_id);
switch (alminfo->ar_id) switch (alminfo->ar_id)
arch/arm/src/stm32l4/stm32l4_rtc_lowerhalf.c
+3 -3
View File
@@ -418,7 +418,7 @@ static int stm32l4_setrelative(FAR struct rtc_lowerhalf_s *lower,
time_t seconds; time_t seconds;
int ret = -EINVAL; int ret = -EINVAL;
ASSERT(lower != NULL && alarminfo != NULL); DEBUGASSERT(lower != NULL && alarminfo != NULL);
DEBUGASSERT(alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB); DEBUGASSERT(alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB);
if ((alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB) && if ((alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB) &&
@@ -544,7 +544,7 @@ static int stm32l4_rdalarm(FAR struct rtc_lowerhalf_s *lower,
struct alm_rdalarm_s lowerinfo; struct alm_rdalarm_s lowerinfo;
int ret = -EINVAL; int ret = -EINVAL;
ASSERT(lower != NULL && alarminfo != NULL && alarminfo->time != NULL); DEBUGASSERT(lower != NULL && alarminfo != NULL && alarminfo->time != NULL);
DEBUGASSERT(alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB); DEBUGASSERT(alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB);
if (alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB) if (alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB)
@@ -632,7 +632,7 @@ static int stm32l4_setperiodic(FAR struct rtc_lowerhalf_s *lower,
FAR struct stm32l4_lowerhalf_s *priv; FAR struct stm32l4_lowerhalf_s *priv;
int ret; int ret;
ASSERT(lower != NULL && alarminfo != NULL); DEBUGASSERT(lower != NULL && alarminfo != NULL);
priv = (FAR struct stm32l4_lowerhalf_s *)lower; priv = (FAR struct stm32l4_lowerhalf_s *)lower;
ret = nxsem_wait(&priv->devsem); ret = nxsem_wait(&priv->devsem);