From 08f1a4fc2beaab04c5b115709eeed3ea13acb462 Mon Sep 17 00:00:00 2001
From: Laurent MEUNIER <laurent.meunier@st.com>
Date: Tue, 3 Jan 2017 11:52:48 +0100
Subject: [PATCH] STM32: Serial: Use up to date MACROs

Following STM32 HAL update, it is needed to use up-to-date MACROs.
Otherwise, build would fail.
---
 .../TARGET_STM/TARGET_STM32F0/serial_api.c    | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/targets/TARGET_STM/TARGET_STM32F0/serial_api.c b/targets/TARGET_STM/TARGET_STM32F0/serial_api.c
index d956c5489e..b7f50a0431 100644
--- a/targets/TARGET_STM/TARGET_STM32F0/serial_api.c
+++ b/targets/TARGET_STM/TARGET_STM32F0/serial_api.c
@@ -217,64 +217,64 @@ void serial_free(serial_t *obj)
       
     // Reset UART and disable clock
     if (obj_s->uart == UART_1) {
-        __USART1_FORCE_RESET();
-        __USART1_RELEASE_RESET();
-        __USART1_CLK_DISABLE();
+        __HAL_RCC_USART1_FORCE_RESET();
+        __HAL_RCC_USART1_RELEASE_RESET();
+        __HAL_RCC_USART1_CLK_DISABLE();
     }
 
 #if defined(USART2_BASE)
     if (obj_s->uart == UART_2) {
-        __USART2_FORCE_RESET();
-        __USART2_RELEASE_RESET();
-        __USART2_CLK_DISABLE();
+         __HAL_RCC_USART2_FORCE_RESET();
+         __HAL_RCC_USART2_RELEASE_RESET();
+         __HAL_RCC_USART2_CLK_DISABLE();
     }
 #endif
 
 #if defined USART3_BASE
     if (obj_s->uart == UART_3) {
-        __USART3_FORCE_RESET();
-        __USART3_RELEASE_RESET();
-        __USART3_CLK_DISABLE();
+        __HAL_RCC_USART3_FORCE_RESET();
+        __HAL_RCC_USART3_RELEASE_RESET();
+        __HAL_RCC_USART3_CLK_DISABLE();
     }
 #endif
 
 #if defined USART4_BASE
     if (obj_s->uart == UART_4) {
-        __USART4_FORCE_RESET();
-        __USART4_RELEASE_RESET();
-        __USART4_CLK_DISABLE();
+        __HAL_RCC_USART4_FORCE_RESET();
+        __HAL_RCC_USART4_RELEASE_RESET();
+        __HAL_RCC_USART4_CLK_DISABLE();
     }
 #endif
 
 #if defined USART5_BASE
     if (obj_s->uart == UART_5) {
-        __USART5_FORCE_RESET();
-        __USART5_RELEASE_RESET();
-        __USART5_CLK_DISABLE();
+        __HAL_RCC_USART5_FORCE_RESET();
+        __HAL_RCC_USART5_RELEASE_RESET();
+        __HAL_RCC_USART5_CLK_DISABLE();
     }
 #endif
 
 #if defined USART6_BASE
     if (obj_s->uart == UART_6) {
-        __USART6_FORCE_RESET();
-        __USART6_RELEASE_RESET();
-        __USART6_CLK_DISABLE();
+        __HAL_RCC_USART6_FORCE_RESET();
+        __HAL_RCC_USART6_RELEASE_RESET();
+        __HAL_RCC_USART6_CLK_DISABLE();
     }
 #endif
 
 #if defined USART7_BASE
     if (obj_s->uart == UART_7) {
-        __USART7_FORCE_RESET();
-        __USART7_RELEASE_RESET();
-        __USART7_CLK_DISABLE();
+        __HAL_RCC_USART7_FORCE_RESET();
+        __HAL_RCC_USART7_RELEASE_RESET();
+        __HAL_RCC_USART7_CLK_DISABLE();
     }
 #endif
 
 #if defined USART8_BASE
     if (obj_s->uart == UART_8) {
-        __USART8_FORCE_RESET();
-        __USART8_RELEASE_RESET();
-        __USART8_CLK_DISABLE();
+        __HAL_RCC_USART8_FORCE_RESET();
+        __HAL_RCC_USART8_RELEASE_RESET();
+        __HAL_RCC_USART8_CLK_DISABLE();
     }
 #endif