4 files changed, 20 insertions, 2 deletions
diff --git a/apps/examples/README.txt b/apps/examples/README.txt
index fbd770309..d7da89152 100644
--- a/apps/examples/README.txt
+++ b/apps/examples/README.txt
@@ -779,6 +779,11 @@ examples/touchscreen
     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
+     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:  Samples are collected
+     indefinitely.
 
   The following additional configurations must be set in the NuttX
   configuration file:
diff --git a/apps/examples/touchscreen/tc.h b/apps/examples/touchscreen/tc.h
index d431c9a5b..173ed491f 100644
--- a/apps/examples/touchscreen/tc.h
+++ b/apps/examples/touchscreen/tc.h
@@ -55,6 +55,11 @@
  * 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
+ *   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:  Samples are collected
+ *   indefinitely.
  */
 
 #ifndef CONFIG_INPUT
diff --git a/apps/examples/touchscreen/tc_main.c b/apps/examples/touchscreen/tc_main.c
index 7547ee489..920a504fb 100644
--- a/apps/examples/touchscreen/tc_main.c
+++ b/apps/examples/touchscreen/tc_main.c
@@ -95,7 +95,7 @@ int MAIN_NAME(int argc, char *argv[])
 {
   struct touch_sample_s sample;
   ssize_t nbytes;
-#ifdef CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN
+#if defined(CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN) || defined(CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES)
   long nsamples;
 #endif
   int fd;
@@ -142,8 +142,10 @@ int MAIN_NAME(int argc, char *argv[])
    * touchscreen samples.
    */
 
-#ifdef CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN
+#if defined(CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN)
   for (; namples > 0; nsamples--)
+#elif defined(CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES)
+  for (namples = 0; namples < CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES; nsamples++)
 #else
   for (;;)
 #endif
diff --git a/nuttx/configs/sim/touchscreen/defconfig b/nuttx/configs/sim/touchscreen/defconfig
index 448cee747..350502ef2 100644
--- a/nuttx/configs/sim/touchscreen/defconfig
+++ b/nuttx/configs/sim/touchscreen/defconfig
@@ -551,10 +551,16 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 # 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
+#   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:  Samples are collected
+#   indefinitely.
 #
 CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN=n
 CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0
 CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
+CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
 
 #
 # Additional examples/touchscreen needed only for the simulated target