altos/stm32f4: Need to read-back register after clock enable

This was reported as necessary; I have no idea, but it's not
expensive, so why not...

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/stm32f4/ao_arch_funcs.h b/src/stm32f4/ao_arch_funcs.h
index 8ff31b4a917620865d3c368b1756cb934edaf1b5..6fa654973842877a59325e94cd3a991e6d1750d0 100644 (file)
--- a/src/stm32f4/ao_arch_funcs.h
+++ b/src/stm32f4/ao_arch_funcs.h
@@ -61,7 +61,7 @@ ao_arch_irqrestore(uint32_t basepri) {
 }
 
 static inline void
-ao_arch_memory_barrier() {
+ao_arch_memory_barrier(void) {
        asm volatile("" ::: "memory");
 }
 
@@ -251,28 +251,28 @@ ao_arch_wait_interrupt(void) {
 static inline void ao_enable_port(struct stm_gpio *port)
 {
        if ((port) == &stm_gpioa) {
-               stm_rcc.ahb1enr |= (1 << STM_RCC_AHB1ENR_IOPAEN);
+               stm_rcc_ahb1_clk_enable(1 << STM_RCC_AHB1ENR_IOPAEN);
                ao_power_register(&ao_power_gpioa);
        } else if ((port) == &stm_gpiob) {
-               stm_rcc.ahb1enr |= (1 << STM_RCC_AHB1ENR_IOPBEN);
+               stm_rcc_ahb1_clk_enable(1 << STM_RCC_AHB1ENR_IOPBEN);
                ao_power_register(&ao_power_gpiob);
        } else if ((port) == &stm_gpioc) {
-               stm_rcc.ahb1enr |= (1 << STM_RCC_AHB1ENR_IOPCEN);
+               stm_rcc_ahb1_clk_enable(1 << STM_RCC_AHB1ENR_IOPCEN);
                ao_power_register(&ao_power_gpioc);
        } else if ((port) == &stm_gpiod) {
-               stm_rcc.ahb1enr |= (1 << STM_RCC_AHB1ENR_IOPDEN);
+               stm_rcc_ahb1_clk_enable(1 << STM_RCC_AHB1ENR_IOPDEN);
                ao_power_register(&ao_power_gpiod);
        } else if ((port) == &stm_gpioe) {
-               stm_rcc.ahb1enr |= (1 << STM_RCC_AHB1ENR_IOPEEN);
+               stm_rcc_ahb1_clk_enable(1 << STM_RCC_AHB1ENR_IOPEEN);
                ao_power_register(&ao_power_gpioe);
        } else if ((port) == &stm_gpiof) {
-               stm_rcc.ahb1enr |= (1 << STM_RCC_AHB1ENR_IOPFEN);
+               stm_rcc_ahb1_clk_enable(1 << STM_RCC_AHB1ENR_IOPFEN);
                ao_power_register(&ao_power_gpiof);
        } else if ((port) == &stm_gpiog) {
-               stm_rcc.ahb1enr |= (1 << STM_RCC_AHB1ENR_IOPGEN);
+               stm_rcc_ahb1_clk_enable(1 << STM_RCC_AHB1ENR_IOPGEN);
                ao_power_register(&ao_power_gpiog);
        } else if ((port) == &stm_gpioh) {
-               stm_rcc.ahb1enr |= (1 << STM_RCC_AHB1ENR_IOPHEN);
+               stm_rcc_ahb1_clk_enable(1 << STM_RCC_AHB1ENR_IOPHEN);
                ao_power_register(&ao_power_gpioh);
        }
 }
@@ -280,28 +280,28 @@ static inline void ao_enable_port(struct stm_gpio *port)
 static inline void ao_disable_port(struct stm_gpio *port)
 {
        if ((port) == &stm_gpioa) {
-               stm_rcc.ahb1enr &= ~(1 << STM_RCC_AHB1ENR_IOPAEN);
+               stm_rcc_ahb1_clk_disable(1 << STM_RCC_AHB1ENR_IOPAEN);
                ao_power_unregister(&ao_power_gpioa);
        } else if ((port) == &stm_gpiob) {
-               stm_rcc.ahb1enr &= ~(1 << STM_RCC_AHB1ENR_IOPBEN);
+               stm_rcc_ahb1_clk_disable(1 << STM_RCC_AHB1ENR_IOPBEN);
                ao_power_unregister(&ao_power_gpiob);
        } else if ((port) == &stm_gpioc) {
-               stm_rcc.ahb1enr &= ~(1 << STM_RCC_AHB1ENR_IOPCEN);
+               stm_rcc_ahb1_clk_disable(1 << STM_RCC_AHB1ENR_IOPCEN);
                ao_power_unregister(&ao_power_gpioc);
        } else if ((port) == &stm_gpiod) {
-               stm_rcc.ahb1enr &= ~(1 << STM_RCC_AHB1ENR_IOPDEN);
+               stm_rcc_ahb1_clk_disable(1 << STM_RCC_AHB1ENR_IOPDEN);
                ao_power_unregister(&ao_power_gpiod);
        } else if ((port) == &stm_gpioe) {
-               stm_rcc.ahb1enr &= ~(1 << STM_RCC_AHB1ENR_IOPEEN);
+               stm_rcc_ahb1_clk_disable(1 << STM_RCC_AHB1ENR_IOPEEN);
                ao_power_unregister(&ao_power_gpioe);
        } else if ((port) == &stm_gpiof) {
-               stm_rcc.ahb1enr &= ~(1 << STM_RCC_AHB1ENR_IOPFEN);
+               stm_rcc_ahb1_clk_disable(1 << STM_RCC_AHB1ENR_IOPFEN);
                ao_power_unregister(&ao_power_gpiof);
        } else if ((port) == &stm_gpiog) {
-               stm_rcc.ahb1enr &= ~(1 << STM_RCC_AHB1ENR_IOPGEN);
+               stm_rcc_ahb1_clk_disable(1 << STM_RCC_AHB1ENR_IOPGEN);
                ao_power_unregister(&ao_power_gpiog);
        } else if ((port) == &stm_gpioh) {
-               stm_rcc.ahb1enr &= ~(1 << STM_RCC_AHB1ENR_IOPHEN);
+               stm_rcc_ahb1_clk_disable(1 << STM_RCC_AHB1ENR_IOPHEN);
                ao_power_unregister(&ao_power_gpioh);
        }
 }
@@ -336,5 +336,25 @@ static inline void ao_disable_port(struct stm_gpio *port)
 void
 ao_usart_init(void);
 
+void
+start(void);
+
+char
+ao_serial6_getchar(void);
+
+void
+ao_serial6_putchar(char c);
+
+int
+_ao_serial6_pollchar(void);
+
+uint8_t
+_ao_serial6_sleep_for(uint16_t timeout);
+
+void
+ao_serial6_set_speed(uint32_t speed);
+
+void
+ao_serial6_drain(void);
 
 #endif /* _AO_ARCH_FUNCS_H_ */

diff --git a/src/stm32f4/ao_timer.c b/src/stm32f4/ao_timer.c
index d6ef9bc379e5d074b68bb98506957f46ce94e599..fb83db003aa46085f37a3b294e2da02402dc49b3 100644 (file)
--- a/src/stm32f4/ao_timer.c
+++ b/src/stm32f4/ao_timer.c
@@ -262,13 +262,12 @@ ao_clock_init(void)
 #if DEBUG_THE_CLOCK
        /* Output PLL clock on PA8 and SYCLK on PC9 for measurments */
 
-       stm_rcc.ahb1enr |= ((1 << STM_RCC_AHB1ENR_IOPAEN) |
-                           (1 << STM_RCC_AHB1ENR_IOPCEN));
-
+       ao_enable_port(&stm_gpioa);
        stm_afr_set(&stm_gpioa, 8, STM_AFR_AF0);
        stm_moder_set(&stm_gpioa, 8, STM_MODER_ALTERNATE);
        stm_ospeedr_set(&stm_gpioa, 8, STM_OSPEEDR_HIGH);
 
+       ao_enable_port(&stm_gpioc);
        stm_afr_set(&stm_gpioc, 9, STM_AFR_AF0);
        stm_moder_set(&stm_gpioc, 9, STM_MODER_ALTERNATE);
        stm_ospeedr_set(&stm_gpioc, 9, STM_OSPEEDR_HIGH);

diff --git a/src/stm32f4/stm32f4.h b/src/stm32f4/stm32f4.h
index dcdce66790237e2ad5cff0f7ba50c850ef2010e9..3e8ec95776678b7bdbc914d474a1d7868b8fc592 100644 (file)
--- a/src/stm32f4/stm32f4.h
+++ b/src/stm32f4/stm32f4.h
@@ -66,8 +66,8 @@ struct stm_rcc {
        vuint32_t       pad_28;
        vuint32_t       pad_2c;
 
-       vuint32_t       ahb1enr;
-       vuint32_t       ahb2enr;
+       vuint32_t       _ahb1enr;
+       vuint32_t       _ahb2enr;
        vuint32_t       ahbdnr;
        vuint32_t       pad_3c;
 
@@ -277,6 +277,38 @@ extern struct stm_rcc stm_rcc;
 #define  STM_RCC_DCKCFGR2_I2CFMP1SEL_HSI               2
 #define  STM_RCC_DCKCFGR2_I2CFMP1SEL_APB_ALSO          3
 
+static inline void
+stm_rcc_ahb1_clk_enable(uint32_t bit)
+{
+       stm_rcc._ahb1enr |= bit;
+       uint32_t value = stm_rcc._ahb1enr;
+       (void) value;
+}
+
+static inline void
+stm_rcc_ahb1_clk_disable(uint32_t bit)
+{
+       stm_rcc._ahb1enr &= ~bit;
+       uint32_t value = stm_rcc._ahb1enr;
+       (void) value;
+}
+
+static inline void
+stm_rcc_ahb2_clk_enable(uint32_t bit)
+{
+       stm_rcc._ahb2enr |= bit;
+       uint32_t value = stm_rcc._ahb2enr;
+       (void) value;
+}
+
+static inline void
+stm_rcc_ahb2_clk_disable(uint32_t bit)
+{
+       stm_rcc._ahb2enr &= ~bit;
+       uint32_t value = stm_rcc._ahb2enr;
+       (void) value;
+}
+
 struct stm_ictr {
        vuint32_t       ictr;
 };
@@ -378,6 +410,8 @@ stm_nvic_get_priority(int irq) {
 
 #define isr(name) void stm_ ## name ## _isr(void)
 
+isr(halt);
+isr(ignore);
 isr(nmi);
 isr(hardfault);
 isr(memmanage);