diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2013-06-12 17:32:00 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2013-06-12 17:32:00 -0600 |
commit | 3980a00ab75c580d1f4246a9be226631832c9e6e (patch) | |
tree | 1d8e177d23a39c0fe30e44cc1843cb3f4d737021 /apps/examples/touchscreen | |
parent | 5633c904e72b25119bbd9056bc0951ef9f6ad88e (diff) | |
download | px4-nuttx-3980a00ab75c580d1f4246a9be226631832c9e6e.tar.gz px4-nuttx-3980a00ab75c580d1f4246a9be226631832c9e6e.tar.bz2 px4-nuttx-3980a00ab75c580d1f4246a9be226631832c9e6e.zip |
Remove CONFIG_XYZ_BUILTIN configurations, replace with the single CONFIG_NSH_BUILTIN_APPS. Add SAM3/4 sam_periphclks.h which is just a header file that includes the right header file. Misc SAM3U-EK cleanup
Diffstat (limited to 'apps/examples/touchscreen')
-rw-r--r-- | apps/examples/touchscreen/tc.h | 4 | ||||
-rw-r--r-- | apps/examples/touchscreen/tc_main.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/examples/touchscreen/tc.h b/apps/examples/touchscreen/tc.h index 055353ddd..1757fe0c8 100644 --- a/apps/examples/touchscreen/tc.h +++ b/apps/examples/touchscreen/tc.h @@ -46,7 +46,7 @@ * Definitions ****************************************************************************/ /* Configuration ************************************************************/ -/* CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN - Build the touchscreen test as +/* CONFIG_NSH_BUILTIN_APPS - Build the touchscreen test as * an NSH built-in function. Default: Built as a standalone problem * CONFIG_EXAMPLES_TOUCHSCREEN_MINOR - The minor device number. Minor=N * corresponds to touchscreen device /dev/input0. Note this value must @@ -54,7 +54,7 @@ * CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH - The path to the touchscreen * device. This must be consistent with CONFIG_EXAMPLES_TOUCHSCREEN_MINOR. * Default: "/dev/input0" - * CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES - If CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN + * CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES - If CONFIG_NSH_BUILTIN_APPS * is defined, then the number of samples is provided on the command line * and this value is ignored. Otherwise, this number of samples is * collected and the program terminates. Default: Zero (Samples are collected diff --git a/apps/examples/touchscreen/tc_main.c b/apps/examples/touchscreen/tc_main.c index d49902612..d786a6775 100644 --- a/apps/examples/touchscreen/tc_main.c +++ b/apps/examples/touchscreen/tc_main.c @@ -88,7 +88,7 @@ int tc_main(int argc, char *argv[]) { struct touch_sample_s sample; ssize_t nbytes; -#if defined(CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN) || CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES > 0 +#if defined(CONFIG_NSH_BUILTIN_APPS) || CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES > 0 long nsamples; #endif int fd; @@ -99,7 +99,7 @@ int tc_main(int argc, char *argv[]) * samples that we collect before returning. Otherwise, we never return */ -#if defined(CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN) +#if defined(CONFIG_NSH_BUILTIN_APPS) nsamples = 1; if (argc > 1) { @@ -139,7 +139,7 @@ int tc_main(int argc, char *argv[]) * touchscreen samples. */ -#if defined(CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN) +#if defined(CONFIG_NSH_BUILTIN_APPS) for (; nsamples > 0; nsamples--) #elif CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES > 0 for (nsamples = 0; nsamples < CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES; nsamples++) |