From aca1e01b060535124212932282e39e16d9fc0371 Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Fri, 20 Jun 2014 23:54:02 +0200 Subject: [PATCH] [stm32f1] gpio_setup_pin_af with uint32_t for af --- sw/airborne/arch/stm32/mcu_periph/gpio_arch.c | 2 +- sw/airborne/arch/stm32/mcu_periph/gpio_arch.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sw/airborne/arch/stm32/mcu_periph/gpio_arch.c b/sw/airborne/arch/stm32/mcu_periph/gpio_arch.c index 56233fc0659..83de90dc74d 100644 --- 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 index 4129b823905..f72d511e276 100644 --- 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.