<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2011-09-16)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>sh</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-09-16 Sebastian Huber <sebastian.huber@embedded-brains.de>
* libmisc/shell/shell-wait-for-input.c: New file.
* libmisc/Makefile.am: Reflect change above.
* libmisc/shell/shell.h: Declare rtems_shell_wait_for_input().
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2922&r2=text&tr2=1.2923&diff_format=h">M</a></td><td width='1%'>1.2923</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libmisc/Makefile.am.diff?r1=text&tr1=1.90&r2=text&tr2=1.91&diff_format=h">M</a></td><td width='1%'>1.91</td><td width='100%'>cpukit/libmisc/Makefile.am</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libmisc/shell/shell-wait-for-input.c?rev=1.1&content-type=text/vnd.viewcvs-markup">A</a></td><td width='1%'><font color="#000088">1.1</font></td><td width='100%'><font color="#000088">cpukit/libmisc/shell/shell-wait-for-input.c</font></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libmisc/shell/shell.h.diff?r1=text&tr1=1.28&r2=text&tr2=1.29&diff_format=h">M</a></td><td width='1%'>1.29</td><td width='100%'>cpukit/libmisc/shell/shell.h</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2922 rtems/cpukit/ChangeLog:1.2923
--- rtems/cpukit/ChangeLog:1.2922 Thu Sep 15 12:09:15 2011
+++ rtems/cpukit/ChangeLog Fri Sep 16 04:16:31 2011
</font><font color='#997700'>@@ -1,3 +1,9 @@
</font><font color='#000088'>+2011-09-16 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * libmisc/shell/shell-wait-for-input.c: New file.
+ * libmisc/Makefile.am: Reflect change above.
+ * libmisc/shell/shell.h: Declare rtems_shell_wait_for_input().
+
</font> 2011-09-15 Joel Sherrill <joel.sherrill@oarcorp.com>
* score/include/rtems/score/thread.h: Ensure CBS builds with POSIX
<font color='#006600'>diff -u rtems/cpukit/libmisc/Makefile.am:1.90 rtems/cpukit/libmisc/Makefile.am:1.91
--- rtems/cpukit/libmisc/Makefile.am:1.90 Fri May 13 08:46:43 2011
+++ rtems/cpukit/libmisc/Makefile.am Fri Sep 16 04:16:32 2011
</font><font color='#997700'>@@ -103,7 +103,8 @@
</font> shell/hexdump-odsyntax.c shell/hexdump-parse.c shell/hexsyntax.c \
shell/main_time.c shell/main_mknod.c \
shell/main_setenv.c shell/main_getenv.c shell/main_unsetenv.c \
<font color='#880000'>- shell/main_mkrfs.c shell/main_debugrfs.c
</font><font color='#000088'>+ shell/main_mkrfs.c shell/main_debugrfs.c \
+ shell/shell-wait-for-input.c
</font>
if LIBNETWORKING
libshell_a_SOURCES += \
<font color='#006600'>diff -u /dev/null rtems/cpukit/libmisc/shell/shell-wait-for-input.c:1.1
--- /dev/null Fri Sep 16 05:10:28 2011
+++ rtems/cpukit/libmisc/shell/shell-wait-for-input.c Fri Sep 16 04:16:32 2011
</font><font color='#997700'>@@ -0,0 +1,87 @@
</font><font color='#000088'>+/*
+ * Copyright (c) 2011 embedded brains GmbH. All rights reserved.
+ *
+ * embedded brains GmbH
+ * Obere Lagerstr. 30
+ * 82178 Puchheim
+ * Germany
+ * <rtems@embedded-brains.de>
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
+ *
+ * $Id$
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <rtems/shell.h>
+
+#include <termios.h>
+#include <unistd.h>
+
+static rtems_status_code change_serial_settings(int fd, struct termios *term)
+{
+ rtems_status_code sc = RTEMS_UNSATISFIED;
+ int rv = tcgetattr(fd, term);
+
+ if (rv == 0) {
+ struct termios new_term = *term;
+
+ new_term.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON);
+ new_term.c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
+ new_term.c_cflag &= ~(CSIZE | PARENB);
+ new_term.c_cflag |= CS8;
+
+ new_term.c_cc [VMIN] = 0;
+ new_term.c_cc [VTIME] = 10;
+
+ rv = tcsetattr(fd, TCSANOW, &new_term);
+ if (rv == 0) {
+ sc = RTEMS_SUCCESSFUL;
+ }
+ }
+
+ return sc;
+}
+
+static rtems_status_code restore_serial_settings(int fd, struct termios *term)
+{
+ int rv = tcsetattr(fd, TCSANOW, term);
+
+ return rv == 0 ? RTEMS_SUCCESSFUL : RTEMS_UNSATISFIED;
+}
+
+rtems_status_code rtems_shell_wait_for_input(
+ int fd,
+ int timeout_in_seconds,
+ rtems_shell_wait_for_input_notification notification,
+ void *notification_arg
+)
+{
+ struct termios term;
+ rtems_status_code sc = change_serial_settings(fd, &term);
+
+ if (sc == RTEMS_SUCCESSFUL) {
+ bool input_detected = false;
+ int i = 0;
+
+ for (i = 0; i < timeout_in_seconds && !input_detected; ++i) {
+ char c;
+
+ (*notification)(fd, timeout_in_seconds - i, notification_arg);
+
+ input_detected = read(fd, &c, sizeof(c)) > 0;
+ }
+
+ sc = restore_serial_settings(fd, &term);
+ if (sc == RTEMS_SUCCESSFUL) {
+ sc = input_detected ? RTEMS_SUCCESSFUL : RTEMS_TIMEOUT;
+ }
+ }
+
+ return sc;
+}
</font>
<font color='#006600'>diff -u rtems/cpukit/libmisc/shell/shell.h:1.28 rtems/cpukit/libmisc/shell/shell.h:1.29
--- rtems/cpukit/libmisc/shell/shell.h:1.28 Wed Jul 22 10:17:37 2009
+++ rtems/cpukit/libmisc/shell/shell.h Fri Sep 16 04:16:32 2011
</font><font color='#997700'>@@ -285,6 +285,26 @@
</font> */
void rtems_shell_mount_del_fsys(rtems_shell_filesystems_t* fs);
<font color='#000088'>+typedef void (*rtems_shell_wait_for_input_notification)(
+ int fd,
+ int seconds_remaining,
+ void *arg
+);
+
+/**
+ * @brief Waits for input.
+ *
+ * @retval RTEMS_SUCCESSFUL Input detected.
+ * @retval RTEMS_TIMEOUT Timeout expired.
+ * @retval RTEMS_UNSATISFIED Cannot change or restore termios attributes.
+ */
+rtems_status_code rtems_shell_wait_for_input(
+ int fd,
+ int timeout_in_seconds,
+ rtems_shell_wait_for_input_notification notification,
+ void *notification_arg
+);
+
</font> #ifdef __cplusplus
}
#endif
</pre>
<p> </p>
<a name='cs2'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>sh</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>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().
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/samples/ChangeLog.diff?r1=text&tr1=1.193&r2=text&tr2=1.194&diff_format=h">M</a></td><td width='1%'>1.194</td><td width='100%'>testsuites/samples/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/samples/capture/init.c.diff?r1=text&tr1=1.7&r2=text&tr2=1.8&diff_format=h">M</a></td><td width='1%'>1.8</td><td width='100%'>testsuites/samples/capture/init.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/samples/fileio/fileio.scn?rev=1.1&content-type=text/vnd.viewcvs-markup">A</a></td><td width='1%'><font color="#000088">1.1</font></td><td width='100%'><font color="#000088">testsuites/samples/fileio/fileio.scn</font></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/samples/fileio/init.c.diff?r1=text&tr1=1.34&r2=text&tr2=1.35&diff_format=h">M</a></td><td width='1%'>1.35</td><td width='100%'>testsuites/samples/fileio/init.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/testsuites/samples/ChangeLog:1.193 rtems/testsuites/samples/ChangeLog:1.194
--- rtems/testsuites/samples/ChangeLog:1.193 Mon Aug 29 12:18:42 2011
+++ rtems/testsuites/samples/ChangeLog Fri Sep 16 04:23:19 2011
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+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().
+
</font> 2011-08-29 Joel Sherrill <joel.sherrilL@OARcorp.com>
* ticker/system.h: Remove unneeded include.
<font color='#006600'>diff -u rtems/testsuites/samples/capture/init.c:1.7 rtems/testsuites/samples/capture/init.c:1.8
--- rtems/testsuites/samples/capture/init.c:1.7 Tue Feb 22 04:54:32 2011
+++ rtems/testsuites/samples/capture/init.c Fri Sep 16 04:23:19 2011
</font><font color='#997700'>@@ -33,9 +33,18 @@
</font> #include <rtems.h>
#include <rtems/capture-cli.h>
#include <rtems/monitor.h>
<font color='#000088'>+#include <rtems/shell.h>
</font>
volatile int can_proceed = 1;
<font color='#000088'>+static void notification(int fd, int seconds_remaining, void *arg)
+{
+ printf(
+ "Press any key to start capture engine (%is remaining)\n",
+ seconds_remaining
+ );
+}
+
</font> rtems_task Init(
rtems_task_argument ignored
)
<font color='#997700'>@@ -43,27 +52,40 @@
</font> #if BSP_SMALL_MEMORY
printf("NO Capture Engine. MEMORY TOO SMALL");
#else
<font color='#000088'>+ rtems_status_code status;
</font> rtems_task_priority old_priority;
rtems_mode old_mode;
<font color='#880000'>- /* lower the task priority to allow created tasks to execute */
-
- rtems_task_set_priority(RTEMS_SELF, 20, &old_priority);
- rtems_task_mode(RTEMS_PREEMPT, RTEMS_PREEMPT_MASK, &old_mode);
</font><font color='#000088'>+ puts( "\n\n*** TEST CAPTURE ENGINE ***" );
</font>
<font color='#880000'>- printf( "\n*** CAPTURE ENGINE TEST ***\n" );
</font><font color='#000088'>+ 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 */
+
+ 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);
+ }
+
+ 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 ***" );
</font>
<font color='#880000'>- while (!can_proceed)
- {
- printf ("Sleeping\n");
- usleep (1000000);
</font><font color='#000088'>+ exit( 0 );
</font> }
<font color='#880000'>-
- rtems_monitor_init (0);
- rtems_capture_cli_init (0);
-
- setup_tasks_to_watch ();
-
- rtems_task_delete (RTEMS_SELF);
</font> #endif
}
<font color='#006600'>diff -u /dev/null rtems/testsuites/samples/fileio/fileio.scn:1.1
--- /dev/null Fri Sep 16 05:10:28 2011
+++ rtems/testsuites/samples/fileio/fileio.scn Fri Sep 16 04:23:19 2011
</font><font color='#997700'>@@ -0,0 +1,22 @@
</font><font color='#000088'>+*** TEST FILE I/O SAMPLE ***
+Press any key to start file I/O sample (20s remaining)
+Press any key to start file I/O sample (19s remaining)
+Press any key to start file I/O sample (18s remaining)
+Press any key to start file I/O sample (17s remaining)
+Press any key to start file I/O sample (16s remaining)
+Press any key to start file I/O sample (15s remaining)
+Press any key to start file I/O sample (14s remaining)
+Press any key to start file I/O sample (13s remaining)
+Press any key to start file I/O sample (12s remaining)
+Press any key to start file I/O sample (11s remaining)
+Press any key to start file I/O sample (10s remaining)
+Press any key to start file I/O sample (9s remaining)
+Press any key to start file I/O sample (8s remaining)
+Press any key to start file I/O sample (7s remaining)
+Press any key to start file I/O sample (6s remaining)
+Press any key to start file I/O sample (5s remaining)
+Press any key to start file I/O sample (4s remaining)
+Press any key to start file I/O sample (3s remaining)
+Press any key to start file I/O sample (2s remaining)
+Press any key to start file I/O sample (1s remaining)
+*** END OF TEST FILE I/O SAMPLE ***
</font>
<font color='#006600'>diff -u rtems/testsuites/samples/fileio/init.c:1.34 rtems/testsuites/samples/fileio/init.c:1.35
--- rtems/testsuites/samples/fileio/init.c:1.34 Sun Jul 3 19:34:00 2011
+++ rtems/testsuites/samples/fileio/init.c Fri Sep 16 04:23:19 2011
</font><font color='#997700'>@@ -43,6 +43,7 @@
</font> #include <rtems/ramdisk.h>
#include <rtems/nvdisk.h>
#include <rtems/nvdisk-sram.h>
<font color='#000088'>+#include <rtems/shell.h>
</font>
#if FILEIO_BUILD
<font color='#997700'>@@ -226,7 +227,6 @@
</font> #define USE_SHELL
#ifdef USE_SHELL
<font color='#880000'>-#include <rtems/shell.h>
</font>
int
shell_nvdisk_trace (int argc, char* argv[])
<font color='#997700'>@@ -1213,6 +1213,15 @@
</font> fileio_menu();
}
<font color='#000088'>+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
+ );
+}
+
</font> /*
* RTEMS Startup Task
*/
<font color='#997700'>@@ -1223,22 +1232,34 @@
</font> rtems_id Task_id;
rtems_status_code status;
<font color='#880000'>- puts( "\n\n*** FILE I/O SAMPLE AND TEST ***" );
</font><font color='#000088'>+ puts( "\n\n*** TEST FILE I/O SAMPLE ***" );
</font>
<font color='#880000'>- 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
</font><font color='#000088'>+ status = rtems_shell_wait_for_input(
+ STDIN_FILENO,
+ 20,
+ notification,
+ NULL
</font> );
<font color='#880000'>- directive_failed( status, "create" );<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+ if (status == RTEMS_SUCCESSFUL) {
+ Task_name = rtems_build_name('F','M','N','U');
</font>
<font color='#880000'>- status = rtems_task_start( Task_id, fileio_task, 1 );
- directive_failed( status, "start" );<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+ 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" );<span style="background-color: #FF0000"> </span>
+
+ status = rtems_task_start( Task_id, fileio_task, 1 );
+ directive_failed( status, "start" );<span style="background-color: #FF0000"> </span>
+
+ status = rtems_task_delete( RTEMS_SELF );
+ directive_failed( status, "delete" );<span style="background-color: #FF0000"> </span>
+ } else {
+ puts( "*** END OF TEST FILE I/O SAMPLE ***" );
</font>
<font color='#880000'>- status = rtems_task_delete( RTEMS_SELF );
- directive_failed( status, "delete" );<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+ rtems_test_exit( 0 );
+ }
</font> }
#if defined(USE_SHELL)
</pre>
<p> </p>
<a name='cs3'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>sh</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>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().
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/libtests/ChangeLog.diff?r1=text&tr1=1.275&r2=text&tr2=1.276&diff_format=h">M</a></td><td width='1%'>1.276</td><td width='100%'>testsuites/libtests/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/libtests/monitor/init.c.diff?r1=text&tr1=1.11&r2=text&tr2=1.12&diff_format=h">M</a></td><td width='1%'>1.12</td><td width='100%'>testsuites/libtests/monitor/init.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/libtests/monitor/monitor.scn?rev=1.1&content-type=text/vnd.viewcvs-markup">A</a></td><td width='1%'><font color="#000088">1.1</font></td><td width='100%'><font color="#000088">testsuites/libtests/monitor/monitor.scn</font></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/libtests/termios/init.c.diff?r1=text&tr1=1.17&r2=text&tr2=1.18&diff_format=h">M</a></td><td width='1%'>1.18</td><td width='100%'>testsuites/libtests/termios/init.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/testsuites/libtests/termios/termios.scn?rev=1.1&content-type=text/vnd.viewcvs-markup">A</a></td><td width='1%'><font color="#000088">1.1</font></td><td width='100%'><font color="#000088">testsuites/libtests/termios/termios.scn</font></td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/testsuites/libtests/ChangeLog:1.275 rtems/testsuites/libtests/ChangeLog:1.276
--- rtems/testsuites/libtests/ChangeLog:1.275 Fri Sep 2 08:41:55 2011
+++ rtems/testsuites/libtests/ChangeLog Fri Sep 16 04:24:52 2011
</font><font color='#997700'>@@ -1,3 +1,8 @@
</font><font color='#000088'>+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().
+
</font> 2011-09-02 Sebastian Huber <sebastian.huber@embedded-brains.de>
* stackchk/init.c, stackchk/system.h, stackchk/stackchk.scn: Print end
<font color='#006600'>diff -u rtems/testsuites/libtests/monitor/init.c:1.11 rtems/testsuites/libtests/monitor/init.c:1.12
--- rtems/testsuites/libtests/monitor/init.c:1.11 Tue Feb 22 01:34:07 2011
+++ rtems/testsuites/libtests/monitor/init.c Fri Sep 16 04:24:52 2011
</font><font color='#997700'>@@ -21,6 +21,7 @@
</font> #include "system.h"
#include <rtems/monitor.h>
<font color='#000088'>+#include <rtems/shell.h>
</font>
rtems_task_priority Priorities[6] = { 0, 1, 1, 3, 4, 5 };
<font color='#997700'>@@ -36,7 +37,13 @@
</font> }
}
<font color='#880000'>-
</font><font color='#000088'>+static void notification(int fd, int seconds_remaining, void *arg)
+{
+ printf(
+ "Press any key to enter monitor (%is remaining)\n",
+ seconds_remaining
+ );
+}
</font>
rtems_task Init(
rtems_task_argument argument
<font color='#997700'>@@ -45,7 +52,7 @@
</font> uint32_t index;
rtems_status_code status;
<font color='#880000'>- puts( "\n\n*** MONITOR TASK TEST ***" );
</font><font color='#000088'>+ puts( "\n\n*** TEST MONITOR ***" );
</font>
Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' );
Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' );
<font color='#997700'>@@ -70,8 +77,20 @@
</font> directive_failed( status, "rtems_task_start loop" );
}
<font color='#880000'>- rtems_monitor_init( 0 );
</font><font color='#000088'>+ 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" );
+ } else {
+ puts( "*** END OF TEST MONITOR ***" );
</font>
<font color='#880000'>- status = rtems_task_delete( RTEMS_SELF );
- directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
</font><font color='#000088'>+ rtems_test_exit( 0 );
+ }
</font> }
<font color='#006600'>diff -u /dev/null rtems/testsuites/libtests/monitor/monitor.scn:1.1
--- /dev/null Fri Sep 16 05:10:28 2011
+++ rtems/testsuites/libtests/monitor/monitor.scn Fri Sep 16 04:24:52 2011
</font><font color='#997700'>@@ -0,0 +1,22 @@
</font><font color='#000088'>+*** TEST MONITOR ***
+Press any key to enter monitor (20s remaining)
+Press any key to enter monitor (19s remaining)
+Press any key to enter monitor (18s remaining)
+Press any key to enter monitor (17s remaining)
+Press any key to enter monitor (16s remaining)
+Press any key to enter monitor (15s remaining)
+Press any key to enter monitor (14s remaining)
+Press any key to enter monitor (13s remaining)
+Press any key to enter monitor (12s remaining)
+Press any key to enter monitor (11s remaining)
+Press any key to enter monitor (10s remaining)
+Press any key to enter monitor (9s remaining)
+Press any key to enter monitor (8s remaining)
+Press any key to enter monitor (7s remaining)
+Press any key to enter monitor (6s remaining)
+Press any key to enter monitor (5s remaining)
+Press any key to enter monitor (4s remaining)
+Press any key to enter monitor (3s remaining)
+Press any key to enter monitor (2s remaining)
+Press any key to enter monitor (1s remaining)
+*** END OF TEST MONITOR ***
</font>
<font color='#006600'>diff -u rtems/testsuites/libtests/termios/init.c:1.17 rtems/testsuites/libtests/termios/init.c:1.18
--- rtems/testsuites/libtests/termios/init.c:1.17 Tue Feb 22 01:34:08 2011
+++ rtems/testsuites/libtests/termios/init.c Fri Sep 16 04:24:52 2011
</font><font color='#997700'>@@ -43,6 +43,7 @@
</font> rtems_task Init (rtems_task_argument argument);
#include <rtems/confdefs.h>
<font color='#000088'>+#include <rtems/shell.h>
</font>
#include <stdio.h>
#include <unistd.h>
<font color='#997700'>@@ -711,6 +712,13 @@
</font> printf( "Enter your choice (1 to 5 or 9, followed by a carriage return): " );
}
<font color='#000088'>+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
+ );
+}
</font>
/*
* RTEMS Startup Task
<font color='#997700'>@@ -718,61 +726,74 @@
</font> rtems_task
Init (rtems_task_argument ignored)
{
<font color='#000088'>+ rtems_status_code status;
</font> char c ;
struct termios orig_termios, test_termios;
<font color='#880000'>- printf( "\n\n*** TEST OF TERMIOS INPUT CAPABILITIES ***\n" );
-
- if( tcgetattr( fileno( stdin ), &orig_termios ) < 0 ) {
- perror( "tcgetattr() failed" );
- rtems_test_exit( 0 );
- }
-
- test_termios = orig_termios;
</font><font color='#000088'>+ puts( "\n\n*** TEST TERMIOS INPUT CAPABILITIES ***" );
</font>
<font color='#880000'>- 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;
</font><font color='#000088'>+ 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 );
+ }
</font>
<font color='#880000'>- case '4':
- canonical_input( &test_termios );
- usage();
- break;
</font><font color='#000088'>+ test_termios = orig_termios;
</font>
<font color='#880000'>- case '5':
- raw_input( &test_termios );
- usage();
- break;
</font><font color='#000088'>+ 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;
</font>
<font color='#880000'>- case '9':
- rtems_test_exit( 1 );
</font><font color='#000088'>+ case '9':
+ rtems_test_exit( 1 );
</font>
<font color='#880000'>- case '\n':
- break;
</font><font color='#000088'>+ case '\n':
+ break;
</font>
<font color='#880000'>- default:
- printf( "\n%c is not a valid choice. Try again\n\n", c );
- usage();
- break;
</font><font color='#000088'>+ default:
+ printf( "\n%c is not a valid choice. Try again\n\n", c );
+ usage();
+ break;
+ }
</font> }
<font color='#000088'>+ } else {
+ puts( "*** END OF TEST TERMIOS INPUT CAPABILITIES ***" );
+
+ rtems_test_exit( 0 );
</font> }
}
<font color='#006600'>diff -u /dev/null rtems/testsuites/libtests/termios/termios.scn:1.1
--- /dev/null Fri Sep 16 05:10:29 2011
+++ rtems/testsuites/libtests/termios/termios.scn Fri Sep 16 04:24:52 2011
</font><font color='#997700'>@@ -0,0 +1,22 @@
</font><font color='#000088'>+*** TEST TERMIOS INPUT CAPABILITIES ***
+Press any key to check the termios input capabilities (20s remaining)
+Press any key to check the termios input capabilities (19s remaining)
+Press any key to check the termios input capabilities (18s remaining)
+Press any key to check the termios input capabilities (17s remaining)
+Press any key to check the termios input capabilities (16s remaining)
+Press any key to check the termios input capabilities (15s remaining)
+Press any key to check the termios input capabilities (14s remaining)
+Press any key to check the termios input capabilities (13s remaining)
+Press any key to check the termios input capabilities (12s remaining)
+Press any key to check the termios input capabilities (11s remaining)
+Press any key to check the termios input capabilities (10s remaining)
+Press any key to check the termios input capabilities (9s remaining)
+Press any key to check the termios input capabilities (8s remaining)
+Press any key to check the termios input capabilities (7s remaining)
+Press any key to check the termios input capabilities (6s remaining)
+Press any key to check the termios input capabilities (5s remaining)
+Press any key to check the termios input capabilities (4s remaining)
+Press any key to check the termios input capabilities (3s remaining)
+Press any key to check the termios input capabilities (2s remaining)
+Press any key to check the termios input capabilities (1s remaining)
+*** END OF TEST TERMIOS INPUT CAPABILITIES ***
</font></pre>
<p> </p>
<a name='cs4'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>sh</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2011-09-16 Sebastian Huber <sebastian.huber@embedded-brains.de>
* rtems/score/arm.h: More CPU_MODEL_NAME variants.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/cpu/arm/ChangeLog.diff?r1=text&tr1=1.130&r2=text&tr2=1.131&diff_format=h">M</a></td><td width='1%'>1.131</td><td width='100%'>cpukit/score/cpu/arm/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/cpu/arm/rtems/score/arm.h.diff?r1=text&tr1=1.19&r2=text&tr2=1.20&diff_format=h">M</a></td><td width='1%'>1.20</td><td width='100%'>cpukit/score/cpu/arm/rtems/score/arm.h</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/score/cpu/arm/ChangeLog:1.130 rtems/cpukit/score/cpu/arm/ChangeLog:1.131
--- rtems/cpukit/score/cpu/arm/ChangeLog:1.130 Wed May 18 00:18:22 2011
+++ rtems/cpukit/score/cpu/arm/ChangeLog Fri Sep 16 04:47:09 2011
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2011-09-16 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * rtems/score/arm.h: More CPU_MODEL_NAME variants.
+
</font> 2011-05-18 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Reformat.
<font color='#006600'>diff -u rtems/cpukit/score/cpu/arm/rtems/score/arm.h:1.19 rtems/cpukit/score/cpu/arm/rtems/score/arm.h:1.20
--- rtems/cpukit/score/cpu/arm/rtems/score/arm.h:1.19 Mon May 10 15:29:13 2010
+++ rtems/cpukit/score/cpu/arm/rtems/score/arm.h Fri Sep 16 04:47:09 2011
</font><font color='#997700'>@@ -66,6 +66,15 @@
</font> #elif defined(__ARM_ARCH_6J__)
# define CPU_MODEL_NAME "ARMv6J"
<font color='#000088'>+#elif defined(__ARM_ARCH_6M__)
+# define CPU_MODEL_NAME "ARMv6M"
+
+#elif defined(__ARM_ARCH_7__)
+# define CPU_MODEL_NAME "ARMv7"
+
+#elif defined(__ARM_ARCH_7M__)
+# define CPU_MODEL_NAME "ARMv7M"
+
</font> #elif defined(__ARM_ARCH_7A__)
# define CPU_MODEL_NAME "ARMv7A"
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>