Fix last compiler warning

Fix stm32duino#44

Signed-off-by: Frederic.Pillon <[email protected]>

Author: fpistm

cores/arduino/stm32/analog.c

@@ -93,7 +93,9 @@
 #error "ADC_CLOCK_DIV could not be defined"
 #endif
 
+#ifndef ADC_REGULAR_RANK_1
 #define ADC_REGULAR_RANK_1  1
+#endif
 /**
   * @}
   */

cores/arduino/stm32/hal_uart_emul.h

@@ -369,15 +369,15 @@ typedef struct
   * @param  None
   * @retval None
   */
-#define __UART_EMUL_CLK_ENABLE()                           __TIM1_CLK_ENABLE();\
+#define __UART_EMUL_CLK_ENABLE()                           __HAL_RCC_TIM1_CLK_ENABLE();\
                                                            __HAL_RCC_DMA2_CLK_ENABLE();
 
 /** @brief  Disable the clock for UART Emulation.
   *            clock in the peripherique used in this emulation Timer and DMA
   * @param  None
   * @retval None
   */
-#define __UART_EMUL_CLK_DISABLE()                 __TIM1_CLK_DISABLE();\
+#define __UART_EMUL_CLK_DISABLE()                 __HAL_RCC_TIM1_CLK_DISABLE();\
                                                   __HAL_RCC_DMA2_CLK_DISABLE();
 
 

cores/arduino/stm32/spi_com.c

@@ -111,6 +111,7 @@ uint32_t spi_getClkFreqInst(SPI_TypeDef * spi_inst)
   uint32_t spi_freq = SystemCoreClock;
 
 #ifdef STM32F0xx
+  UNUSED(spi_inst);
   /* SPIx source CLK is PCKL1 */
   spi_freq = HAL_RCC_GetPCLK1Freq();
 #else

cores/arduino/stm32/stm32_def.h

@@ -36,6 +36,10 @@
 #include "stm32f4xx.h"
 #elif defined(STM32F7xx)
 #include "stm32f7xx.h"
+// On other HAL series, stm32[fl]yxx.h include
+// stm32[fl]yxx_hal.h which include stm32[fl]yxx_hal_conf.h
+// For F7, stm32f7xx_hal.h replaced by stm32f7xx_hal_conf.h
+#include "stm32f7xx_hal.h"
 #elif defined(STM32L0xx)
 #include "stm32l0xx.h"
 #elif defined(STM32L1xx)

cores/arduino/stm32/uart.c

@@ -254,55 +254,55 @@ void uart_deinit(serial_t *obj)
   // Reset UART and disable clock
   switch (obj->index) {
     case 0:
-        __USART1_FORCE_RESET();
-        __USART1_RELEASE_RESET();
-        __USART1_CLK_DISABLE();
+        __HAL_RCC_USART1_FORCE_RESET();
+        __HAL_RCC_USART1_RELEASE_RESET();
+        __HAL_RCC_USART1_CLK_DISABLE();
         break;
     case 1:
-        __USART2_FORCE_RESET();
-        __USART2_RELEASE_RESET();
-        __USART2_CLK_DISABLE();
+        __HAL_RCC_USART2_FORCE_RESET();
+        __HAL_RCC_USART2_RELEASE_RESET();
+        __HAL_RCC_USART2_CLK_DISABLE();
         break;
 #if defined(USART3_BASE)
     case 2:
-        __USART3_FORCE_RESET();
-        __USART3_RELEASE_RESET();
-        __USART3_CLK_DISABLE();
+        __HAL_RCC_USART3_FORCE_RESET();
+        __HAL_RCC_USART3_RELEASE_RESET();
+        __HAL_RCC_USART3_CLK_DISABLE();
         break;
 #endif
 #if defined(UART4_BASE)
     case 3:
-        __UART4_FORCE_RESET();
-        __UART4_RELEASE_RESET();
-        __UART4_CLK_DISABLE();
+        __HAL_RCC_UART4_FORCE_RESET();
+        __HAL_RCC_UART4_RELEASE_RESET();
+        __HAL_RCC_UART4_CLK_DISABLE();
         break;
 #endif
 #if defined(UART5_BASE)
     case 4:
-        __UART5_FORCE_RESET();
-        __UART5_RELEASE_RESET();
-        __UART5_CLK_DISABLE();
+        __HAL_RCC_UART5_FORCE_RESET();
+        __HAL_RCC_UART5_RELEASE_RESET();
+        __HAL_RCC_UART5_CLK_DISABLE();
         break;
 #endif
 #if defined(USART6_BASE)
     case 5:
-        __USART6_FORCE_RESET();
-        __USART6_RELEASE_RESET();
-        __USART6_CLK_DISABLE();
+        __HAL_RCC_USART6_FORCE_RESET();
+        __HAL_RCC_USART6_RELEASE_RESET();
+        __HAL_RCC_USART6_CLK_DISABLE();
         break;
 #endif
 #if defined(UART7_BASE)
     case 6:
-        __UART7_FORCE_RESET();
-        __UART7_RELEASE_RESET();
-        __UART7_CLK_DISABLE();
+        __HAL_RCC_UART7_FORCE_RESET();
+        __HAL_RCC_UART7_RELEASE_RESET();
+        __HAL_RCC_UART7_CLK_DISABLE();
         break;
 #endif
 #if defined(UART8_BASE)
     case 7:
-        __UART8_FORCE_RESET();
-        __UART8_RELEASE_RESET();
-        __UART8_CLK_DISABLE();
+        __HAL_RCC_UART8_FORCE_RESET();
+        __HAL_RCC_UART8_RELEASE_RESET();
+        __HAL_RCC_UART8_CLK_DISABLE();
         break;
 #endif
   }