STM32: Serial: Use up to date MACROs

Following STM32 HAL update, it is needed to use up-to-date MACROs.
Otherwise, build would fail.
pull/3567/head
Laurent MEUNIER 2017-01-03 11:52:48 +01:00
parent 0ca04ffb3e
commit cdcaf2a473
1 changed files with 24 additions and 24 deletions

View File

@ -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