diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-03-31 13:21:25 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-03-31 13:21:25 -0600 |
| commit | 0d085198e9bafae34dcb77d1e75305785f1e5d08 (patch) | |
| tree | 335f2ab4a732bac3b6b61ea9394e93241d3183eb /nuttx/configs/sama5d4-ek | |
| parent | 6fcc161c79d4e24444997e35e5a37d7aff6049b9 (diff) | |
| download | px4-nuttx-0d085198e9bafae34dcb77d1e75305785f1e5d08.tar.gz px4-nuttx-0d085198e9bafae34dcb77d1e75305785f1e5d08.tar.bz2 px4-nuttx-0d085198e9bafae34dcb77d1e75305785f1e5d08.zip | |
rch_tcinitialize() and arch_tcunitinitialize() renamed to board_tsc_setup() and board_tsc_teardown(). These are not long called directly by applications but only indirectly throught the crappy boardctl() OS interface.
Diffstat (limited to 'nuttx/configs/sama5d4-ek')
| -rw-r--r-- | nuttx/configs/sama5d4-ek/ipv6/defconfig | 2 | ||||
| -rw-r--r-- | nuttx/configs/sama5d4-ek/nsh/defconfig | 2 | ||||
| -rw-r--r-- | nuttx/configs/sama5d4-ek/src/sam_maxtouch.c | 9 |
3 files changed, 9 insertions, 4 deletions
diff --git a/nuttx/configs/sama5d4-ek/ipv6/defconfig b/nuttx/configs/sama5d4-ek/ipv6/defconfig index 77f44963e..ca5ee10e7 100644 --- a/nuttx/configs/sama5d4-ek/ipv6/defconfig +++ b/nuttx/configs/sama5d4-ek/ipv6/defconfig @@ -1220,6 +1220,8 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16 # CONFIG_EXAMPLES_THTTPD is not set # CONFIG_EXAMPLES_TIFF is not set CONFIG_EXAMPLES_TOUCHSCREEN=y +CONFIG_LIB_BOARDCTL=y +CONFIG_BOARDCTL_TSCTEST=y CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0 CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0" # CONFIG_EXAMPLES_TOUCHSCREEN_MOUSE is not set diff --git a/nuttx/configs/sama5d4-ek/nsh/defconfig b/nuttx/configs/sama5d4-ek/nsh/defconfig index 49badb8f9..82c1de894 100644 --- a/nuttx/configs/sama5d4-ek/nsh/defconfig +++ b/nuttx/configs/sama5d4-ek/nsh/defconfig @@ -1222,6 +1222,8 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16 # CONFIG_EXAMPLES_THTTPD is not set # CONFIG_EXAMPLES_TIFF is not set CONFIG_EXAMPLES_TOUCHSCREEN=y +CONFIG_LIB_BOARDCTL=y +CONFIG_BOARDCTL_TSCTEST=y CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0 CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0" # CONFIG_EXAMPLES_TOUCHSCREEN_MOUSE is not set diff --git a/nuttx/configs/sama5d4-ek/src/sam_maxtouch.c b/nuttx/configs/sama5d4-ek/src/sam_maxtouch.c index 6a73fb4ce..8de590332 100644 --- a/nuttx/configs/sama5d4-ek/src/sam_maxtouch.c +++ b/nuttx/configs/sama5d4-ek/src/sam_maxtouch.c @@ -45,6 +45,7 @@ #include <assert.h> #include <errno.h> +#include <nuttx/board.h> #include <nuttx/spi/spi.h> #include <nuttx/input/touchscreen.h> #include <nuttx/input/mxt.h> @@ -218,7 +219,7 @@ static int mxt_interrupt(int irq, FAR void *context) ****************************************************************************/ /**************************************************************************** - * Name: arch_tcinitialize + * Name: board_tsc_setup * * Description: * Each board that supports a touchscreen device must provide this function. @@ -235,7 +236,7 @@ static int mxt_interrupt(int irq, FAR void *context) * ****************************************************************************/ -int arch_tcinitialize(int minor) +int board_tsc_setup(int minor) { FAR struct i2c_dev_s *i2c; static bool initialized = false; @@ -290,7 +291,7 @@ int arch_tcinitialize(int minor) } /**************************************************************************** - * Name: arch_tcuninitialize + * Name: board_tsc_teardown * * Description: * Each board that supports a touchscreen device must provide this function. @@ -305,7 +306,7 @@ int arch_tcinitialize(int minor) * ****************************************************************************/ -void arch_tcuninitialize(void) +void board_tsc_teardown(void) { /* No support for un-initializing the touchscreen maXTouch device. It will * continue to run and process touch interrupts in the background. |