Changeset 7c9d27e in rtems

Timestamp:

09/16/11 09:23:19 (12 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

11b9b5d

Parents:

6c5ee7f0

Message:

2011-09-16 Sebastian Huber <Sebastian.Huber@…>

• fileio/fileio.scn: New file.
• capture/init.c, fileio/init.c: Use rtems_shell_wait_for_input().

Location:

testsuites/samples

Files:

• ChangeLog (modified) (1 diff)
• capture/init.c (modified) (2 diffs)
• fileio/fileio.scn (added)
• fileio/init.c (modified) (4 diffs)

testsuites/samples/ChangeLog

@@ +1 @@
+2011-09-16      Sebastian Huber <Sebastian.Huber@embedded-brains.de>
+
+        * fileio/fileio.scn: New file.
+        * capture/init.c, fileio/init.c: Use rtems_shell_wait_for_input().
+
 2011-08-29      Joel Sherrill <joel.sherrilL@OARcorp.com>
 

testsuites/samples/capture/init.c

@@ -34 +34 @@
 #include <rtems/capture-cli.h>
 #include <rtems/monitor.h>
+#include <rtems/shell.h>
 
 volatile int can_proceed = 1;
+
+static void notification(int fd, int seconds_remaining, void *arg)
+{
+  printf(
+    "Press any key to start capture engine (%is remaining)\n",
+    seconds_remaining
+  );
+}
 
 rtems_task Init(
@@ -44 +53 @@
   printf("NO Capture Engine. MEMORY TOO SMALL");
 #else
+  rtems_status_code   status;
   rtems_task_priority old_priority;
   rtems_mode          old_mode;
 
-  /* lower the task priority to allow created tasks to execute */
+  puts( "\n\n*** TEST CAPTURE ENGINE ***" );
 
-  rtems_task_set_priority(RTEMS_SELF, 20, &old_priority);
-  rtems_task_mode(RTEMS_PREEMPT,  RTEMS_PREEMPT_MASK, &old_mode);
+  status = rtems_shell_wait_for_input(
+    STDIN_FILENO,
+    20,
+    notification,
+    NULL
+  );
+  if (status == RTEMS_SUCCESSFUL) {
+    /* lower the task priority to allow created tasks to execute */
 
-  printf( "\n*** CAPTURE ENGINE TEST ***\n" );
+    rtems_task_set_priority(RTEMS_SELF, 20, &old_priority);
+    rtems_task_mode(RTEMS_PREEMPT,  RTEMS_PREEMPT_MASK, &old_mode);
 
-  while (!can_proceed)
-  {
-    printf ("Sleeping\n");
-    usleep (1000000);
+    while (!can_proceed)
+    {
+      printf ("Sleeping\n");
+      usleep (1000000);
+    }
+
+    rtems_monitor_init (0);
+    rtems_capture_cli_init (0);
+
+    setup_tasks_to_watch ();
+
+    rtems_task_delete (RTEMS_SELF);
+  } else {
+    puts( "*** END OF TEST CAPTURE ENGINE ***" );
+
+    exit( 0 );
   }
-
-  rtems_monitor_init (0);
-  rtems_capture_cli_init (0);
-
-  setup_tasks_to_watch ();
-
-  rtems_task_delete (RTEMS_SELF);
 #endif
 }

testsuites/samples/fileio/init.c

@@ -44 +44 @@
 #include <rtems/nvdisk.h>
 #include <rtems/nvdisk-sram.h>
+#include <rtems/shell.h>
 
 #if FILEIO_BUILD
@@ -227 +228 @@
 
 #ifdef USE_SHELL
-#include <rtems/shell.h>
 
 int
@@ -1214 +1214 @@
 }
 
+static void
+notification (int fd, int seconds_remaining, void *arg)
+{
+  printf(
+    "Press any key to start file I/O sample (%is remaining)\n",
+    seconds_remaining
+  );
+}
+
 /*
  * RTEMS Startup Task
@@ -1224 +1233 @@
   rtems_status_code status;
 
-  puts( "\n\n*** FILE I/O SAMPLE AND TEST ***" );
-
-  Task_name = rtems_build_name('F','M','N','U');
-
-  status = rtems_task_create(
-    Task_name, 1, RTEMS_MINIMUM_STACK_SIZE * 2,
-    RTEMS_DEFAULT_MODES ,
-    RTEMS_FLOATING_POINT | RTEMS_DEFAULT_ATTRIBUTES, &Task_id
+  puts( "\n\n*** TEST FILE I/O SAMPLE ***" );
+
+  status = rtems_shell_wait_for_input(
+    STDIN_FILENO,
+    20,
+    notification,
+    NULL
   );
-  directive_failed( status, "create" ); 
-
-  status = rtems_task_start( Task_id, fileio_task, 1 );
-  directive_failed( status, "start" ); 
-
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "delete" ); 
+  if (status == RTEMS_SUCCESSFUL) {
+    Task_name = rtems_build_name('F','M','N','U');
+
+    status = rtems_task_create(
+      Task_name, 1, RTEMS_MINIMUM_STACK_SIZE * 2,
+      RTEMS_DEFAULT_MODES ,
+      RTEMS_FLOATING_POINT | RTEMS_DEFAULT_ATTRIBUTES, &Task_id
+    );
+    directive_failed( status, "create" ); 
+
+    status = rtems_task_start( Task_id, fileio_task, 1 );
+    directive_failed( status, "start" ); 
+
+    status = rtems_task_delete( RTEMS_SELF );
+    directive_failed( status, "delete" ); 
+  } else {
+    puts( "*** END OF TEST FILE I/O SAMPLE ***" );
+
+    rtems_test_exit( 0 );
+  }
 }