Skip to content

Commit cdcaf2a

Browse files
committed
STM32: Serial: Use up to date MACROs
Following STM32 HAL update, it is needed to use up-to-date MACROs. Otherwise, build would fail.
1 parent 0ca04ff commit cdcaf2a

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

targets/TARGET_STM/TARGET_STM32F0/serial_api.c

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -217,64 +217,64 @@ void serial_free(serial_t *obj)
217217

218218
// Reset UART and disable clock
219219
if (obj_s->uart == UART_1) {
220-
__USART1_FORCE_RESET();
221-
__USART1_RELEASE_RESET();
222-
__USART1_CLK_DISABLE();
220+
__HAL_RCC_USART1_FORCE_RESET();
221+
__HAL_RCC_USART1_RELEASE_RESET();
222+
__HAL_RCC_USART1_CLK_DISABLE();
223223
}
224224

225225
#if defined(USART2_BASE)
226226
if (obj_s->uart == UART_2) {
227-
__USART2_FORCE_RESET();
228-
__USART2_RELEASE_RESET();
229-
__USART2_CLK_DISABLE();
227+
__HAL_RCC_USART2_FORCE_RESET();
228+
__HAL_RCC_USART2_RELEASE_RESET();
229+
__HAL_RCC_USART2_CLK_DISABLE();
230230
}
231231
#endif
232232

233233
#if defined USART3_BASE
234234
if (obj_s->uart == UART_3) {
235-
__USART3_FORCE_RESET();
236-
__USART3_RELEASE_RESET();
237-
__USART3_CLK_DISABLE();
235+
__HAL_RCC_USART3_FORCE_RESET();
236+
__HAL_RCC_USART3_RELEASE_RESET();
237+
__HAL_RCC_USART3_CLK_DISABLE();
238238
}
239239
#endif
240240

241241
#if defined USART4_BASE
242242
if (obj_s->uart == UART_4) {
243-
__USART4_FORCE_RESET();
244-
__USART4_RELEASE_RESET();
245-
__USART4_CLK_DISABLE();
243+
__HAL_RCC_USART4_FORCE_RESET();
244+
__HAL_RCC_USART4_RELEASE_RESET();
245+
__HAL_RCC_USART4_CLK_DISABLE();
246246
}
247247
#endif
248248

249249
#if defined USART5_BASE
250250
if (obj_s->uart == UART_5) {
251-
__USART5_FORCE_RESET();
252-
__USART5_RELEASE_RESET();
253-
__USART5_CLK_DISABLE();
251+
__HAL_RCC_USART5_FORCE_RESET();
252+
__HAL_RCC_USART5_RELEASE_RESET();
253+
__HAL_RCC_USART5_CLK_DISABLE();
254254
}
255255
#endif
256256

257257
#if defined USART6_BASE
258258
if (obj_s->uart == UART_6) {
259-
__USART6_FORCE_RESET();
260-
__USART6_RELEASE_RESET();
261-
__USART6_CLK_DISABLE();
259+
__HAL_RCC_USART6_FORCE_RESET();
260+
__HAL_RCC_USART6_RELEASE_RESET();
261+
__HAL_RCC_USART6_CLK_DISABLE();
262262
}
263263
#endif
264264

265265
#if defined USART7_BASE
266266
if (obj_s->uart == UART_7) {
267-
__USART7_FORCE_RESET();
268-
__USART7_RELEASE_RESET();
269-
__USART7_CLK_DISABLE();
267+
__HAL_RCC_USART7_FORCE_RESET();
268+
__HAL_RCC_USART7_RELEASE_RESET();
269+
__HAL_RCC_USART7_CLK_DISABLE();
270270
}
271271
#endif
272272

273273
#if defined USART8_BASE
274274
if (obj_s->uart == UART_8) {
275-
__USART8_FORCE_RESET();
276-
__USART8_RELEASE_RESET();
277-
__USART8_CLK_DISABLE();
275+
__HAL_RCC_USART8_FORCE_RESET();
276+
__HAL_RCC_USART8_RELEASE_RESET();
277+
__HAL_RCC_USART8_CLK_DISABLE();
278278
}
279279
#endif
280280

0 commit comments

Comments
 (0)