• R/O
  • SSH
  • HTTPS

chibios: Commit


Commit MetaInfo

Revision13854 (tree)
Time2020-09-12 17:08:20
Authorgdisirio

Log Message

Fixed bug #1122.

Change Summary

Incremental Difference

--- trunk/os/hal/ports/STM32/LLD/xWDGv1/hal_wdg_lld.c (revision 13853)
+++ trunk/os/hal/ports/STM32/LLD/xWDGv1/hal_wdg_lld.c (revision 13854)
@@ -85,7 +85,6 @@
8585 */
8686 void wdg_lld_start(WDGDriver *wdgp) {
8787
88-#if STM32_IWDG_IS_WINDOWED
8988 /* Enable IWDG and unlock for write.*/
9089 wdgp->wdg->KR = KR_KEY_ENABLE;
9190 wdgp->wdg->KR = KR_KEY_WRITE;
@@ -93,24 +92,16 @@
9392 /* Write configuration.*/
9493 wdgp->wdg->PR = wdgp->config->pr;
9594 wdgp->wdg->RLR = wdgp->config->rlr;
95+
96+ /* Wait the registers to be updated.*/
9697 while (wdgp->wdg->SR != 0)
9798 ;
9899
100+#if STM32_IWDG_IS_WINDOWED
99101 /* This also triggers a refresh.*/
100102 wdgp->wdg->WINR = wdgp->config->winr;
101103 #else
102- /* Unlock IWDG.*/
103- wdgp->wdg->KR = KR_KEY_WRITE;
104-
105- /* Write configuration.*/
106- while (wdgp->wdg->SR != 0)
107- ;
108- wdgp->wdg->PR = wdgp->config->pr;
109- wdgp->wdg->RLR = wdgp->config->rlr;
110-
111- /* Start operations.*/
112104 wdgp->wdg->KR = KR_KEY_RELOAD;
113- wdgp->wdg->KR = KR_KEY_ENABLE;
114105 #endif
115106 }
116107
--- trunk/readme.txt (revision 13853)
+++ trunk/readme.txt (revision 13854)
@@ -117,9 +117,11 @@
117117 MEMS Accelerometers.
118118 - NEW: Safer messages mechanism for sandboxes (to be backported to 20.3.1).
119119 - NEW: Added latency measurement test application.
120-- FIX: Ignored HSIDIV setting on STM32G0xx (bug #1121)
120+- FIX: Fixed incorrect STM32 iWDG initialization in windowed mode (bug #1122)
121+ (backported to 20.3.3)(backported to 19.1.5).
122+- FIX: Fixed ignored HSIDIV setting on STM32G0xx (bug #1121)
121123 (backported to 20.3.3).
122-- FIX: Fix incorrect variable name in recursive mutex handling (bug #1119).
124+- FIX: Fixed incorrect variable name in recursive mutex handling (bug #1119).
123125 - FIX: Fixed several problems in STM32 ADCv4 (bug #1116)
124126 (backported to 20.3.2).
125127 - FIX: Fixed STM32 QSPI errata workaround (bug #1117)
Show on old repository browser