scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-12-27 18:25:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

gpio: Make GPIO_INT_BOTH explicitly RISING|FALLING

Browse Source 
For historical reasons on LM4, we defined GPIO_INT_F_BOTH separately
from GPIO_INT_F_RISING and GPIO_INT_F_FALLING.  This means that the
code has weird checks like BOTH || (RISING && FALLING), which have
propagated in error-prone ways across the other chips.

Instead, explcitly define BOTH to be RISING|FALLING.

Ideally, we would have called it GPIO_INT_EDGE to match
GPIO_INT_LEVEL, but changing that now would be a big find-replace.
Which might still be a good idea, but that is best done in its own CL.

BUG=chrome-os-partner:24204
BRANCH=none
TEST=build and boot pit, spring, and link; that covers STM32F, STM32L, and LM4.

Change-Id: I23ba05a3f41bb14b09af61dc52a178f710f5c1bb
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/177643
Reviewed-by: Jeremy Thorpe <jeremyt@chromium.org>
Reviewed-by: Vic Yang <victoryang@chromium.org>
This commit is contained in:
Randall Spangler
2013-11-21 15:41:39 -08:00
committed by chrome-internal-fetch
parent 11aed2342e
commit 7f3ed512db
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
chip/host/gpio.c
View File

@@ -27,11 +27,9 @@ test_mockable int gpio_get_level(enum gpio_signal signal)
static int gpio_interrupt_check(uint32_t flags, int old, int new)
{
if ((flags & (GPIO_INT_F_RISING|GPIO_INT_F_BOTH)) &&
old == 0 && new == 1)
if ((flags & GPIO_INT_F_RISING) && old == 0 && new == 1)
return 1;
if ((flags & (GPIO_INT_F_FALLING|GPIO_INT_F_BOTH)) &&
old == 1 && new == 0)
if ((flags & GPIO_INT_F_FALLING) && old == 1 && new == 0)
return 1;
if ((flags & GPIO_INT_F_LOW) && new == 0)
return 1;

4
chip/lm4/gpio.c
View File

@@ -128,7 +128,9 @@ void gpio_set_flags_by_mask(uint32_t port, uint32_t mask, uint32_t flags)
else
LM4_GPIO_IEV(port) &= ~mask;
if (flags & GPIO_INT_F_BOTH)
/* Handle interrupting on both edges */
if ((flags & GPIO_INT_F_RISING) &&
(flags & GPIO_INT_F_FALLING))
LM4_GPIO_IBE(port) |= mask;
else
LM4_GPIO_IBE(port) &= ~mask;

4
chip/stm32/gpio-stm32f.c
View File

@@ -108,9 +108,9 @@ void gpio_set_flags_by_mask(uint32_t port, uint32_t pmask, uint32_t flags)
/* Set up interrupts if necessary */
ASSERT(!(flags & (GPIO_INT_F_LOW | GPIO_INT_F_HIGH)));
if (flags & (GPIO_INT_F_RISING | GPIO_INT_F_BOTH))
if (flags & GPIO_INT_F_RISING)
STM32_EXTI_RTSR |= pmask;
if (flags & (GPIO_INT_F_FALLING | GPIO_INT_F_BOTH))
if (flags & GPIO_INT_F_FALLING)
STM32_EXTI_FTSR |= pmask;
/* Interrupt is enabled by gpio_enable_interrupt() */
}

4
chip/stm32/gpio-stm32l.c
View File

@@ -74,9 +74,9 @@ void gpio_set_flags_by_mask(uint32_t port, uint32_t mask, uint32_t flags)
/* Set up interrupts if necessary */
ASSERT(!(flags & (GPIO_INT_F_LOW | GPIO_INT_F_HIGH)));
if (flags & (GPIO_INT_F_RISING | GPIO_INT_F_BOTH))
if (flags & GPIO_INT_F_RISING)
STM32_EXTI_RTSR |= mask;
if (flags & (GPIO_INT_F_FALLING | GPIO_INT_F_BOTH))
if (flags & GPIO_INT_F_FALLING)
STM32_EXTI_FTSR |= mask;
/* Interrupt is enabled by gpio_enable_interrupt() */
}

7
include/gpio.h
View File

@@ -24,7 +24,6 @@
#define GPIO_HIGH (1 << 7) /* If GPIO_OUTPUT, set level high */
#define GPIO_INT_F_RISING (1 << 8) /* Interrupt on rising edge */
#define GPIO_INT_F_FALLING (1 << 9) /* Interrupt on falling edge */
#define GPIO_INT_F_BOTH (1 << 10) /* Interrupt on both edges */
#define GPIO_INT_F_LOW (1 << 11) /* Interrupt on low level */
#define GPIO_INT_F_HIGH (1 << 12) /* Interrupt on high level */
#define GPIO_DEFAULT (1 << 13) /* Don't set up on boot */
@@ -37,12 +36,12 @@
#define GPIO_ODR_LOW (GPIO_OUTPUT | GPIO_OPEN_DRAIN | GPIO_LOW)
#define GPIO_INT_RISING (GPIO_INPUT | GPIO_INT_F_RISING)
#define GPIO_INT_FALLING (GPIO_INPUT | GPIO_INT_F_FALLING)
#define GPIO_INT_BOTH (GPIO_INPUT | GPIO_INT_F_BOTH)
/* TODO(crosbug.com/p/24204): "EDGE" would have been clearer than "BOTH". */
#define GPIO_INT_BOTH (GPIO_INT_RISING | GPIO_INT_FALLING)
#define GPIO_INT_LOW (GPIO_INPUT | GPIO_INT_F_LOW)
#define GPIO_INT_HIGH (GPIO_INPUT | GPIO_INT_F_HIGH)
#define GPIO_INT_EDGE (GPIO_INT_RISING | GPIO_INT_FALLING | GPIO_INT_BOTH)
#define GPIO_INT_LEVEL (GPIO_INT_LOW | GPIO_INT_HIGH)
#define GPIO_INT_ANY (GPIO_INT_EDGE | GPIO_INT_LEVEL)
#define GPIO_INT_ANY (GPIO_INT_BOTH | GPIO_INT_LEVEL)
#define GPIO_INT_BOTH_DSLEEP (GPIO_INT_BOTH | GPIO_INT_DSLEEP)
/* GPIO signal definition structure, for use by board.c */