diff options
| -rw-r--r-- | board/zinger/board.h | 1 | ||||
| -rw-r--r-- | board/zinger/debug.c | 8 | ||||
| -rw-r--r-- | board/zinger/hardware.c | 8 |
3 files changed, 9 insertions, 8 deletions
diff --git a/board/zinger/board.h b/board/zinger/board.h index c0cc19f2d2..7d8a1b25d5 100644 --- a/board/zinger/board.h +++ b/board/zinger/board.h @@ -43,6 +43,7 @@ /* debug printf flash footprinf is about 1400 bytes */ #define CONFIG_DEBUG_PRINTF #define UARTN CONFIG_UART_CONSOLE +#define UARTN_BASE STM32_USART_BASE(CONFIG_UART_CONSOLE) #ifndef __ASSEMBLER__ diff --git a/board/zinger/debug.c b/board/zinger/debug.c index 74d58c105b..48c2259083 100644 --- a/board/zinger/debug.c +++ b/board/zinger/debug.c @@ -12,15 +12,15 @@ static int debug_txchar(void *context, int c) { if (c == '\n') { - while (!(STM32_USART_SR(UARTN) & STM32_USART_SR_TXE)) + while (!(STM32_USART_SR(UARTN_BASE) & STM32_USART_SR_TXE)) ; - STM32_USART_TDR(UARTN) = '\r'; + STM32_USART_TDR(UARTN_BASE) = '\r'; } /* Wait for space to transmit */ - while (!(STM32_USART_SR(UARTN) & STM32_USART_SR_TXE)) + while (!(STM32_USART_SR(UARTN_BASE) & STM32_USART_SR_TXE)) ; - STM32_USART_TDR(UARTN) = c; + STM32_USART_TDR(UARTN_BASE) = c; return 0; } diff --git a/board/zinger/hardware.c b/board/zinger/hardware.c index bf25155f55..cf0921c990 100644 --- a/board/zinger/hardware.c +++ b/board/zinger/hardware.c @@ -126,15 +126,15 @@ static void adc_init(void) static void uart_init(void) { /* set baudrate */ - STM32_USART_BRR(UARTN) = + STM32_USART_BRR(UARTN_BASE) = DIV_ROUND_NEAREST(CPU_CLOCK, CONFIG_UART_BAUD_RATE); /* UART enabled, 8 Data bits, oversampling x16, no parity */ - STM32_USART_CR1(UARTN) = + STM32_USART_CR1(UARTN_BASE) = STM32_USART_CR1_UE | STM32_USART_CR1_TE | STM32_USART_CR1_RE; /* 1 stop bit, no fancy stuff */ - STM32_USART_CR2(UARTN) = 0x0000; + STM32_USART_CR2(UARTN_BASE) = 0x0000; /* DMA disabled, special modes disabled, error interrupt disabled */ - STM32_USART_CR3(UARTN) = 0x0000; + STM32_USART_CR3(UARTN_BASE) = 0x0000; } static void timers_init(void) |