sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

STM32 RTC: Fix compile errors for STM32 F1

Browse Source
This commit is contained in:
Gregory Nutt 2016-04-03 13:26:29 -06:00
parent a573617f33
commit 65dc922a2e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/src/stm32/stm32_rtc_lowerhalf.c
View File

@ -282,7 +282,7 @@ errout_with_errno:
return -ret; return -ret;
#else #else
FAR struct time_t timer; time_t timer;
/* The resolution of time is only 1 second */ /* The resolution of time is only 1 second */
@ -290,7 +290,7 @@ errout_with_errno:
/* Convert the one second epoch time to a struct tm */ /* Convert the one second epoch time to a struct tm */
if (!gmtime_r(&timer, rtctime) if (!gmtime_r(&timer, (FAR struct tm *)rtctime))
{ {
int errcode = get_errno(); int errcode = get_errno();
DEBUGASSERT(errcode > 0); DEBUGASSERT(errcode > 0);
@ -405,10 +405,12 @@ static int stm32_setalarm(FAR struct rtc_lowerhalf_s *lower,
return ret; return ret;
#else #else
FAR struct stm32_lowerhalf_s *priv;
FAR struct stm32_cbinfo_s *cbinfo; FAR struct stm32_cbinfo_s *cbinfo;
int ret = -EINVAL; int ret = -EINVAL;
DEBUGASSERT(lower != NULL && alarminfo != NULL && alarminfo->id == 0); DEBUGASSERT(lower != NULL && alarminfo != NULL && alarminfo->id == 0);
priv = (FAR struct stm32_lowerhalf_s *)lower;
if (alarminfo->id == 0) if (alarminfo->id == 0)
{ {
@ -618,19 +620,20 @@ static int stm32_cancelalarm(FAR struct rtc_lowerhalf_s *lower, int alarmid)
return -ENOSYS; return -ENOSYS;
#else #else
FAR struct stm32_lowerhalf_s *priv;
FAR struct stm32_cbinfo_s *cbinfo; FAR struct stm32_cbinfo_s *cbinfo;
DEBUGASSERT(lower != NULL); DEBUGASSERT(lower != NULL);
DEBUGASSERT(alarmid == 0); DEBUGASSERT(alarmid == 0);
priv = (FAR struct stm32_lowerhalf_s *)lower;
/* Nullify callback information to reduce window for race conditions */ /* Nullify callback information to reduce window for race conditions */
cbinfo = &priv->cbinfo[0]; cbinfo = &priv->cbinfo[0];
cbinfo->cb = alarminfo->cb; cbinfo->cb = NULL;
cbinfo->priv = alarminfo->priv; cbinfo->priv = NULL;
return stm32_rtc_cancelalarm(); return stm32_rtc_cancelalarm();
#endif #endif
} }
#endif #endif