diff options
author | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-05-30 07:05:24 +0000 |
---|---|---|
committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-05-30 07:05:24 +0000 |
commit | a5a229f455c26772c8ee350033ce161d194c2119 (patch) | |
tree | 49cc381272762d37071fe20557f7ad74de0d4e8e | |
parent | 2194e1f29624395358ce72d611d8b87c6714f271 (diff) | |
download | ChibiOS-a5a229f455c26772c8ee350033ce161d194c2119.tar.gz ChibiOS-a5a229f455c26772c8ee350033ce161d194c2119.tar.bz2 ChibiOS-a5a229f455c26772c8ee350033ce161d194c2119.zip |
Fixed bug #845.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10232 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r-- | os/hal/ports/STM32/LLD/RTCv1/hal_rtc_lld.c | 2 | ||||
-rw-r--r-- | readme.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/os/hal/ports/STM32/LLD/RTCv1/hal_rtc_lld.c b/os/hal/ports/STM32/LLD/RTCv1/hal_rtc_lld.c index 9fe6417b2..df4b7e764 100644 --- a/os/hal/ports/STM32/LLD/RTCv1/hal_rtc_lld.c +++ b/os/hal/ports/STM32/LLD/RTCv1/hal_rtc_lld.c @@ -137,7 +137,7 @@ static void rtc_decode(uint32_t tv_sec, t = localtime_r((time_t *)&(tv_sec), &tim);
osalDbgAssert(t != NULL, "conversion failed");
#else
- struct tm *t = localtime(&tv_sec);
+ t = localtime(&tv_sec);
memcpy(&tim, t, sizeof(struct tm));
#endif
diff --git a/readme.txt b/readme.txt index b369ab8cc..c71db4f1a 100644 --- a/readme.txt +++ b/readme.txt @@ -161,6 +161,8 @@ - RT: Merged RT4.
- NIL: Merged NIL2.
- NIL: Added STM32F7 demo.
+- HAL: Duplicated variable definition in STM32 RTCv1 driver (bug #845)
+ (backported to 16.1.9).
- HAL: Fixed wrong ARR initialization in STM32 GPT driver (bug #843)(backported
to 16.1.9).
- HAL: Fixed wrong configuration in STM32L4xx GPT-ADC demo (bug #842)(backported
|