ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

STM32: gpio: style consistency

pull/3665/head
Laurent MEUNIER 2017-02-06 11:49:34 +01:00
parent 73955b678e
commit 18abfdb604
2 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
targets/TARGET_STM/gpio_api.c
View File

@ -146,13 +146,9 @@ void gpio_mode(gpio_t *obj, PinMode mode) {
} }
inline void gpio_dir(gpio_t *obj, PinDirection direction) { inline void gpio_dir(gpio_t *obj, PinDirection direction) {
if (direction == PIN_INPUT) {
if (direction == PIN_INPUT)
{
LL_GPIO_SetPinMode(obj->gpio, obj->ll_pin, LL_GPIO_MODE_INPUT); LL_GPIO_SetPinMode(obj->gpio, obj->ll_pin, LL_GPIO_MODE_INPUT);
} } else {
else
{
LL_GPIO_SetPinMode(obj->gpio, obj->ll_pin, LL_GPIO_MODE_OUTPUT); LL_GPIO_SetPinMode(obj->gpio, obj->ll_pin, LL_GPIO_MODE_OUTPUT);
} }
} }

33
targets/TARGET_STM/gpio_irq_api.c
View File

@ -87,20 +87,16 @@ static void handle_interrupt_in(uint32_t irq_index, uint32_t max_num_pin_line)
uint32_t pin = (uint32_t)(1 << (gpio_channel->channel_pin[gpio_idx])); uint32_t pin = (uint32_t)(1 << (gpio_channel->channel_pin[gpio_idx]));
// Clear interrupt flag // Clear interrupt flag
if (__HAL_GPIO_EXTI_GET_FLAG(pin) != RESET) if (__HAL_GPIO_EXTI_GET_FLAG(pin) != RESET) {
{
__HAL_GPIO_EXTI_CLEAR_FLAG(pin); __HAL_GPIO_EXTI_CLEAR_FLAG(pin);
if (gpio_channel->channel_ids[gpio_idx] == 0) if (gpio_channel->channel_ids[gpio_idx] == 0)
continue; continue;
// Check which edge has generated the irq // Check which edge has generated the irq
if ((gpio->IDR & pin) == 0) if ((gpio->IDR & pin) == 0) {
{
irq_handler(gpio_channel->channel_ids[gpio_idx], IRQ_FALL); irq_handler(gpio_channel->channel_ids[gpio_idx], IRQ_FALL);
} } else {
else
{
irq_handler(gpio_channel->channel_ids[gpio_idx], IRQ_RISE); irq_handler(gpio_channel->channel_ids[gpio_idx], IRQ_RISE);
} }
} }
@ -178,8 +174,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
uint32_t pin_index = STM_PIN(pin); uint32_t pin_index = STM_PIN(pin);
irq_index = pin_lines_desc[pin_index].irq_index; irq_index = pin_lines_desc[pin_index].irq_index;
switch (irq_index) switch (irq_index) {
{
#ifdef EXTI_IRQ0_NUM_LINES #ifdef EXTI_IRQ0_NUM_LINES
case 0: case 0:
vector = (uint32_t)&gpio_irq0; vector = (uint32_t)&gpio_irq0;
@ -259,25 +254,17 @@ void gpio_irq_free(gpio_irq_t *obj)
void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable) void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable)
{ {
if (event == IRQ_RISE) if (event == IRQ_RISE) {
{ if (enable) {
if (enable)
{
LL_EXTI_EnableRisingTrig_0_31(1 << STM_PIN(obj->pin)); LL_EXTI_EnableRisingTrig_0_31(1 << STM_PIN(obj->pin));
} } else {
else
{
LL_EXTI_DisableRisingTrig_0_31(1 << STM_PIN(obj->pin)); LL_EXTI_DisableRisingTrig_0_31(1 << STM_PIN(obj->pin));
} }
} }
if (event == IRQ_FALL) if (event == IRQ_FALL) {
{ if (enable) {
if (enable)
{
LL_EXTI_EnableFallingTrig_0_31(1 << STM_PIN(obj->pin)); LL_EXTI_EnableFallingTrig_0_31(1 << STM_PIN(obj->pin));
} } else {
else
{
LL_EXTI_DisableFallingTrig_0_31(1 << STM_PIN(obj->pin)); LL_EXTI_DisableFallingTrig_0_31(1 << STM_PIN(obj->pin));
} }
} }