F3 ST CUBE V1.9.0: fix build errors with legacy macros

Author: bcostm

targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/hal_tick.h

@@ -45,11 +45,11 @@
 
 #define TIM_MST      TIM2
 #define TIM_MST_IRQ  TIM2_IRQn
-#define TIM_MST_RCC  __TIM2_CLK_ENABLE()
+#define TIM_MST_RCC  __HAL_RCC_TIM2_CLK_ENABLE()
 #define TIM_MST_DBGMCU_FREEZE  __HAL_DBGMCU_FREEZE_TIM2()
 
-#define TIM_MST_RESET_ON   __TIM2_FORCE_RESET()
-#define TIM_MST_RESET_OFF  __TIM2_RELEASE_RESET()
+#define TIM_MST_RESET_ON   __HAL_RCC_TIM2_FORCE_RESET()
+#define TIM_MST_RESET_OFF  __HAL_RCC_TIM2_RELEASE_RESET()
 
 #define TIM_MST_16BIT  0 // 1=16-bit timer, 0=32-bit timer
 

targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/hal_tick.h

@@ -45,11 +45,11 @@
 
 #define TIM_MST      TIM2
 #define TIM_MST_IRQ  TIM2_IRQn
-#define TIM_MST_RCC  __TIM2_CLK_ENABLE()
+#define TIM_MST_RCC  __HAL_RCC_TIM2_CLK_ENABLE()
 #define TIM_MST_DBGMCU_FREEZE  __HAL_DBGMCU_FREEZE_TIM2()
 
-#define TIM_MST_RESET_ON   __TIM2_FORCE_RESET()
-#define TIM_MST_RESET_OFF  __TIM2_RELEASE_RESET()
+#define TIM_MST_RESET_ON   __HAL_RCC_TIM2_FORCE_RESET()
+#define TIM_MST_RESET_OFF  __HAL_RCC_TIM2_RELEASE_RESET()
 
 #define TIM_MST_16BIT  0 // 1=16-bit timer, 0=32-bit timer
 

targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/hal_tick.h

@@ -45,11 +45,11 @@
 
 #define TIM_MST      TIM2
 #define TIM_MST_IRQ  TIM2_IRQn
-#define TIM_MST_RCC  __TIM2_CLK_ENABLE()
+#define TIM_MST_RCC  __HAL_RCC_TIM2_CLK_ENABLE()
 #define TIM_MST_DBGMCU_FREEZE  __HAL_DBGMCU_FREEZE_TIM2()
 
-#define TIM_MST_RESET_ON   __TIM2_FORCE_RESET()
-#define TIM_MST_RESET_OFF  __TIM2_RELEASE_RESET()
+#define TIM_MST_RESET_ON   __HAL_RCC_TIM2_FORCE_RESET()
+#define TIM_MST_RESET_OFF  __HAL_RCC_TIM2_RELEASE_RESET()
 
 #define TIM_MST_16BIT  0 // 1=16-bit timer, 0=32-bit timer
 

targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/hal_tick.h

@@ -45,11 +45,11 @@
 
 #define TIM_MST      TIM2
 #define TIM_MST_IRQ  TIM2_IRQn
-#define TIM_MST_RCC  __TIM2_CLK_ENABLE()
+#define TIM_MST_RCC  __HAL_RCC_TIM2_CLK_ENABLE()
 #define TIM_MST_DBGMCU_FREEZE  __HAL_DBGMCU_FREEZE_TIM2()
 
-#define TIM_MST_RESET_ON   __TIM2_FORCE_RESET()
-#define TIM_MST_RESET_OFF  __TIM2_RELEASE_RESET()
+#define TIM_MST_RESET_ON   __HAL_RCC_TIM2_FORCE_RESET()
+#define TIM_MST_RESET_OFF  __HAL_RCC_TIM2_RELEASE_RESET()
 
 #define TIM_MST_16BIT  0 // 1=16-bit timer, 0=32-bit timer
 

targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F334x8/device/hal_tick.h

