From de7d74a1537671a2984532d799e01b4ba66b57f9 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 17 Jan 2018 09:32:05 -0600 Subject: [PATCH] nxwm: Elimint BOARDIOC_TSCTEST_SETUP. --- Kconfig | 15 --------------- nxwm/src/ctouchscreen.cxx | 14 -------------- 2 files changed, 29 deletions(-) diff --git a/Kconfig b/Kconfig index 2b10ec5a3..c841707a4 100644 --- a/Kconfig +++ b/Kconfig @@ -736,21 +736,6 @@ if NXWM_TOUCHSCREEN comment "Touchscreen Device Settings" -config NXWM_TOUCHSCREEN_DEVINIT - bool "Touchscreen Device Initialization" - default y - depends on !BUILD_PROTECTED && !BUILD_KERNEL - ---help--- - It this option is selected, then the NxWM:CTouchscreen listener - 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. - config NXWM_TOUCHSCREEN_DEVNO int "Touchscreen Device Number" default 0 diff --git a/nxwm/src/ctouchscreen.cxx b/nxwm/src/ctouchscreen.cxx index 5cf18f94c..dc329ad3d 100644 --- a/nxwm/src/ctouchscreen.cxx +++ b/nxwm/src/ctouchscreen.cxx @@ -43,7 +43,6 @@ #include #include -#include #include #include @@ -285,19 +284,6 @@ FAR void *CTouchscreen::listener(FAR void *arg) _info("Listener started\n"); -#ifdef CONFIG_NXWM_TOUCHSCREEN_DEVINIT - // Initialize the touchscreen device - - int ret = boardctl(BOARDIOC_TSCTEST_SETUP, CONFIG_NXWM_TOUCHSCREEN_DEVNO); - if (ret < 0) - { - gerr("ERROR Failed initialize the touchscreen device: %d\n", errno); - This->m_state = LISTENER_FAILED; - sem_post(&This->m_waitSem); - return (FAR void *)0; - } -#endif - // Open the touchscreen device that we just created. This->m_touchFd = std::open(CONFIG_NXWM_TOUCHSCREEN_DEVPATH, O_RDONLY);