sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Gregory Nutt 2018-01-16 17:27:31 -06:00
parent 6895b1e7ce
commit 15bb9839ae
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
examples/lvgldemo/tp.c
View File

@ -40,7 +40,6 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/boardctl.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -93,22 +92,6 @@ int tp_init(void)
int ret; int ret;
int errval = 0; 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 */ /* Open the touchscreen device for reading */
printf("tp_init: Opening %s\n", CONFIG_EXAMPLES_LGVLDEMO_DEVPATH); 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", printf("tp_init: open %s failed: %d\n",
CONFIG_EXAMPLES_LGVLDEMO_DEVPATH, errno); CONFIG_EXAMPLES_LGVLDEMO_DEVPATH, errno);
errval = 2; errval = 2;
goto errout_with_tc; goto errout;
} }
return OK; return OK;
errout_with_tc:
#ifdef CONFIG_EXAMPLES_LGVLDEMO_ARCHINIT
boardctl(BOARDIOC_TSCTEST_TEARDOWN, 0);
errout: errout:
#endif
printf("Terminating!\n"); printf("Terminating!\n");
fflush(stdout); fflush(stdout);
return errval; return errval;