diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-06-02 13:04:40 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-06-02 13:04:40 -0600 |
| commit | 9c0f7e4217cf195b2f83175b0014e273fbc805da (patch) | |
| tree | 46f769b6188d65d2f3471b9fe7bdae2676162f56 /nuttx/configs/sam3u-ek/src/up_touchscreen.c | |
| parent | 872bef7d41462d36b81ddc8de82a2cde18eaf096 (diff) | |
| download | px4-nuttx-9c0f7e4217cf195b2f83175b0014e273fbc805da.tar.gz px4-nuttx-9c0f7e4217cf195b2f83175b0014e273fbc805da.tar.bz2 px4-nuttx-9c0f7e4217cf195b2f83175b0014e273fbc805da.zip | |
Eliminated sam3u_internal.h. Use separate header files instead. More renaming from sam3u_ to sam_ to make room in the namespce for the sam4l_
Diffstat (limited to 'nuttx/configs/sam3u-ek/src/up_touchscreen.c')
| -rw-r--r-- | nuttx/configs/sam3u-ek/src/up_touchscreen.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nuttx/configs/sam3u-ek/src/up_touchscreen.c b/nuttx/configs/sam3u-ek/src/up_touchscreen.c index 3157f7160..71b12f571 100644 --- a/nuttx/configs/sam3u-ek/src/up_touchscreen.c +++ b/nuttx/configs/sam3u-ek/src/up_touchscreen.c @@ -50,8 +50,8 @@ #include <nuttx/input/touchscreen.h> #include <nuttx/input/ads7843e.h> -#include "sam3u_internal.h" -#include "sam3uek_internal.h" +#include "sam_gpio.h" +#include "sam3u-ek.h" /**************************************************************************** * Pre-Processor Definitions @@ -165,11 +165,11 @@ static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable) ivdbg("IRQ:%d enable:%d\n", SAM_TCS_IRQ, enable); if (enable) { - sam3u_gpioirqenable(SAM_TCS_IRQ); + sam_gpioirqenable(SAM_TCS_IRQ); } else { - sam3u_gpioirqdisable(SAM_TCS_IRQ); + sam_gpioirqdisable(SAM_TCS_IRQ); } } @@ -186,7 +186,7 @@ static bool tsc_busy(FAR struct ads7843e_config_s *state) /* REVISIT: This might need to be inverted */ - bool busy = sam3u_gpioread(GPIO_TCS_BUSY); + bool busy = sam_gpioread(GPIO_TCS_BUSY); #if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_VERBOSE) if (busy != last) { @@ -201,7 +201,7 @@ static bool tsc_pendown(FAR struct ads7843e_config_s *state) { /* REVISIT: This might need to be inverted */ - bool pendown = sam3u_gpioread(GPIO_TCS_IRQ); + bool pendown = sam_gpioread(GPIO_TCS_IRQ); ivdbg("pendown:%d\n", pendown); return pendown; } @@ -238,12 +238,12 @@ int arch_tcinitialize(int minor) /* Configure and enable the ADS7843E interrupt pin as an input */ - (void)sam3u_configgpio(GPIO_TCS_BUSY); - (void)sam3u_configgpio(GPIO_TCS_IRQ); + (void)sam_configgpio(GPIO_TCS_BUSY); + (void)sam_configgpio(GPIO_TCS_IRQ); /* Configure the PIO interrupt */ - sam3u_gpioirq(GPIO_TCS_IRQ); + sam_gpioirq(GPIO_TCS_IRQ); /* Get an instance of the SPI interface */ |