riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5104 from haukepetersen/fix_f1_gpiomode

Browse Source 
cpu/stm32f1: fixed pull selection in GPIO driver
This commit is contained in:
DipSwitch 2016-03-20 12:21:33 +01:00
commit 30f0a2a26a
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cpu/stm32f1/include/periph_cpu.h
View File

@ -62,11 +62,12 @@ typedef uint32_t gpio_t;
* @brief Generate GPIO mode bitfields * @brief Generate GPIO mode bitfields
* *
* We use 4 bit to determine the pin functions: * We use 4 bit to determine the pin functions:
* - bit 4: ODR value
* - bit 2+3: in/out * - bit 2+3: in/out
* - bit 1: PU enable * - bit 1: PU enable
* - bit 2: OD enable * - bit 2: OD enable
*/ */
#define GPIO_MODE(mode, cnf) (mode | (cnf << 2)) #define GPIO_MODE(mode, cnf, odr) (mode | (cnf << 2) | (odr << 4))
/** /**
* @brief Override GPIO mode options * @brief Override GPIO mode options
@ -76,11 +77,11 @@ typedef uint32_t gpio_t;
*/ */
#define HAVE_GPIO_MODE_T #define HAVE_GPIO_MODE_T
typedef enum { typedef enum {
GPIO_IN = GPIO_MODE(0, 1), /**< input w/o pull R */ GPIO_IN = GPIO_MODE(0, 1, 0), /**< input w/o pull R */
GPIO_IN_PD = GPIO_MODE(0, 2), /**< input with pull-down */ GPIO_IN_PD = GPIO_MODE(0, 2, 0), /**< input with pull-down */
GPIO_IN_PU = GPIO_MODE(0, 2), /**< input with pull-up */ GPIO_IN_PU = GPIO_MODE(0, 2, 1), /**< input with pull-up */
GPIO_OUT = GPIO_MODE(3, 0), /**< push-pull output */ GPIO_OUT = GPIO_MODE(3, 0, 0), /**< push-pull output */
GPIO_OD = GPIO_MODE(3, 1), /**< open-drain w/o pull R */ GPIO_OD = GPIO_MODE(3, 1, 0), /**< open-drain w/o pull R */
GPIO_OD_PU = (0xff) /**< not supported by HW */ GPIO_OD_PU = (0xff) /**< not supported by HW */
} gpio_mode_t; } gpio_mode_t;
/** @} */ /** @} */

12
cpu/stm32f1/periph/gpio.c
View File

@ -35,6 +35,12 @@
*/ */
#define GPIO_ISR_CHAN_NUMOF (16U) #define GPIO_ISR_CHAN_NUMOF (16U)
/**
* @brief Extract information from mode parameter
*/
#define MODE_MASK (0x0f)
#define ODR_POS (4U)
/** /**
* @brief Allocate memory for one callback and argument per EXTI channel * @brief Allocate memory for one callback and argument per EXTI channel
*/ */
@ -83,12 +89,10 @@ int gpio_init(gpio_t pin, gpio_mode_t mode)
/* set pin mode */ /* set pin mode */
port->CR[pin_num >> 3] &= ~(0xf << ((pin_num & 0x7) * 4)); port->CR[pin_num >> 3] &= ~(0xf << ((pin_num & 0x7) * 4));
port->CR[pin_num >> 3] |= (mode << ((pin_num & 0x7) * 4)); port->CR[pin_num >> 3] |= ((mode & MODE_MASK) << ((pin_num & 0x7) * 4));
/* set initial state of output register */ /* set initial state of output register */
port->BRR = (1 << pin_num); port->BRR = (1 << pin_num);
if (mode == GPIO_IN_PU) { port->BSRR = ((mode >> ODR_POS) << pin_num);
port->BSRR = (1 << pin_num);
}
return 0; /* all OK */ return 0; /* all OK */
} }