diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-26 13:22:58 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-26 13:22:58 +0000 |
| commit | 7173c43715dd75ac7c586bd3b5973a0b7819ce8b (patch) | |
| tree | 654cba9c48f830249307f7f296a2ffaa0e5f7f09 /testsuites/samples | |
| parent | 2009-08-26 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-7173c43715dd75ac7c586bd3b5973a0b7819ce8b.tar.bz2 | |
2009-08-26 Joel Sherrill <joel.sherrill@oarcorp.com>
* hello/Makefile.am, hello/init.c: Simplify.
* hello/system.h: Removed.
Diffstat (limited to 'testsuites/samples')
| -rw-r--r-- | testsuites/samples/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuites/samples/hello/Makefile.am | 2 | ||||
| -rw-r--r-- | testsuites/samples/hello/init.c | 18 | ||||
| -rw-r--r-- | testsuites/samples/hello/system.h | 40 |
4 files changed, 22 insertions, 43 deletions
diff --git a/testsuites/samples/ChangeLog b/testsuites/samples/ChangeLog index 63f8b29d07..d959a0a12c 100644 --- a/testsuites/samples/ChangeLog +++ b/testsuites/samples/ChangeLog @@ -1,3 +1,8 @@ +2009-08-26 Joel Sherrill <joel.sherrill@oarcorp.com> + + * hello/Makefile.am, hello/init.c: Simplify. + * hello/system.h: Removed. + 2009-08-21 Xi Yang <hiyangxi@gmail.com> * unlimited/test2.c: Fix spacing. diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am index 7a1a2d0587..e7b019be30 100644 --- a/testsuites/samples/hello/Makefile.am +++ b/testsuites/samples/hello/Makefile.am @@ -5,7 +5,7 @@ MANAGERS = io semaphore rtems_tests_PROGRAMS = hello -hello_SOURCES = init.c system.h +hello_SOURCES = init.c dist_rtems_tests_DATA = hello.scn dist_rtems_tests_DATA += hello.doc diff --git a/testsuites/samples/hello/init.c b/testsuites/samples/hello/init.c index e02a23cfa6..9545309e7c 100644 --- a/testsuites/samples/hello/init.c +++ b/testsuites/samples/hello/init.c @@ -20,8 +20,8 @@ * $Id$ */ -#define CONFIGURE_INIT -#include "system.h" +#include <bsp.h> /* for device driver prototypes */ + #include <stdio.h> #include <stdlib.h> @@ -29,8 +29,22 @@ rtems_task Init( rtems_task_argument ignored ) { +devFS_Show(); printf( "\n\n*** HELLO WORLD TEST ***\n" ); printf( "Hello World\n" ); printf( "*** END OF HELLO WORLD TEST ***\n" ); exit( 0 ); } + + +/* NOTICE: the clock driver is explicitly disabled */ +#define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 1 +#define CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM + +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE + +#define CONFIGURE_INIT +#include <rtems/confdefs.h> diff --git a/testsuites/samples/hello/system.h b/testsuites/samples/hello/system.h deleted file mode 100644 index 1d5ac2ae33..0000000000 --- a/testsuites/samples/hello/system.h +++ /dev/null @@ -1,40 +0,0 @@ -/* system.h - * - * This include file contains information that is included in every - * function in the test set. - * - * COPYRIGHT (c) 1989-1999. - * On-Line Applications Research Corporation (OAR). - * - * 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$ - */ - -#include <rtems.h> - -/* functions */ - -rtems_task Init( - rtems_task_argument argument -); - -/* configuration information */ - -#include <bsp.h> /* for device driver prototypes */ - -/* NOTICE: the clock driver is explicitly disabled */ -#define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER -#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER - -#define CONFIGURE_MAXIMUM_TASKS 1 - -#define CONFIGURE_RTEMS_INIT_TASKS_TABLE - -#define CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM - -#include <rtems/confdefs.h> - -/* end of include file */ |