diff options
Diffstat (limited to 'NxWidgets')
| -rw-r--r-- | NxWidgets/ChangeLog.txt | 5 | ||||
| -rw-r--r-- | NxWidgets/Kconfig | 11 | ||||
| -rw-r--r-- | NxWidgets/nxwm/src/ctouchscreen.cxx | 3 |
3 files changed, 12 insertions, 7 deletions
diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt index ff21d8852..6cf53f54c 100644 --- a/NxWidgets/ChangeLog.txt +++ b/NxWidgets/ChangeLog.txt @@ -544,3 +544,8 @@ NuttX 7.6 and previous versions of the UnitTest code. 1.15 2015-xx-xx Gregory Nutt <gnutt@nuttx.org> + +* In NuttX 7.9, the interface arch_tcinitialize() was replaced with the + boardctl() interface. Old versions of NxWM will then be incompatible + with Versions of NuttX at 7.9 and beyond (2015-03-31). + diff --git a/NxWidgets/Kconfig b/NxWidgets/Kconfig index 89e7e222d..066cdb2da 100644 --- a/NxWidgets/Kconfig +++ b/NxWidgets/Kconfig @@ -782,12 +782,11 @@ config NXWM_TOUCHSCREEN_DEVINIT depends on !BUILD_PROTECTED && !BUILD_KERNEL ---help--- It this option is selected, then the NxWM:CTouchscreen listener - thread will call a function arch_tcinitialize(NXWM_TOUCHSCREEN_DEVNO) - in order to instantiate the touchscreen driver at path - NXWM_TOUCHSCREEN_DEVPATH. If NXWM_TOUCHSCREEN_DEVINIT is not - selected, then the NxWM:CTouchscreen listener thread will assume - that the driver has already been initialized at - NXWM_TOUCHSCREEN_DEVPATH. + thread will call a function boardctl() in order to instantiate the + touchscreen driver at path NXWM_TOUCHSCREEN_DEVPATH. If + NXWM_TOUCHSCREEN_DEVINIT is not selected, then the NxWM:CTouchscreen + listener thread will assume that the driver has already been + initialized at NXWM_TOUCHSCREEN_DEVPATH. NOTE that in the kernel build, all touchscreen initialize must be performed in kernel logic prior to the execution of NxWM. diff --git a/NxWidgets/nxwm/src/ctouchscreen.cxx b/NxWidgets/nxwm/src/ctouchscreen.cxx index dc462727d..3792811a4 100644 --- a/NxWidgets/nxwm/src/ctouchscreen.cxx +++ b/NxWidgets/nxwm/src/ctouchscreen.cxx @@ -43,6 +43,7 @@ #include <cerrno> #include <cfcntl> +#include <sys/boardctl.h> #include <sched.h> #include <pthread.h> #include <assert.h> @@ -281,7 +282,7 @@ FAR void *CTouchscreen::listener(FAR void *arg) #ifdef CONFIG_NXWM_TOUCHSCREEN_DEVINIT // Initialize the touchscreen device - int ret = arch_tcinitialize(CONFIG_NXWM_TOUCHSCREEN_DEVNO); + int ret = boardctl(BOARDIOC_TSCTEST_SETUP, CONFIG_NXWM_TOUCHSCREEN_DEVNO); if (ret < 0) { dbg("ERROR Failed initialize the touchscreen device: %d\n", ret); |