@@ -45,11 +45,11 @@
 
 #define TIM_MST      TIM2
 #define TIM_MST_IRQ  TIM2_IRQn
-#define TIM_MST_RCC  __TIM2_CLK_ENABLE()
+#define TIM_MST_RCC  __HAL_RCC_TIM2_CLK_ENABLE()
 #define TIM_MST_DBGMCU_FREEZE  __HAL_DBGMCU_FREEZE_TIM2()
 
-#define TIM_MST_RESET_ON   __TIM2_FORCE_RESET()
-#define TIM_MST_RESET_OFF  __TIM2_RELEASE_RESET()
+#define TIM_MST_RESET_ON   __HAL_RCC_TIM2_FORCE_RESET()
+#define TIM_MST_RESET_OFF  __HAL_RCC_TIM2_RELEASE_RESET()
 
 #define TIM_MST_16BIT  0 // 1=16-bit timer, 0=32-bit timer
 

targets/TARGET_STM/TARGET_STM32F3/analogin_device.c

@@ -73,7 +73,7 @@ void analogin_init(analogin_t *obj, PinName pin)
     obj->handle.Init.Resolution            = ADC_RESOLUTION_12B;
     obj->handle.Init.DataAlign             = ADC_DATAALIGN_RIGHT;
     obj->handle.Init.ScanConvMode          = DISABLE;
-    obj->handle.Init.EOCSelection          = EOC_SINGLE_CONV;
+    obj->handle.Init.EOCSelection          = ADC_EOC_SINGLE_CONV;
     obj->handle.Init.LowPowerAutoWait      = DISABLE;
     obj->handle.Init.ContinuousConvMode    = DISABLE;
     obj->handle.Init.NbrOfConversion       = 1;
@@ -82,7 +82,7 @@ void analogin_init(analogin_t *obj, PinName pin)
     obj->handle.Init.ExternalTrigConv      = ADC_EXTERNALTRIGCONV_T1_CC1;
     obj->handle.Init.ExternalTrigConvEdge  = ADC_EXTERNALTRIGCONVEDGE_NONE;
     obj->handle.Init.DMAContinuousRequests = DISABLE;
-    obj->handle.Init.Overrun               = OVR_DATA_OVERWRITTEN;
+    obj->handle.Init.Overrun               = ADC_OVR_DATA_OVERWRITTEN;
 
 #if defined(ADC1)
     if ((ADCName)obj->handle.Instance == ADC_1) {

targets/TARGET_STM/TARGET_STM32F3/analogout_device.c

@@ -73,11 +73,11 @@ void analogout_init(dac_t *obj, PinName pin) {
 
     // Enable DAC clock
     if (obj->dac == DAC_1) {
-        __DAC1_CLK_ENABLE();
+        __HAL_RCC_DAC1_CLK_ENABLE();
     }
 #if defined(DAC2)
     if (obj->dac == DAC_2) {
-        __DAC2_CLK_ENABLE();
+        __HAL_RCC_DAC2_CLK_ENABLE();
     }
 #endif
 
@@ -121,16 +121,16 @@ void analogout_free(dac_t *obj) {
     if (obj->pin == PA_5) pa5_used = 0;
 
     if ((pa4_used == 0) && (pa5_used == 0)) {
-        __DAC1_FORCE_RESET();
-        __DAC1_RELEASE_RESET();
-        __DAC1_CLK_DISABLE();
+        __HAL_RCC_DAC1_FORCE_RESET();
+        __HAL_RCC_DAC1_RELEASE_RESET();
+        __HAL_RCC_DAC1_CLK_DISABLE();
     }
 
 #if defined(DAC2)
     if (obj->pin == PA_6) {
-        __DAC2_FORCE_RESET();
-        __DAC2_RELEASE_RESET();
-        __DAC2_CLK_DISABLE();
+        __HAL_RCC_DAC2_FORCE_RESET();
+        __HAL_RCC_DAC2_RELEASE_RESET();
+        __HAL_RCC_DAC2_CLK_DISABLE();
     }
 #endif