[stm32f1] gpio_setup_pin_af with uint32_t for af

paparazzi · Jun 20, 2014 · aca1e01 · aca1e01
1 parent 6665181
commit aca1e01
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/sw/airborne/arch/stm32/mcu_periph/gpio_arch.c b/sw/airborne/arch/stm32/mcu_periph/gpio_arch.c
@@ -86,7 +86,7 @@ void gpio_setup_input(uint32_t port, uint16_t gpios) {
   gpio_set_mode(port, GPIO_MODE_INPUT, GPIO_CNF_INPUT_FLOAT, gpios);
 }
 
-void gpio_setup_pin_af(uint32_t port, uint16_t pin, uint8_t af, bool_t is_output) {
+void gpio_setup_pin_af(uint32_t port, uint16_t pin, uint32_t af, bool_t is_output) {
   gpio_enable_clock(port);
   /* remap alternate function if needed */
   if (af) {

diff --git a/sw/airborne/arch/stm32/mcu_periph/gpio_arch.h b/sw/airborne/arch/stm32/mcu_periph/gpio_arch.h
@@ -51,7 +51,11 @@ extern void gpio_setup_input(uint32_t port, uint16_t gpios);
  * Setup a gpio for input or output with alternate function.
  * This is an STM32 specific helper funtion and should only be used in stm32 arch code.
  */
+#if defined(STM32F1)
+extern void gpio_setup_pin_af(uint32_t port, uint16_t pin, uint32_t af, bool_t is_output);
+#else
 extern void gpio_setup_pin_af(uint32_t port, uint16_t pin, uint8_t af, bool_t is_output);
+#endif
 
 /**
  * Setup a gpio for analog use.