summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-04-02 19:27:53 -0700
committerKeith Packard <keithp@keithp.com>2012-04-02 19:29:21 -0700
commitc09d155328bd446bb84ac1068d380cceb884df22 (patch)
tree2104c6baaf15bb53d01febf1b27a59cb29e39eb6
parent440226df03a85cd0047d876b57b2a3410bfb2b02 (diff)
altos: Oops. Set per-USART STM baud rate register instead of usart1
Was accidentally always setting usart1 instead of the per-usart register. Didn't work too well for other usarts... Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--src/stm/ao_serial_stm.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/stm/ao_serial_stm.c b/src/stm/ao_serial_stm.c
index a8c10222..f8db6883 100644
--- a/src/stm/ao_serial_stm.c
+++ b/src/stm/ao_serial_stm.c
@@ -134,7 +134,7 @@ ao_usart_set_speed(struct ao_stm_usart *usart, uint8_t speed)
{
if (speed > AO_SERIAL_SPEED_57600)
return;
- stm_usart1.brr = ao_usart_speeds[speed].brr;
+ usart->reg->brr = ao_usart_speeds[speed].brr;
}
void
@@ -303,8 +303,8 @@ ao_serial_init(void)
#endif
/* Enable USART */
stm_rcc.apb2enr |= (1 << STM_RCC_APB2ENR_USART1EN);
- ao_stm_usart1.reg = &stm_usart1;
+ ao_stm_usart1.reg = &stm_usart1;
ao_usart_init(&ao_stm_usart1);
stm_nvic_set_enable(STM_ISR_USART1_POS);
@@ -382,7 +382,6 @@ ao_serial_init(void)
#endif
#endif
#endif
-
/* Enable USART */
stm_rcc.apb1enr |= (1 << STM_RCC_APB1ENR_USART3EN);