Changeset 11b9b5d in rtems

Timestamp:

09/16/11 09:24:52 (12 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

3ce764a

Parents:

7c9d27e

Message:

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

• monitor/monitor.scn, termios/termios.scn: New files.
• monitor/init.c, termios01/init.c: Use rtems_shell_wait_for_input().

Location:

testsuites/libtests

Files:

• ChangeLog (modified) (1 diff)
• monitor/init.c (modified) (4 diffs)
• monitor/monitor.scn (added)
• termios/init.c (modified) (3 diffs)
• termios/termios.scn (added)

testsuites/libtests/ChangeLog

@@ +1 @@
+2011-09-16      Sebastian Huber <Sebastian.Huber@embedded-brains.de>
+
+        * monitor/monitor.scn, termios/termios.scn: New files.
+        * monitor/init.c, termios01/init.c: Use rtems_shell_wait_for_input().
+
 2011-09-02      Sebastian Huber <sebastian.huber@embedded-brains.de>
 

testsuites/libtests/monitor/init.c

@@ -22 +22 @@
 
 #include <rtems/monitor.h>
+#include <rtems/shell.h>
 
 rtems_task_priority Priorities[6] = { 0,   1,   1,   3,   4,   5 };
@@ -37 +38 @@
 }
 
-
+static void notification(int fd, int seconds_remaining, void *arg)
+{
+  printf(
+    "Press any key to enter monitor (%is remaining)\n",
+    seconds_remaining
+  );
+}
 
 rtems_task Init(
@@ -46 +53 @@
   rtems_status_code status;
 
-  puts( "\n\n*** MONITOR TASK TEST ***" );
+  puts( "\n\n*** TEST MONITOR ***" );
 
   Task_name[ 1 ] =  rtems_build_name( 'T', 'A', '1', ' ' );
@@ -71 +78 @@
   }
 
-  rtems_monitor_init( 0 );
+  status = rtems_shell_wait_for_input(
+    STDIN_FILENO,
+    20,
+    notification,
+    NULL
+  );
+  if (status == RTEMS_SUCCESSFUL) {
+    rtems_monitor_init( 0 );
 
-  status = rtems_task_delete( RTEMS_SELF );
-  directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+    status = rtems_task_delete( RTEMS_SELF );
+    directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
+  } else {
+    puts( "*** END OF TEST MONITOR ***" );
+
+    rtems_test_exit( 0 );
+  }
 }

testsuites/libtests/termios/init.c

@@ -44 +44 @@
 
 #include <rtems/confdefs.h>
+#include <rtems/shell.h>
 
 #include <stdio.h>
@@ -712 +713 @@
 }
 
+static void notification( int fd, int seconds_remaining, void *arg )
+{
+  printf(
+    "Press any key to check the termios input capabilities (%is remaining)\n",
+    seconds_remaining
+  );
+}
 
 /*
@@ -719 +727 @@
 Init (rtems_task_argument ignored)
 {
+  rtems_status_code status;
   char c ;
   struct termios orig_termios, test_termios;
 
-  printf( "\n\n*** TEST OF TERMIOS INPUT CAPABILITIES ***\n" );
-
-  if( tcgetattr( fileno( stdin ), &orig_termios ) < 0 ) {
-    perror( "tcgetattr() failed" );
+  puts( "\n\n*** TEST TERMIOS INPUT CAPABILITIES ***" );
+
+  status = rtems_shell_wait_for_input(
+    STDIN_FILENO,
+    20,
+    notification,
+    NULL
+  );
+  if (status == RTEMS_SUCCESSFUL) {
+    if( tcgetattr( fileno( stdin ), &orig_termios ) < 0 ) {
+      perror( "tcgetattr() failed" );
+      rtems_test_exit( 0 );
+    }
+
+    test_termios = orig_termios;
+
+    usage();
+    for(;;) {
+      switch( c = getchar() ) {
+        case '1':
+          printf( "\nResetting the line to the original termios setting\n\n" );
+          test_termios = orig_termios;
+          if( tcsetattr( fileno( stdin ), TCSADRAIN, &test_termios ) < 0 ) {
+            perror( "tcsetattr() failed" );
+            rtems_test_exit( 1 );
+          }
+          usage();
+          break;
+
+        case '2':
+          print_termios( &test_termios );
+          usage();
+          break;
+
+        case '3':
+          change_line_settings( &test_termios );
+          usage();
+          break;
+
+        case '4':
+          canonical_input( &test_termios );
+          usage();
+          break;
+
+        case '5':
+          raw_input( &test_termios );
+          usage();
+          break;
+
+        case '9':
+          rtems_test_exit( 1 );
+
+        case '\n':
+          break;
+
+        default:
+          printf( "\n%c is not a valid choice. Try again\n\n", c );
+          usage();
+          break;
+      }
+    }
+  } else {
+    puts( "*** END OF TEST TERMIOS INPUT CAPABILITIES ***" );
+
     rtems_test_exit( 0 );
   }
-
-  test_termios = orig_termios;
-
-  usage();
-  for(;;) {
-    switch( c = getchar() ) {
-      case '1':
-        printf( "\nResetting the line to the original termios setting\n\n" );
-        test_termios = orig_termios;
-        if( tcsetattr( fileno( stdin ), TCSADRAIN, &test_termios ) < 0 ) {
-          perror( "tcsetattr() failed" );
-          rtems_test_exit( 1 );
-        }
-        usage();
-        break;
-
-      case '2':
-        print_termios( &test_termios );
-        usage();
-        break;
-
-      case '3':
-        change_line_settings( &test_termios );
-        usage();
-        break;
-
-      case '4':
-        canonical_input( &test_termios );
-        usage();
-        break;
-
-      case '5':
-        raw_input( &test_termios );
-        usage();
-        break;
-
-      case '9':
-        rtems_test_exit( 1 );
-
-      case '\n':
-        break;
-
-      default:
-        printf( "\n%c is not a valid choice. Try again\n\n", c );
-        usage();
-        break;
-    }
-  }
-}
+}