altos: Make STM clock configuration per-product. Fix 32MHz CPU speed

[fw/altos] / src / stm / ao_serial_stm.c

diff --git a/src/stm/ao_serial_stm.c b/src/stm/ao_serial_stm.c
index a8c102227f7613ae4eb4892bdbebd12229a31106..3cebc0944d1359ecc828d6b8e34ca72382cbb062 100644 (file)
--- a/src/stm/ao_serial_stm.c
+++ b/src/stm/ao_serial_stm.c
@@ -116,16 +116,16 @@ static const struct {
        uint32_t brr;
 } ao_usart_speeds[] = {
        [AO_SERIAL_SPEED_4800] = {
-               STM_APB1 / 4800
+               AO_PCLK1 / 4800
        },
        [AO_SERIAL_SPEED_9600] = {
-               STM_APB1 / 9600
+               AO_PCLK1 / 9600
        },
        [AO_SERIAL_SPEED_19200] = {
-               STM_APB1 / 19200
+               AO_PCLK1 / 19200
        },
        [AO_SERIAL_SPEED_57600] = {
-               STM_APB1 / 57600
+               AO_PCLK1 / 57600
        },
 };
 
@@ -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);