From 3324383ce03f3d70a652f99291209e768d89c691 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 5 May 2014 09:47:30 -0500 Subject: testsuites: Remove BSP_SMALL_MEMORY --- testsuites/samples/capture/init.c | 10 +--------- testsuites/samples/capture/test1.c | 2 -- testsuites/samples/fileio/system.h | 5 +---- testsuites/samples/iostream/init.cc | 8 -------- testsuites/samples/loopback/init.c | 13 ------------- testsuites/samples/paranoia/init.c | 5 ----- testsuites/samples/paranoia/paranoia.c | 2 -- testsuites/samples/pppd/init.c | 6 ------ testsuites/samples/pppd/pppdapp.c | 4 ---- 9 files changed, 2 insertions(+), 53 deletions(-) (limited to 'testsuites/samples') diff --git a/testsuites/samples/capture/init.c b/testsuites/samples/capture/init.c index 956cc1ab34..a10ccc5ba2 100644 --- a/testsuites/samples/capture/init.c +++ b/testsuites/samples/capture/init.c @@ -24,15 +24,12 @@ /* forward declarations to avoid warnings */ rtems_task Init(rtems_task_argument argument); -#if !BSP_SMALL_MEMORY - static void notification(int fd, int seconds_remaining, void *arg); -#endif +static void notification(int fd, int seconds_remaining, void *arg); const char rtems_test_name[] = "CAPTURE ENGINE"; volatile int can_proceed = 1; -#if !BSP_SMALL_MEMORY static void notification(int fd, int seconds_remaining, void *arg) { printf( @@ -40,15 +37,11 @@ static void notification(int fd, int seconds_remaining, void *arg) seconds_remaining ); } -#endif rtems_task Init( rtems_task_argument ignored ) { -#if BSP_SMALL_MEMORY - printf("NO Capture Engine. MEMORY TOO SMALL"); -#else rtems_status_code status; rtems_task_priority old_priority; rtems_mode old_mode; @@ -84,5 +77,4 @@ rtems_task Init( exit( 0 ); } -#endif } diff --git a/testsuites/samples/capture/test1.c b/testsuites/samples/capture/test1.c index 7bc0ab76c4..eeb85b552a 100644 --- a/testsuites/samples/capture/test1.c +++ b/testsuites/samples/capture/test1.c @@ -26,7 +26,6 @@ #include #include -#if !BSP_SMALL_MEMORY static volatile int capture_CT1a_deleted; static volatile int capture_CT1b_deleted; static volatile int capture_CT1c_deleted; @@ -271,4 +270,3 @@ void setup_tasks_to_watch (void) cmd++) rtems_monitor_insert_cmd (&capture_cmds[cmd]); } -#endif /* BSP_SMALL_MEMORY */ diff --git a/testsuites/samples/fileio/system.h b/testsuites/samples/fileio/system.h index 568e7d69ca..8e3fa9e6de 100644 --- a/testsuites/samples/fileio/system.h +++ b/testsuites/samples/fileio/system.h @@ -29,11 +29,8 @@ rtems_task Init( #include /* for device driver prototypes */ #define FILEIO_BUILD 1 -#if BSP_SMALL_MEMORY -#undef FILEIO_BUILD -#endif -#if defined(RTEMS_BSP_HAS_IDE_DRIVER) && !BSP_SMALL_MEMORY +#if defined(RTEMS_BSP_HAS_IDE_DRIVER) #include /* for ata driver prototype */ #include /* for general ide driver prototype */ #endif diff --git a/testsuites/samples/iostream/init.cc b/testsuites/samples/iostream/init.cc index 610e73f03b..d987750c4e 100644 --- a/testsuites/samples/iostream/init.cc +++ b/testsuites/samples/iostream/init.cc @@ -21,11 +21,7 @@ #define CONFIGURE_INIT #include "system.h" -#if BSP_SMALL_MEMORY -#include -#else #include -#endif #include @@ -35,14 +31,10 @@ rtems_task Init( rtems_task_argument ignored ) { -#if BSP_SMALL_MEMORY - printf ("NO STDC++. MEMORY TOO SMALL"); -#else std::cout << std::endl << std::endl << "*** BEGIN OF " << rtems_test_name << " TEST ***" << std::endl; std::cout << "Hello World" << std::endl; std::cout << "*** END OF " << rtems_test_name << " TEST ***" << std::endl; -#endif exit( 0 ); } diff --git a/testsuites/samples/loopback/init.c b/testsuites/samples/loopback/init.c index aed42e6e5e..8819561721 100644 --- a/testsuites/samples/loopback/init.c +++ b/testsuites/samples/loopback/init.c @@ -41,8 +41,6 @@ rtems_task Init(rtems_task_argument argument); #include -#if !BSP_SMALL_MEMORY - #include #include #include @@ -286,14 +284,3 @@ Init (rtems_task_argument ignored) rtems_test_end(); exit( 0 ); } -#else -#include -/* - * RTEMS Startup Task - */ -rtems_task -Init (rtems_task_argument ignored) -{ - printf("NO NETWORKING. MEMORY TOO SMALL"); -} -#endif diff --git a/testsuites/samples/paranoia/init.c b/testsuites/samples/paranoia/init.c index 576f5182be..3718af4cfd 100644 --- a/testsuites/samples/paranoia/init.c +++ b/testsuites/samples/paranoia/init.c @@ -31,10 +31,6 @@ rtems_task Init( * is required by this CPU. */ -#if BSP_SMALL_MEMORY - printf("NO Paranoia Test. MEMORY TOO SMALL"); -#else - #if (defined (m68040)) M68KFPSPInstallExceptionHandlers (); #endif @@ -42,6 +38,5 @@ rtems_task Init( rtems_test_begin(); paranoia(1, args); rtems_test_end(); -#endif /* BSP_SMALL_MEMORY */ exit( 0 ); } diff --git a/testsuites/samples/paranoia/paranoia.c b/testsuites/samples/paranoia/paranoia.c index 400063167a..0c207533f4 100644 --- a/testsuites/samples/paranoia/paranoia.c +++ b/testsuites/samples/paranoia/paranoia.c @@ -3,7 +3,6 @@ #endif #include -#if !BSP_SMALL_MEMORY /* * A C version of Kahan's Floating Point Test "Paranoia" * @@ -2308,4 +2307,3 @@ History () msglist (hist); } -#endif /* BSP_SMALL_MEMORY */ diff --git a/testsuites/samples/pppd/init.c b/testsuites/samples/pppd/init.c index f2f17f036f..938eec5d12 100644 --- a/testsuites/samples/pppd/init.c +++ b/testsuites/samples/pppd/init.c @@ -18,25 +18,19 @@ #define CONFIGURE_INIT #include "system.h" -#if !BSP_SMALL_MEMORY #include #include #include "netconfig.h" -#endif const char rtems_test_name[] = "PPPD"; rtems_task Init(rtems_task_argument argument) { -#if BSP_SMALL_MEMORY - printf("NO NETWORKING. MEMORY TOO SMALL"); -#else rtems_test_begin(); /* initialize network */ rtems_bsdnet_initialize_network(); rtems_pppd_initialize(); pppdapp_initialize(); -#endif rtems_task_delete(RTEMS_SELF); } diff --git a/testsuites/samples/pppd/pppdapp.c b/testsuites/samples/pppd/pppdapp.c index 529912ae28..0eb789d82a 100644 --- a/testsuites/samples/pppd/pppdapp.c +++ b/testsuites/samples/pppd/pppdapp.c @@ -5,8 +5,6 @@ #include -#if !BSP_SMALL_MEMORY - #include #include #include "system.h" @@ -152,5 +150,3 @@ int pppdapp_initialize(void) return ( iReturn ); } - -#endif -- cgit v1.2.3