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/mikroe-stm32f4 | |
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/mikroe-stm32f4')
-rw-r--r-- | nuttx/configs/mikroe-stm32f4/fulldemo/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/mikroe-stm32f4/src/stm32_touchscreen.c | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig b/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig index 9e3dc090a..ba66239b8 100644 --- a/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig +++ b/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig @@ -1146,6 +1146,8 @@ CONFIG_EXAMPLES_NX_NOTIFYSIGNO=4 # 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/mikroe-stm32f4/src/stm32_touchscreen.c b/nuttx/configs/mikroe-stm32f4/src/stm32_touchscreen.c index 210c11d19..f15c688ed 100644 --- a/nuttx/configs/mikroe-stm32f4/src/stm32_touchscreen.c +++ b/nuttx/configs/mikroe-stm32f4/src/stm32_touchscreen.c @@ -50,6 +50,7 @@ #include <errno.h> #include <debug.h> +#include <nuttx/board.h> #include <nuttx/clock.h> #include <nuttx/wqueue.h> #include <nuttx/fs/fs.h> @@ -1473,7 +1474,7 @@ errout: ************************************************************************************/ /**************************************************************************** - * Name: arch_tcinitialize + * Name: board_tsc_setup * * Description: * Each board that supports a touchscreen device must provide this function. @@ -1490,7 +1491,7 @@ errout: * ****************************************************************************/ -int arch_tcinitialize(int minor) +int board_tsc_setup(int minor) { FAR struct tc_dev_s *priv; char devname[DEV_NAMELEN]; @@ -1583,7 +1584,7 @@ errout_with_priv: } /**************************************************************************** - * Name: arch_tcuninitialize + * Name: board_tsc_teardown * * Description: * Each board that supports a touchscreen device must provide this function. @@ -1598,7 +1599,7 @@ errout_with_priv: * ****************************************************************************/ -void arch_tcuninitialize(void) +void board_tsc_teardown(void) { /* Need to unregister the /dev/inputN device here. */ } |