Fixed bug #1259.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@16201 27425a3e-05d8-49a3-a47f-9c15f0e5edd8

os/hal/ports/STM32/STM32H7xx/hal_lld.c

@@ -162,6 +162,9 @@ void hal_lld_init(void) {
   __rccResetAHB3(~(RCC_AHB3RSTR_FMCRST |
 #if defined(STM32_QSPI_NO_RESET)
                  RCC_AHB3RSTR_QSPIRST |
+#endif
+#if defined(STM32_OSPI_NO_RESET)
+                 RCC_AHB3RSTR_OSPIRST |
 #endif
                  0x80000000U));     /* Was RCC_AHB3RSTR_CPURST in Rev-V.*/
   __rccResetAHB4(~(RCC_APB4RSTR_SYSCFGRST | STM32_GPIO_EN_MASK));

os/hal/ports/STM32/STM32H7xx/hal_lld.h

@@ -151,7 +151,8 @@
 
 #if defined(STM32H723xx) || defined(STM32H733xx) ||                         \
     defined(STM32H725xx) || defined(STM32H735xx) ||                         \
-    defined(STM32H735xx) || defined(__DOXYGEN__)
+    defined(STM32H735xx) || defined(STM32H730xx) ||                         \
+    defined(__DOXYGEN__)
 #include "hal_lld_type2.h"
 #elif defined(STM32H7A3xx)  || defined(STM32H7B3xx)  ||                     \
       defined(STM32H7A3xxQ) || defined(STM32H7B3xxQ) ||                     \

os/hal/ports/STM32/STM32H7xx/hal_lld_type2.h

@@ -1761,7 +1761,7 @@
  */
 #if STM32_PLL1_REF_CK < STM32_PLLIN_THRESHOLD1
 /* Check for medium range.*/
-#if STM32_PLL1_VCO_CK < STM32_PLLVCO_MEDIUM_MIN) || (STM32_PLL1_VCO_CK > STM32_PLLVCO_MEDIUM_MAX)
+#if (STM32_PLL1_VCO_CK < STM32_PLLVCO_MEDIUM_MIN) || (STM32_PLL1_VCO_CK > STM32_PLLVCO_MEDIUM_MAX)
 #error "STM32_PLL1_VCO_CK outside acceptable range (STM32_PLLVCO_MEDIUM_MIN..STM32_PLLVCO_MEDIUM_MAX)"
 #endif
 
@@ -1798,7 +1798,7 @@
  */
 #if STM32_PLL2_REF_CK < STM32_PLLIN_THRESHOLD1
 /* Check for medium range.*/
-#if STM32_PLL2_VCO_CK < STM32_PLLVCO_MEDIUM_MIN) || (STM32_PLL2_VCO_CK > STM32_PLLVCO_MEDIUM_MAX)
+#if (STM32_PLL2_VCO_CK < STM32_PLLVCO_MEDIUM_MIN) || (STM32_PLL2_VCO_CK > STM32_PLLVCO_MEDIUM_MAX)
 #error "STM32_PLL2_VCO_CK outside acceptable range (STM32_PLLVCO_MEDIUM_MIN..STM32_PLLVCO_MEDIUM_MAX)"
 #endif
 
@@ -1835,7 +1835,7 @@
  */
 #if STM32_PLL3_REF_CK < STM32_PLLIN_THRESHOLD1
 /* Check for medium range.*/
-#if STM32_PLL3_VCO_CK < STM32_PLLVCO_MEDIUM_MIN) || (STM32_PLL3_VCO_CK > STM32_PLLVCO_MEDIUM_MAX)
+#if (STM32_PLL3_VCO_CK < STM32_PLLVCO_MEDIUM_MIN) || (STM32_PLL3_VCO_CK > STM32_PLLVCO_MEDIUM_MAX)
 #error "STM32_PLL3_VCO_CK outside acceptable range (STM32_PLLVCO_MEDIUM_MIN..STM32_PLLVCO_MEDIUM_MAX)"
 #endif
 

readme.txt

@@ -112,6 +112,8 @@
        instead of a simple size.
 - NEW: RT and NIL upgraded to support the enhanced OSLIB.
 - NEW: Memory areas/pointers checker functions added to OSLIB.
+- FIX: Fixed syntax errors in STM32H7xx/hal_lld_type2.h (bug #1259)
+       (backported to 21.11.4).
 - FIX: Fixed unwanted reset of cache on STM32H7xx (bug #1258)
        (backported to 20.3.5)(backported to 21.11.4).
 - FIX: Fixed invalid HSIDIV in STM32Ggxx clocks initialization (bug #1257)