altos/stm32f4: Wrong value for CK48MSEL_PLL_Q
authorKeith Packard <keithp@keithp.com>
Tue, 19 Mar 2019 00:20:14 +0000 (17:20 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 19 Mar 2019 00:22:22 +0000 (17:22 -0700)
This meant that the USB clock wasn't actually getting started...

Signed-off-by: Keith Packard <keithp@keithp.com>
src/stm32f4/ao_exti.h
src/stm32f4/ao_exti_stm32f4.c
src/stm32f4/stm32f4.h

index 0216f35..0324660 100644 (file)
 #define AO_EXTI_PIN_NOCONFIGURE        64
 
 void
-ao_exti_setup(struct stm_gpio *gpio, uint8_t pin, uint8_t mode, void (*callback)());
+ao_exti_setup(struct stm_gpio *gpio, uint8_t pin, uint8_t mode, void (*callback)(void));
 
 void
 ao_exti_set_mode(struct stm_gpio *gpio, uint8_t pin, uint8_t mode);
 
 void
-ao_exti_set_callback(struct stm_gpio *gpio, uint8_t pin, void (*callback)());
+ao_exti_set_callback(struct stm_gpio *gpio, uint8_t pin, void (*callback)(void));
 
 void
 ao_exti_enable(struct stm_gpio *gpio, uint8_t pin);
index 1e288f9..900fe90 100644 (file)
@@ -135,7 +135,7 @@ ao_exti_set_mode(struct stm_gpio *gpio, uint8_t pin, uint8_t mode) {
 }
 
 void
-ao_exti_set_callback(struct stm_gpio *gpio, uint8_t pin, void (*callback)()) {
+ao_exti_set_callback(struct stm_gpio *gpio, uint8_t pin, void (*callback)(void)) {
        (void) gpio;
        ao_exti_callback[pin] = callback;
 }
index 3e8ec95..94ee23b 100644 (file)
@@ -269,7 +269,7 @@ extern struct stm_rcc stm_rcc;
 #define  STM_RCC_DCKCFGR2_SDIOSEL_CK_48MHZ     0
 #define  STM_RCC_DCKCFGR2_SDIOSEL_SYSTEM_CLOCK 1
 #define STM_RCC_DCKCFGR2_CK48MSEL      27
-#define  STM_RCC_DCKCFGR2_CK48MSEL_PLL_Q       1
+#define  STM_RCC_DCKCFGR2_CK48MSEL_PLL_Q       0
 #define  STM_RCC_DCKCFGR2_CK48MSEL_PLLI2S_Q    1
 #define STM_RCC_DCKCFGR2_I2CFMP1SEL    22
 #define  STM_RCC_DCKCFGR2_I2CFMP1SEL_APB               0