Skip to content

Commit e40bd07

Browse files
committed
fix conflicting definitions on discovery boards
1 parent bbc366b commit e40bd07

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

ports/stm32f4/peripherals/stm32f4/stm32f405xx/periph.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ extern const mcu_spi_nss_obj_t mcu_spi_nss_list[6];
4343

4444
//UART
4545
extern USART_TypeDef * mcu_uart_banks[MAX_UART];
46-
bool mcu_uart_has_usart[MAX_UART];
46+
extern bool mcu_uart_has_usart[MAX_UART];
4747

4848
extern const mcu_uart_tx_obj_t mcu_uart_tx_list[12];
4949
extern const mcu_uart_rx_obj_t mcu_uart_rx_list[12];

ports/stm32f4/peripherals/stm32f4/stm32f411xe/periph.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ extern const mcu_spi_nss_obj_t mcu_spi_nss_list[12];
4343

4444
//UART
4545
extern USART_TypeDef * mcu_uart_banks[MAX_UART];
46-
bool mcu_uart_has_usart[MAX_UART];
46+
extern bool mcu_uart_has_usart[MAX_UART];
4747

4848
extern const mcu_uart_tx_obj_t mcu_uart_tx_list[7];
4949
extern const mcu_uart_rx_obj_t mcu_uart_rx_list[7];

ports/stm32f4/peripherals/stm32f4/stm32f412zx/periph.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ const mcu_spi_nss_obj_t mcu_spi_nss_list[12] = {
122122

123123
//UART
124124

125-
USART_TypeDef * mcu_uart_banks[6] = {USART1, USART2, USART3, NULL, NULL, USART6};
126-
bool mcu_uart_has_usart[6] = {true, true, true, false, false, true};
125+
USART_TypeDef * mcu_uart_banks[MAX_UART] = {USART1, USART2, USART3, NULL, NULL, USART6};
126+
bool mcu_uart_has_usart[MAX_UART] = {true, true, true, false, false, true};
127127

128128
const mcu_uart_tx_obj_t mcu_uart_tx_list[11] = {
129129
UART(2, 7, &pin_PA02),

ports/stm32f4/peripherals/stm32f4/stm32f412zx/periph.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ extern const mcu_spi_nss_obj_t mcu_spi_nss_list[12];
4444

4545
//UART
4646
extern USART_TypeDef * mcu_uart_banks[MAX_UART];
47-
bool mcu_uart_has_usart[MAX_UART];
47+
extern bool mcu_uart_has_usart[MAX_UART];
4848

4949
extern const mcu_uart_tx_obj_t mcu_uart_tx_list[11];
5050
extern const mcu_uart_rx_obj_t mcu_uart_rx_list[12];

0 commit comments

Comments
 (0)