chore(clock): add HAL v2 support

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

Author: fpistm

libraries/SrcWrapper/src/stm32/PortNames.c

@@ -71,34 +71,58 @@ GPIO_TypeDef *set_GPIO_Port_Clock(uint32_t port_idx)
   switch (port_idx) {
     case PortA:
       gpioPort = (GPIO_TypeDef *)GPIOA_BASE;
+#if defined(__HAL_RCC_GPIOA_CLK_ENABLE)
       __HAL_RCC_GPIOA_CLK_ENABLE();
+#else
+      HAL_RCC_GPIOA_EnableClock();
+#endif
       break;
     case PortB:
       gpioPort = (GPIO_TypeDef *)GPIOB_BASE;
+#if defined(__HAL_RCC_GPIOB_CLK_ENABLE)
       __HAL_RCC_GPIOB_CLK_ENABLE();
+#else
+      HAL_RCC_GPIOB_EnableClock();
+#endif
       break;
 #if defined GPIOC_BASE
     case PortC:
       gpioPort = (GPIO_TypeDef *)GPIOC_BASE;
+#if defined(__HAL_RCC_GPIOC_CLK_ENABLE)
       __HAL_RCC_GPIOC_CLK_ENABLE();
+#else
+      HAL_RCC_GPIOC_EnableClock();
+#endif
       break;
 #endif
 #if defined GPIOD_BASE
     case PortD:
       gpioPort = (GPIO_TypeDef *)GPIOD_BASE;
+#if defined(__HAL_RCC_GPIOD_CLK_ENABLE)
       __HAL_RCC_GPIOD_CLK_ENABLE();
+#else
+      HAL_RCC_GPIOD_EnableClock();
+#endif
       break;
 #endif
 #if defined GPIOE_BASE
     case PortE:
       gpioPort = (GPIO_TypeDef *)GPIOE_BASE;
+#if defined(__HAL_RCC_GPIOE_CLK_ENABLE)
       __HAL_RCC_GPIOE_CLK_ENABLE();
+#else
+      HAL_RCC_GPIOE_EnableClock();
+#endif
       break;
 #endif
 #if defined GPIOF_BASE
     case PortF:
       gpioPort = (GPIO_TypeDef *)GPIOF_BASE;
+#if defined(__HAL_RCC_GPIOF_CLK_ENABLE)
       __HAL_RCC_GPIOF_CLK_ENABLE();
+#else
+      HAL_RCC_GPIOF_EnableClock();
+#endif
       break;
 #endif
 #if defined GPIOG_BASE
@@ -108,37 +132,61 @@ GPIO_TypeDef *set_GPIO_Port_Clock(uint32_t port_idx)
       HAL_PWREx_EnableVddIO2();
 #endif
       gpioPort = (GPIO_TypeDef *)GPIOG_BASE;
+#if defined(__HAL_RCC_GPIOG_CLK_ENABLE)
       __HAL_RCC_GPIOG_CLK_ENABLE();
+#else
+      HAL_RCC_GPIOG_EnableClock();
+#endif
       break;
 #endif
 #if defined GPIOH_BASE
     case PortH:
       gpioPort = (GPIO_TypeDef *)GPIOH_BASE;
+#if defined(__HAL_RCC_GPIOH_CLK_ENABLE)
       __HAL_RCC_GPIOH_CLK_ENABLE();
+#else
+      HAL_RCC_GPIOH_EnableClock();
+#endif
       break;
 #endif
 #if defined GPIOI_BASE
     case PortI:
       gpioPort = (GPIO_TypeDef *)GPIOI_BASE;
+#if defined(__HAL_RCC_GPIOI_CLK_ENABLE)
       __HAL_RCC_GPIOI_CLK_ENABLE();
+#else
+      HAL_RCC_GPIOI_EnableClock();
+#endif
       break;
 #endif
 #if defined GPIOJ_BASE
     case PortJ:
       gpioPort = (GPIO_TypeDef *)GPIOJ_BASE;
+#if defined(__HAL_RCC_GPIOJ_CLK_ENABLE)
       __HAL_RCC_GPIOJ_CLK_ENABLE();
+#else
+      HAL_RCC_GPIOJ_EnableClock();
+#endif
       break;
 #endif
 #if defined GPIOK_BASE
     case PortK:
       gpioPort = (GPIO_TypeDef *)GPIOK_BASE;
+#if defined(__HAL_RCC_GPIOK_CLK_ENABLE)
       __HAL_RCC_GPIOK_CLK_ENABLE();
+#else
+      HAL_RCC_GPIOK_EnableClock();
+#endif
       break;
 #endif
 #if defined GPIOZ_BASE
     case PortZ:
       gpioPort = (GPIO_TypeDef *)GPIOZ_BASE;
+#if defined(__HAL_RCC_GPIOZ_CLK_ENABLE)
       __HAL_RCC_GPIOZ_CLK_ENABLE();
+#else
+      HAL_RCC_GPIOZ_EnableClock();
+#endif
       break;
 #endif
     default:

libraries/SrcWrapper/src/stm32/clock.c

@@ -65,7 +65,11 @@ void osSystickHandler() __attribute__((weak, alias("noOsSystickHandler")));
 void SysTick_Handler(void)
 {
   HAL_IncTick();
+#if defined(USE_HALV2_DRIVER)
+  HAL_CORTEX_SYSTICK_IRQHandler();
+#else
   HAL_SYSTICK_IRQHandler();
+#endif
   osSystickHandler();
 }
 
@@ -76,6 +80,32 @@ void SysTick_Handler(void)
   */
 void enableClock(sourceClock_t source)
 {
+#if defined(USE_HALV2_DRIVER)
+  hal_status_t status;
+  enableBackupDomain();
+  switch (source) {
+    case LSI_CLOCK:
+      status = HAL_RCC_LSI_Enable();
+      break;
+    case HSI_CLOCK:
+      /* Compute divider should be done ? */
+      status = HAL_RCC_HSIK_Enable(HAL_RCC_HSIK_DIV1);
+      break;
+    case LSE_CLOCK:
+      status = HAL_RCC_LSE_Enable(HAL_RCC_LSE_ON, HAL_RCC_LSE_DRIVE_LOW);
+      break;
+    case HSE_CLOCK:
+      status = HAL_RCC_HSE_Enable(HAL_RCC_HSE_ON);
+      break;
+    default:
+      /* No valid clock to enable */
+      status = HAL_ERROR;
+      break;
+  }
+  if (status != HAL_OK) {
+    Error_Handler();
+  }
+#else
   RCC_OscInitTypeDef RCC_OscInitStruct = {0};
 #if defined(RCC_PLL_NONE)
 #if defined(STM32WBAxx)
@@ -177,6 +207,7 @@ void enableClock(sourceClock_t source)
     }
     hsem_unlock(CFG_HW_RCC_SEMID);
   }
+#endif /* USE_HALV2_DRIVER */
 }
 
 void configHSECapacitorTuning(void)