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

arch/arm/src/stm32: Make STM32 usable with an external RTC. drivers/timers/ds3231.c: Correct some debug statments.

Browse Source
This commit is contained in:
Alexander Oryshchenko 2018-01-24 06:55:14 -06:00 committed by Gregory Nutt
parent a7834bcb7b
commit dd4fc9f5c3
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/stm32/stm32_irq.c
View File

@ -387,7 +387,7 @@ void up_irqinitialize(void)
up_enable_irq(STM32_IRQ_MEMFAULT);
#endif
#ifdef CONFIG_RTC
#if defined(CONFIG_RTC) && !defined(CONFIG_RTC_EXTERNAL)
/* RTC was initialized earlier but IRQs weren't ready at that time */
stm32_rtc_irqinitialize();

5
arch/arm/src/stm32/stm32f40xxx_rtcc.c
View File

@ -58,7 +58,7 @@
#include <arch/board/board.h>
#ifdef CONFIG_RTC
#if defined(CONFIG_RTC) && !defined(CONFIG_RTC_EXTERNAL)
/****************************************************************************
* Pre-processor Definitions
@ -1659,4 +1659,5 @@ int stm32_rtc_rdalarm(FAR struct alm_rdalarm_s *alminfo)
}
#endif
#endif /* CONFIG_RTC */
#endif /* CONFIG_RTC && !CONFIG_RTC_EXTERNAL */

12
drivers/timers/ds3231.c
View File

@ -321,7 +321,7 @@ int up_rtc_getdatetime(FAR struct tm *tp)
ret = I2C_TRANSFER(g_ds3231.i2c, msg, 4);
if (ret < 0)
{
rtcerr("ERROR: I2C_TRANSFER failed: %d\n", ret)
rtcerr("ERROR: I2C_TRANSFER failed: %d\n", ret);
return ret;
}
}
@ -415,7 +415,7 @@ int up_rtc_settime(FAR const struct timespec *tp)
return -EAGAIN;
}
rtc_dumptime(tp, "Setting time");
rtcinfo("Setting time tp=(%d,%d)\n", (int)tp->tv_sec, (int)tp->tv_nsec);
/* Get the broken out time */
@ -430,18 +430,18 @@ int up_rtc_settime(FAR const struct timespec *tp)
#ifdef CONFIG_LIBC_LOCALTIME
if (localtime_r(&newtime, &newtm) == NULL)
{
rtcerr("ERROR: localtime_r failed\n")
rtcerr("ERROR: localtime_r failed\n");
return -EINVAL;
}
#else
if (gmtime_r(&newtime, &newtm) == NULL)
{
rtcerr("ERROR: gmtime_r failed\n")
rtcerr("ERROR: gmtime_r failed\n");
return -EINVAL;
}
#endif
rtc_dumptime(&tm, "New time");
rtc_dumptime(&newtm, "New time");
/* Construct the message */
/* Write starting with the seconds regiser */
@ -536,7 +536,7 @@ int up_rtc_settime(FAR const struct timespec *tp)
ret = I2C_TRANSFER(g_ds3231.i2c, msg, 3);
if (ret < 0)
{
rtcerr("ERROR: I2C_TRANSFER failed: %d\n", ret)
rtcerr("ERROR: I2C_TRANSFER failed: %d\n", ret);
return ret;
}
}