From 15bb9839ae885947a703cb3d3b204c490d07b97b Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 16 Jan 2018 17:27:31 -0600 Subject: [PATCH] apps/examples/lvgldemo: Remove references to CONFIG_EXAMPLES_LGVLDEMO_ARCHINIT (which was never defined anyway) and to all references to board control. The board bringup logic must register the touchscreen driver. BOARDIOC_TSCTEST_SETUP is deprecated. --- examples/lvgldemo/tp.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/examples/lvgldemo/tp.c b/examples/lvgldemo/tp.c index 2d1dbfc44..29ecd8f18 100644 --- a/examples/lvgldemo/tp.c +++ b/examples/lvgldemo/tp.c @@ -40,7 +40,6 @@ #include #include -#include #include #include @@ -93,22 +92,6 @@ int tp_init(void) int ret; int errval = 0; -#ifdef CONFIG_EXAMPLES_LGVLDEMO_ARCHINIT - /* Initialization of the touchscreen hardware is performed by logic - * external to this test. - */ - - printf("tp_init: Initializing external touchscreen device\n"); - - ret = boardctl(BOARDIOC_TSCTEST_SETUP, CONFIG_EXAMPLES_LGVLDEMO_MINOR); - if (ret != OK) - { - printf("tp_init: board_tsc_setup failed: %d\n", errno); - errval = 1; - goto errout; - } -#endif - /* Open the touchscreen device for reading */ printf("tp_init: Opening %s\n", CONFIG_EXAMPLES_LGVLDEMO_DEVPATH); @@ -118,17 +101,12 @@ int tp_init(void) printf("tp_init: open %s failed: %d\n", CONFIG_EXAMPLES_LGVLDEMO_DEVPATH, errno); errval = 2; - goto errout_with_tc; + goto errout; } return OK; -errout_with_tc: -#ifdef CONFIG_EXAMPLES_LGVLDEMO_ARCHINIT - boardctl(BOARDIOC_TSCTEST_TEARDOWN, 0); - errout: -#endif printf("Terminating!\n"); fflush(stdout); return errval;