From b1274bd94c94520ed9402f85c949976d7008093e Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 30 Nov 2009 03:33:25 +0000 Subject: Whitespace removal. --- testsuites/sptests/sp01/task1.c | 2 +- testsuites/sptests/sp07/tcreate.c | 2 +- testsuites/sptests/sp07/tdelete.c | 2 +- testsuites/sptests/sp07/trestart.c | 2 +- testsuites/sptests/sp07/tstart.c | 2 +- testsuites/sptests/sp09/screen01.c | 2 +- testsuites/sptests/sp09/screen03.c | 2 +- testsuites/sptests/sp09/screen04.c | 2 +- testsuites/sptests/sp09/screen05.c | 2 +- testsuites/sptests/sp09/screen14.c | 6 ++-- testsuites/sptests/sp10/init.c | 6 ++-- testsuites/sptests/sp12/pritask.c | 2 +- testsuites/sptests/sp16/task5.c | 2 +- testsuites/sptests/sp18/init.c | 4 +-- testsuites/sptests/sp27/init.c | 2 +- testsuites/sptests/sp28/init.c | 6 ++-- testsuites/sptests/sp33/init.c | 10 +++---- testsuites/sptests/sp34/changepri.c | 14 +++++----- testsuites/sptests/sp35/priinv.c | 32 +++++++++++----------- testsuites/sptests/sp36/strict_order_mut.c | 22 +++++++-------- testsuites/sptests/sp37/init.c | 8 +++--- testsuites/sptests/sp38/init.c | 2 +- testsuites/sptests/sp39/init.c | 4 +-- testsuites/sptests/sp42/init.c | 26 +++++++++--------- testsuites/sptests/sp43/init.c | 16 +++++------ testsuites/sptests/sp44/init.c | 2 +- testsuites/sptests/sp46/init.c | 2 +- testsuites/sptests/sp47/init.c | 2 +- testsuites/sptests/sp48/init.c | 2 +- testsuites/sptests/sp50/init.c | 4 +-- testsuites/sptests/sp57/init.c | 4 +-- testsuites/sptests/sp58/init.c | 2 +- testsuites/sptests/sp59/init.c | 2 +- testsuites/sptests/sp60/init.c | 8 +++--- testsuites/sptests/sp61/init.c | 2 +- testsuites/sptests/sp62/init.c | 4 +-- testsuites/sptests/sp63/init.c | 2 +- testsuites/sptests/sp65/init.c | 16 +++++------ testsuites/sptests/sp66/init.c | 16 +++++------ testsuites/sptests/spchain/init.c | 4 +-- testsuites/sptests/spclockget/init.c | 10 +++---- testsuites/sptests/spfatal03/testcase.h | 4 +-- testsuites/sptests/spfatal05/testcase.h | 4 +-- testsuites/sptests/spfatal07/testcase.h | 4 +-- testsuites/sptests/spfatal08/testcase.h | 2 +- testsuites/sptests/spfatal09/testcase.h | 2 +- testsuites/sptests/spfatal10/testcase.h | 2 +- testsuites/sptests/spfatal11/testcase.h | 2 +- testsuites/sptests/spfatal_support/init.c | 2 +- testsuites/sptests/spintrcritical01/init.c | 4 +-- testsuites/sptests/spintrcritical06/init.c | 2 +- testsuites/sptests/spintrcritical08/init.c | 4 +-- testsuites/sptests/spintrcritical09/init.c | 4 +-- testsuites/sptests/spintrcritical16/init.c | 4 +-- .../sptests/spintrcritical_support/intrcritical.c | 2 +- testsuites/sptests/spnotepad01/init.c | 2 +- testsuites/sptests/spobjgetnext/init.c | 8 +++--- testsuites/sptests/spprintk/init.c | 2 +- testsuites/sptests/spstkalloc/init.c | 2 +- testsuites/sptests/spwkspace/init.c | 12 ++++---- 60 files changed, 165 insertions(+), 165 deletions(-) (limited to 'testsuites/sptests') diff --git a/testsuites/sptests/sp01/task1.c b/testsuites/sptests/sp01/task1.c index 8fb495bb25..50cc0b827c 100644 --- a/testsuites/sptests/sp01/task1.c +++ b/testsuites/sptests/sp01/task1.c @@ -34,7 +34,7 @@ rtems_task Task_1_through_3( /* * Use TOD_MILLISECONDS_TO_TICKS not RTEMS_MILLISECONDS_TO_TICKS to - * test C implementation in SuperCore -- not macro version used + * test C implementation in SuperCore -- not macro version used * everywhere else. */ ticks = TOD_MILLISECONDS_TO_TICKS( task_number( tid ) * 5 * 1000 ); diff --git a/testsuites/sptests/sp07/tcreate.c b/testsuites/sptests/sp07/tcreate.c index 2be9616711..685e10515e 100644 --- a/testsuites/sptests/sp07/tcreate.c +++ b/testsuites/sptests/sp07/tcreate.c @@ -31,7 +31,7 @@ bool Task_create_extension( if ( task_number( created_task->Object.id ) > 0 ) { name = Task_name[ task_number( created_task->Object.id ) ]; /* - * FIXME: There should be a public function to + * FIXME: There should be a public function to * convert numeric rtems_names into char arrays * c.f. rtems_name_to_characters() in rtems/rtems/support.inl * but it's private. diff --git a/testsuites/sptests/sp07/tdelete.c b/testsuites/sptests/sp07/tdelete.c index 7df727d362..a6cdfabb15 100644 --- a/testsuites/sptests/sp07/tdelete.c +++ b/testsuites/sptests/sp07/tdelete.c @@ -41,7 +41,7 @@ void Task_delete_extension( if ( task_number( deleted_task->Object.id ) > 0 ) { name = Task_name[ task_number( deleted_task->Object.id ) ]; /* - * FIXME: There should be a public function to + * FIXME: There should be a public function to * convert numeric rtems_names into char arrays * c.f. rtems_name_to_characters() in rtems/rtems/support.inl * but it's private. diff --git a/testsuites/sptests/sp07/trestart.c b/testsuites/sptests/sp07/trestart.c index 6ba9c2000e..4df20d0b08 100644 --- a/testsuites/sptests/sp07/trestart.c +++ b/testsuites/sptests/sp07/trestart.c @@ -31,7 +31,7 @@ void Task_restart_extension( if ( task_number( restarted_task->Object.id ) > 0 ) { name = Task_name[ task_number( restarted_task->Object.id ) ]; /* - * FIXME: There should be a public function to + * FIXME: There should be a public function to * convert numeric rtems_names into char arrays * c.f. rtems_name_to_characters() in rtems/rtems/support.inl * but it's private. diff --git a/testsuites/sptests/sp07/tstart.c b/testsuites/sptests/sp07/tstart.c index d0055f6a9a..270a642d67 100644 --- a/testsuites/sptests/sp07/tstart.c +++ b/testsuites/sptests/sp07/tstart.c @@ -31,7 +31,7 @@ void Task_start_extension( if ( task_number( started_task->Object.id ) > 0 ) { name = Task_name[ task_number( started_task->Object.id ) ]; /* - * FIXME: There should be a public function to + * FIXME: There should be a public function to * convert numeric rtems_names into char arrays * c.f. rtems_name_to_characters() in rtems/rtems/support.inl * but it's private. diff --git a/testsuites/sptests/sp09/screen01.c b/testsuites/sptests/sp09/screen01.c index 4f94bba4c5..3ca8ebbff2 100644 --- a/testsuites/sptests/sp09/screen01.c +++ b/testsuites/sptests/sp09/screen01.c @@ -115,7 +115,7 @@ void Screen1() ); puts( "TA1 - rtems_object_get_classic_name - bad ID" ); - status = rtems_object_get_classic_name( + status = rtems_object_get_classic_name( rtems_build_id( OBJECTS_ITRON_API, OBJECTS_ITRON_TASKS, 1, 1 ), &task_name ); diff --git a/testsuites/sptests/sp09/screen03.c b/testsuites/sptests/sp09/screen03.c index 993bc8b479..07e944f76c 100644 --- a/testsuites/sptests/sp09/screen03.c +++ b/testsuites/sptests/sp09/screen03.c @@ -71,7 +71,7 @@ void Screen3() #if defined(__m32c__) skipUnsatisfied = true; #endif - + if ( skipUnsatisfied ) { puts( "TA1 - rtems_task_create - stack size - RTEMS_UNSATISFIED -- SKIPPED" diff --git a/testsuites/sptests/sp09/screen04.c b/testsuites/sptests/sp09/screen04.c index d99e0e88c9..0d0b0fb36e 100644 --- a/testsuites/sptests/sp09/screen04.c +++ b/testsuites/sptests/sp09/screen04.c @@ -100,7 +100,7 @@ void Screen4() status = rtems_clock_get_tod_timeval( &tv ); directive_failed( status, "clock_get_tod_timeval OK" ); - seconds = tv.tv_sec; + seconds = tv.tv_sec; printf( "TA1 - current time - %s\n", ctime(&seconds) ); } diff --git a/testsuites/sptests/sp09/screen05.c b/testsuites/sptests/sp09/screen05.c index 08f92781aa..fa7731e3a8 100644 --- a/testsuites/sptests/sp09/screen05.c +++ b/testsuites/sptests/sp09/screen05.c @@ -121,7 +121,7 @@ void Screen5() status = rtems_semaphore_create( Semaphore_name[ 1 ], 1, - RTEMS_INHERIT_PRIORITY | RTEMS_PRIORITY_CEILING | + RTEMS_INHERIT_PRIORITY | RTEMS_PRIORITY_CEILING | RTEMS_BINARY_SEMAPHORE | RTEMS_PRIORITY, 10, &Junk_id diff --git a/testsuites/sptests/sp09/screen14.c b/testsuites/sptests/sp09/screen14.c index 32d0379168..3f0686fa3e 100644 --- a/testsuites/sptests/sp09/screen14.c +++ b/testsuites/sptests/sp09/screen14.c @@ -120,7 +120,7 @@ void Screen14() /* bad id */ build_time( &time, 12, 31, 1994, 9, 0, 0, 0 ); - status = rtems_timer_fire_when( + status = rtems_timer_fire_when( rtems_build_id( 1, 1, 1, 256 ), &time, Delayed_routine, @@ -159,8 +159,8 @@ void Screen14() "rtems_timer_fire_when with NULL handler" ); puts( "TA1 - rtems_timer_fire_when - RTEMS_INVALID_ADDRESS" ); - - /* invalid time -- before RTEMS epoch */ + + /* invalid time -- before RTEMS epoch */ build_time( &time, 2, 5, 1987, 8, 30, 45, 0 ); status = rtems_timer_fire_when( Timer_id[ 1 ], &time, Delayed_routine, NULL ); fatal_directive_status( diff --git a/testsuites/sptests/sp10/init.c b/testsuites/sptests/sp10/init.c index 1313ed2136..1d822baa6f 100644 --- a/testsuites/sptests/sp10/init.c +++ b/testsuites/sptests/sp10/init.c @@ -25,7 +25,7 @@ rtems_task Init( puts( "Init - rtems_debug_is_enabled - is 0x1 set? No" ); is_set = rtems_debug_is_enabled( 0x1 ); rtems_test_assert(is_set == false); - + puts( "Init - rtems_debug_enable - set 0x1" ); rtems_debug_enable(0x1); rtems_test_assert(_Debug_Level == 0x1); @@ -33,7 +33,7 @@ rtems_task Init( puts( "Init - rtems_debug_is_enabled - is 0x1 set? Yes" ); is_set = rtems_debug_is_enabled( 0x1 ); rtems_test_assert(is_set == true); - + puts( "Init - rtems_debug_disable - clear 0x1" ); rtems_debug_disable(0x1); rtems_test_assert(_Debug_Level == 0x0); @@ -41,7 +41,7 @@ rtems_task Init( puts( "Init - rtems_debug_is_enabled - is 0x1 set? No" ); is_set = rtems_debug_is_enabled( 0x1 ); rtems_test_assert(is_set == false); - + puts( "*** END OF TEST 10 ***" ); rtems_test_exit(0); } diff --git a/testsuites/sptests/sp12/pritask.c b/testsuites/sptests/sp12/pritask.c index c825c0c3f3..375faaa179 100644 --- a/testsuites/sptests/sp12/pritask.c +++ b/testsuites/sptests/sp12/pritask.c @@ -52,7 +52,7 @@ rtems_task Priority_task( } /* special case of setting priority while holding a resource */ - { + { rtems_task_priority priority; rtems_task_priority old_priority; diff --git a/testsuites/sptests/sp16/task5.c b/testsuites/sptests/sp16/task5.c index bcdf0d481a..f2362f1b18 100644 --- a/testsuites/sptests/sp16/task5.c +++ b/testsuites/sptests/sp16/task5.c @@ -46,7 +46,7 @@ rtems_task Task5( /* * Use TOD_MICROSECONDS_TO_TICKS not RTEMS_MICROSECONDS_TO_TICKS to - * test C implementation in SuperCore -- not macro version used + * test C implementation in SuperCore -- not macro version used * everywhere else. */ status = rtems_task_wake_after( TOD_MICROSECONDS_TO_TICKS( 1000000 ) ); diff --git a/testsuites/sptests/sp18/init.c b/testsuites/sptests/sp18/init.c index 1d6864b001..e894d0ae72 100644 --- a/testsuites/sptests/sp18/init.c +++ b/testsuites/sptests/sp18/init.c @@ -23,7 +23,7 @@ rtems_task Init( size_t stack_size; puts( "\n\n*** TEST 18 ***" ); - + puts( "Init - rtems_workspace_get_information - OK" ); sb = rtems_workspace_get_information( &start ); assert( sb ); @@ -41,7 +41,7 @@ rtems_task Init( puts( "Init - rtems_task_create - Unsatisfied on Extensions" ); while (1) { - + sc = rtems_task_create( rtems_build_name( 'T', 'E', 'S', 'T' ), 1, diff --git a/testsuites/sptests/sp27/init.c b/testsuites/sptests/sp27/init.c index bef8b3f29a..8a27cc1077 100644 --- a/testsuites/sptests/sp27/init.c +++ b/testsuites/sptests/sp27/init.c @@ -111,7 +111,7 @@ rtems_task Init( ) { puts( "\n\n*** TEST " TEST_NAME " ***" ); - puts( "Testing " TEST_SEMAPHORE_TYPE " semaphore flush" ); + puts( "Testing " TEST_SEMAPHORE_TYPE " semaphore flush" ); doTest(); puts( "*** END OF TEST " TEST_NAME " ***" ); diff --git a/testsuites/sptests/sp28/init.c b/testsuites/sptests/sp28/init.c index d5c9147665..520ffa4959 100644 --- a/testsuites/sptests/sp28/init.c +++ b/testsuites/sptests/sp28/init.c @@ -218,7 +218,7 @@ void test_multiple_taskvars(void) directive_failed( sc, "get multiple #2" ); sc = rtems_task_variable_get( RTEMS_SELF, (void **)&taskvar1, &value ); directive_failed( sc, "get multiple #2" ); - + /* * Delete task variables in various spots on the chain */ @@ -317,7 +317,7 @@ void test_delete_from_other_task(void) directive_failed( sc, "task start other" ); rtems_task_wake_after( 100 ); - + if ( test_dtor_ran != 1 ) { printf( "Test dtor ran %" PRIu32 " times not 1 times as expected\n", test_dtor_ran ); rtems_test_exit(0); @@ -364,7 +364,7 @@ void test_delete_as_side_effect(void) directive_failed( sc, "task start deleter" ); rtems_task_wake_after( 100 ); - + if ( test_dtor_ran != 2 ) { printf( "Test dtor ran %" PRIu32 " times not 2 times as expected\n", test_dtor_ran ); rtems_test_exit(0); diff --git a/testsuites/sptests/sp33/init.c b/testsuites/sptests/sp33/init.c index 28d31fffb1..5a4ec8850e 100644 --- a/testsuites/sptests/sp33/init.c +++ b/testsuites/sptests/sp33/init.c @@ -193,7 +193,7 @@ rtems_task Init( directive_failed( status, "rtems_task_start of Waiter" ); } - puts( "Delay to let Waiters block" ); + puts( "Delay to let Waiters block" ); status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() ); directive_failed(status, "rtems_task_wake_after"); @@ -207,7 +207,7 @@ rtems_task Init( exit(0); } - puts( "Delay to let Waiters print a message" ); + puts( "Delay to let Waiters print a message" ); status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() ); directive_failed(status, "rtems_task_wake_after"); @@ -230,7 +230,7 @@ rtems_task Init( directive_failed( status, "rtems_task_start of Waiter" ); } - puts( "Delay to let Waiters block" ); + puts( "Delay to let Waiters block" ); status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() ); directive_failed(status, "rtems_task_wake_after"); @@ -238,7 +238,7 @@ rtems_task Init( status = rtems_barrier_delete( Barrier ); directive_failed(status, "rtems_barrier_delete"); - puts( "Delay to let Waiters print a message" ); + puts( "Delay to let Waiters print a message" ); status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() ); directive_failed(status, "rtems_task_wake_after"); @@ -268,7 +268,7 @@ rtems_task Init( directive_failed( status, "rtems_task_start of Waiter" ); } - puts( "Delay to let task wait on barrier" ); + puts( "Delay to let task wait on barrier" ); status = rtems_task_wake_after( rtems_clock_get_ticks_per_second() ); directive_failed(status, "rtems_task_wake_after"); diff --git a/testsuites/sptests/sp34/changepri.c b/testsuites/sptests/sp34/changepri.c index b444bf1a19..ef54b96da4 100644 --- a/testsuites/sptests/sp34/changepri.c +++ b/testsuites/sptests/sp34/changepri.c @@ -45,7 +45,7 @@ const char *CallerName(void) uint32_t u; unsigned char c[4]; } TempName; - + #if defined(TEST_ON_RTEMS_45) TempName.u = *(uint32_t *)_Thread_Executing->Object.name; #else @@ -95,22 +95,22 @@ rtems_task BlockingTasks(rtems_task_argument arg) rtems_task Init(rtems_task_argument ignored) { - rtems_status_code status; + rtems_status_code status; int i; - + puts( "\n\n*** TEST 34 ***" ); /* Create synchronisation semaphore for LocalHwIsr -> Test Tasks */ status = rtems_semaphore_create( rtems_build_name ('S', 'E', 'M', '1'), /* name */ 0, /* initial count = 0 */ - RTEMS_LOCAL | - RTEMS_COUNTING_SEMAPHORE | + RTEMS_LOCAL | + RTEMS_COUNTING_SEMAPHORE | RTEMS_PRIORITY, 0, &Semaphore); /* *id */ directive_failed( status, "rtems_semaphore_create" ); - + /* Create and start all tasks in the test */ for (i = 0; i < NUMBER_OF_BLOCKING_TASKS; i++) { @@ -122,7 +122,7 @@ rtems_task Init(rtems_task_argument ignored) RTEMS_DEFAULT_ATTRIBUTES | RTEMS_FLOATING_POINT, /* Attributes */ &Blockers[i]); /* Assigned ID */ directive_failed( status, "rtems_task_create (BLKn)" ); - + printf( "Blockers[%d] Id = 0x%08" PRIxrtems_id "\n", i, Blockers[i] ); status = rtems_task_start( Blockers[i], diff --git a/testsuites/sptests/sp35/priinv.c b/testsuites/sptests/sp35/priinv.c index ba3ed482ce..19362a9823 100644 --- a/testsuites/sptests/sp35/priinv.c +++ b/testsuites/sptests/sp35/priinv.c @@ -103,7 +103,7 @@ const char *CallerName(void) #define NofMediumTask_C 3 -/* RTEMS identifiers */ +/* RTEMS identifiers */ rtems_id TaMedium[NofMediumTask_C]; /* Medium-prio tasks accessing */ /* the common local HW */ rtems_id TaHwSim; /* HW simulator */ @@ -191,7 +191,7 @@ rtems_task LocalHwSim_Exec(rtems_task_argument TaskArg) int ISRCount = 0; #endif printf("LocalHwSim_Exec begins...\n"); - + while(1) { if (StartHw) { /* A test task has activated the HW, wait for a while and then @@ -238,7 +238,7 @@ rtems_isr LocalHwIsr(/*in*/ rtems_vector_number Vector) void AccessLocalHw(void) { rtems_status_code Sts; - + rtems_task_priority EnterPrio; /* Statistics log */ rtems_task_priority AccessPrio; /* : */ rtems_task_priority LeavePrio; /* : */ @@ -291,7 +291,7 @@ void AccessLocalHw(void) if ( ++Iterations == 10 ) { puts( "*** END OF TEST 35 ***" ); exit(0); - } + } #endif return; } @@ -299,7 +299,7 @@ void AccessLocalHw(void) void AccessRemoteHw(void) { rtems_status_code Sts; - + rtems_task_priority EnterPrio; /* Statistics log */ rtems_task_priority AccessPrio; /* : */ rtems_task_priority LeavePrio; /* : */ @@ -356,29 +356,29 @@ void AccessRemoteHw(void) /* The Init operation (the Init-task) */ rtems_task Init(rtems_task_argument ignored) { - rtems_status_code status; + rtems_status_code status; #if defined(TEST_USE_ISR) - rtems_isr_entry DummyIsr; + rtems_isr_entry DummyIsr; #endif int i; - + puts( "\n\n*** TEST 35 ***" ); /* Create synchronisation semaphore for LocalHwIsr -> Test Tasks */ status = rtems_semaphore_create( rtems_build_name ('S', 'Y', 'N', 'C'), /* name */ 0, /* initial count = 0 */ - RTEMS_LOCAL | - RTEMS_SIMPLE_BINARY_SEMAPHORE | - RTEMS_NO_INHERIT_PRIORITY | - RTEMS_NO_PRIORITY_CEILING | + RTEMS_LOCAL | + RTEMS_SIMPLE_BINARY_SEMAPHORE | + RTEMS_NO_INHERIT_PRIORITY | + RTEMS_NO_PRIORITY_CEILING | RTEMS_FIFO, 0, &LocalHwSync_S); /* *id */ directive_failed( status, "rtems_semaphore_create (SYNC)" ); - + printf( "Sync Mutex Id = 0x%08" PRIxrtems_id "\n", LocalHwSync_S ); - + /* Create resource semaphore for exclusive access to the local HW */ status = rtems_semaphore_create( rtems_build_name ('R', 'E', 'S', '1'), /* name */ @@ -406,14 +406,14 @@ rtems_task Init(rtems_task_argument ignored) directive_failed( status, "rtems_semaphore_create (RES2)" ); printf( "Remote Mutex Id = 0x%08" PRIxrtems_id "\n", RemoteHwAccess_R ); - + #if defined(TEST_USE_ISR) /* Install ISR for HW/SW synchronization, use ta 0x85 which is synchronous */ status = rtems_interrupt_catch(LocalHwIsr, 0x85 + 0x100, &DummyIsr); directive_failed( status, "rtems_interrupt_catch" ); #endif - + printf("Ending Init-task\n"); /* Create and start all tasks in the test */ diff --git a/testsuites/sptests/sp36/strict_order_mut.c b/testsuites/sptests/sp36/strict_order_mut.c index 1dd5f1a6d8..7720837ba2 100644 --- a/testsuites/sptests/sp36/strict_order_mut.c +++ b/testsuites/sptests/sp36/strict_order_mut.c @@ -76,7 +76,7 @@ rtems_task Init(rtems_task_argument ignored) Mutex_name[2] = rtems_build_name( 'S','Y','N','C'); - + Task_name[0] = rtems_build_name( 'T','0',' ',' '); status = rtems_task_create( Task_name[0], @@ -89,7 +89,7 @@ rtems_task Init(rtems_task_argument ignored) directive_failed( status,"rtems_task_create of T0"); printf("Create T0,priority is 4\n"); - + status = rtems_task_start( Task_id[0],Task0, 0); directive_failed( status,"rtems_task_start of T0"); @@ -102,8 +102,8 @@ rtems_task Init(rtems_task_argument ignored) rtems_task Task0(rtems_task_argument ignored) { rtems_status_code status; - - + + status = rtems_semaphore_obtain( Mutex_id[0], RTEMS_WAIT, @@ -111,7 +111,7 @@ rtems_task Task0(rtems_task_argument ignored) printf("T0 rtems_semaphore_obtain - S0\n"); directive_failed( status,"rtems_semaphore_obtain of S0\n"); printf("The current priority of T0 is %d\n",Get_current_pri()); - + status = rtems_semaphore_obtain( Mutex_id[1], RTEMS_WAIT, @@ -131,7 +131,7 @@ rtems_task Task0(rtems_task_argument ignored) printf("T0 - rtems_semaphore_release - S1\n"); directive_failed( status,"rtems_semaphore_release of S1\n"); printf("The current priority of T0 is %d\n",Get_current_pri()); - + Task_name[1] = rtems_build_name( 'T','1',' ',' '); status = rtems_task_create( @@ -144,7 +144,7 @@ rtems_task Task0(rtems_task_argument ignored) ); directive_failed( status , "rtems_task_create of T1\n"); printf("Create S1,priority is 1\n"); - + status = rtems_task_start( Task_id[1],Task1, 0); directive_failed( status, "rtems_task_start of T1\n"); @@ -154,9 +154,9 @@ rtems_task Task0(rtems_task_argument ignored) status = rtems_semaphore_release(Mutex_id[0]); printf("T0 - rtems_semaphore_release - S0\n"); directive_failed( status, "rtems_semaphore_release of S0\n"); - + } - + rtems_task Task1(rtems_task_argument ignored) { @@ -194,10 +194,10 @@ rtems_task_priority Get_current_pri(void) printf("node:Id=%p,priority_before=%d," "holder_id=%d,holder's current priority=%d\n",node, ((CORE_mutex_order_list *)node)->priority_before,p_mutex->holder_id,p_mutex->holder->current_priority); - node = node->next; + node = node->next; } } else printf("the Chain is empty\n"); } -*/ +*/ diff --git a/testsuites/sptests/sp37/init.c b/testsuites/sptests/sp37/init.c index c3104200b5..28d214df7b 100644 --- a/testsuites/sptests/sp37/init.c +++ b/testsuites/sptests/sp37/init.c @@ -62,7 +62,7 @@ void test_interrupt_inline(void) puts( "interrupt enable (use inline)" ); rtems_interrupt_enable( level ); - + puts( "interrupt level attribute (use inline)" ); level_attribute = rtems_interrupt_level_attribute( level ); level_attribute_macro = RTEMS_INTERRUPT_LEVEL(level); @@ -168,7 +168,7 @@ rtems_timer_service_routine test_unblock_task( status = rtems_timer_fire_after( timer, 1, test_unblock_task, NULL ); directive_failed( status, "timer_fire_after failed" ); return; - } + } blocked_task_status = 2; _Thread_Disable_dispatch(); @@ -288,7 +288,7 @@ rtems_task Init( puts( "interrupt enable (use body)" ); rtems_interrupt_enable( level ); - + puts( "interrupt level attribute (use body)" ); level_attribute = rtems_interrupt_level_attribute( level ); level_attribute_macro = RTEMS_INTERRUPT_LEVEL(level); @@ -307,7 +307,7 @@ rtems_task Init( status = rtems_task_wake_after( 100 ); directive_failed( status, "wake_after failed" ); - + check_isr_worked( "inline", isr_in_progress_body ); check_isr_worked( "body", isr_in_progress_body ); diff --git a/testsuites/sptests/sp38/init.c b/testsuites/sptests/sp38/init.c index 645b81f535..cf3b99b257 100644 --- a/testsuites/sptests/sp38/init.c +++ b/testsuites/sptests/sp38/init.c @@ -90,7 +90,7 @@ rtems_task Init( break; } - puts( "Signal sent from ISR has been processed" ); + puts( "Signal sent from ISR has been processed" ); puts( "*** END OF TEST 38 ***" ); rtems_test_exit( 0 ); } diff --git a/testsuites/sptests/sp39/init.c b/testsuites/sptests/sp39/init.c index 8d4abb1ffd..6d01a8ae84 100644 --- a/testsuites/sptests/sp39/init.c +++ b/testsuites/sptests/sp39/init.c @@ -132,7 +132,7 @@ rtems_task Init( printf( "Event sent from ISR hitting synchronization point has %soccurred\n", (( case_hit == TRUE ) ? "" : "NOT ") - ); + ); /* * Test Event send successful from ISR -- receive has timeout @@ -167,7 +167,7 @@ rtems_task Init( "Event sent from ISR (with timeout) hitting synchronization " "point has %soccurred\n", (( case_hit == TRUE ) ? "" : "NOT ") - ); + ); puts( "*** END OF TEST 39 ***" ); rtems_test_exit( 0 ); diff --git a/testsuites/sptests/sp42/init.c b/testsuites/sptests/sp42/init.c index a99ee7942b..12ccce06dd 100644 --- a/testsuites/sptests/sp42/init.c +++ b/testsuites/sptests/sp42/init.c @@ -65,12 +65,12 @@ rtems_task Locker_task( rtems_status_code status; status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid ); - directive_failed( status, "rtems_task_ident" ); + directive_failed( status, "rtems_task_ident" ); task_index = task_number( tid ) - 1; status = rtems_semaphore_obtain( Semaphore, RTEMS_DEFAULT_OPTIONS, 0 ); - directive_failed( status, "rtems_semaphore_obtain" ); + directive_failed( status, "rtems_semaphore_obtain" ); put_name( Task_name[ task_index ], FALSE ); puts( " - unblocked - OK" ); @@ -93,10 +93,10 @@ void do_test( 0, /* IGNORED */ &Semaphore ); - directive_failed( status, "rtems_semaphore_create" ); + directive_failed( status, "rtems_semaphore_create" ); for (i=0 ; i< MAX_TASKS ; i++ ) { - + Task_name[ i ] = rtems_build_name( 'T', 'A', @@ -112,36 +112,36 @@ void do_test( RTEMS_DEFAULT_ATTRIBUTES, &Task_id[ i ] ); - directive_failed( status, "rtems_task_create" ); + directive_failed( status, "rtems_task_create" ); status = rtems_task_start( Task_id[ i ], Locker_task, (rtems_task_argument)i ); - directive_failed( status, "rtems_task_start" ); + directive_failed( status, "rtems_task_start" ); status = rtems_task_wake_after( 10 ); - directive_failed( status, "rtems_task_wake_after" ); + directive_failed( status, "rtems_task_wake_after" ); } for (i=0 ; i< MAX_TASKS ; i++ ) { if ( extract == FALSE ) { status = rtems_semaphore_release( Semaphore ); - directive_failed( status, "rtems_semaphore_release" ); + directive_failed( status, "rtems_semaphore_release" ); status = rtems_task_wake_after( 100 ); - directive_failed( status, "rtems_task_wake_after" ); + directive_failed( status, "rtems_task_wake_after" ); } else { status = rtems_task_delete( Task_id[ i ] ); - directive_failed( status, "rtems_task_delete" ); + directive_failed( status, "rtems_task_delete" ); } } - + /* one extra release for the initial state */ status = rtems_semaphore_release( Semaphore ); - directive_failed( status, "rtems_semaphore_release" ); + directive_failed( status, "rtems_semaphore_release" ); /* now delete the semaphore since no one is waiting and it is unlocked */ status = rtems_semaphore_delete( Semaphore ); - directive_failed( status, "rtems_semaphore_delete" ); + directive_failed( status, "rtems_semaphore_delete" ); } rtems_task Init( diff --git a/testsuites/sptests/sp43/init.c b/testsuites/sptests/sp43/init.c index e36aa3b085..8d27658717 100644 --- a/testsuites/sptests/sp43/init.c +++ b/testsuites/sptests/sp43/init.c @@ -175,7 +175,7 @@ rtems_task Init( put_name( tmpName, FALSE ); puts( " - rtems_build_name for TEMP" ); - + /* * rtems_object_get_name - cases */ @@ -272,7 +272,7 @@ rtems_task Init( puts( "rtems_build_id - build an id to match init task" ); tmpId = rtems_build_id( OBJECTS_CLASSIC_API, OBJECTS_RTEMS_TASKS, 1, 1 ), assert( tmpId == main_task ); - + puts( "rtems_object_id_get_api - OK" ); part = rtems_object_id_get_api( main_task ); assert( part == OBJECTS_CLASSIC_API ); @@ -332,7 +332,7 @@ rtems_task Init( * Another screen break for the API and class name tests */ rtems_test_pause(); - + printf( "rtems_object_get_api_name(0) = %s\n", rtems_object_get_api_name(0) ); printf( "rtems_object_get_api_name(255) = %s\n", rtems_object_get_api_name(255)); @@ -344,14 +344,14 @@ rtems_task Init( printf( "rtems_object_get_api_name(ITRON_API) = %s\n", rtems_object_get_api_name(OBJECTS_ITRON_API) ); - printf( "rtems_object_get_api_class_name(0, RTEMS_TASKS) = %s\n", + printf( "rtems_object_get_api_class_name(0, RTEMS_TASKS) = %s\n", rtems_object_get_api_class_name( 0, OBJECTS_RTEMS_TASKS ) ); - printf( "rtems_object_get_api_class_name(CLASSIC_API, 0) = %s\n", + printf( "rtems_object_get_api_class_name(CLASSIC_API, 0) = %s\n", rtems_object_get_api_class_name( OBJECTS_CLASSIC_API, 0 ) ); - printf("rtems_object_get_api_class_name(INTERNAL_API, MUTEXES) = %s\n", + printf("rtems_object_get_api_class_name(INTERNAL_API, MUTEXES) = %s\n", rtems_object_get_api_class_name( OBJECTS_INTERNAL_API, OBJECTS_INTERNAL_MUTEXES)); - printf("rtems_object_get_api_class_name(CLASSIC_API, RTEMS_BARRIERS) = %s\n", + printf("rtems_object_get_api_class_name(CLASSIC_API, RTEMS_BARRIERS) = %s\n", rtems_object_get_api_class_name( OBJECTS_CLASSIC_API, OBJECTS_RTEMS_BARRIERS)); @@ -360,7 +360,7 @@ rtems_task Init( */ rtems_test_pause(); - + puts( "rtems_object_get_class_information - INVALID_ADDRESS" ); sc = rtems_object_get_class_information( OBJECTS_INTERNAL_API, OBJECTS_INTERNAL_THREADS, NULL ); diff --git a/testsuites/sptests/sp44/init.c b/testsuites/sptests/sp44/init.c index 57fdef1f6b..fc9d60b671 100644 --- a/testsuites/sptests/sp44/init.c +++ b/testsuites/sptests/sp44/init.c @@ -79,7 +79,7 @@ rtems_task TaskAB_entry(rtems_task_argument me) if (turn == me) { printf("Task #%" PRIdrtems_task_argument "'s turn. Now setting turn to %" PRIdrtems_task_argument "\n", me, 1 - me); turn = 1 - me; - + if ( ++iterations == 10 ) { puts( "*** END OF SP44 TEST ***" ); exit( 0 ); diff --git a/testsuites/sptests/sp46/init.c b/testsuites/sptests/sp46/init.c index d44d4a5365..870b4080bf 100644 --- a/testsuites/sptests/sp46/init.c +++ b/testsuites/sptests/sp46/init.c @@ -42,7 +42,7 @@ rtems_task Periodic_Task( status = rtems_rate_monotonic_period( period_id, 25 ); directive_failed(status, "rate_monotonic_period"); partial_loop = 0; - + start = rtems_clock_get_ticks_since_boot(); end = start + 5; while ( end <= rtems_clock_get_ticks_since_boot() ) diff --git a/testsuites/sptests/sp47/init.c b/testsuites/sptests/sp47/init.c index d99c1dff75..753005bcde 100644 --- a/testsuites/sptests/sp47/init.c +++ b/testsuites/sptests/sp47/init.c @@ -40,7 +40,7 @@ rtems_task Init(rtems_task_argument ignored) sc = rtems_task_create( rtems_build_name('t', 's', 't', '0'), 100, - RTEMS_MINIMUM_STACK_SIZE, + RTEMS_MINIMUM_STACK_SIZE, RTEMS_NO_ASR, RTEMS_DEFAULT_ATTRIBUTES, &ti diff --git a/testsuites/sptests/sp48/init.c b/testsuites/sptests/sp48/init.c index 0a96e24598..dd2b37a2b3 100644 --- a/testsuites/sptests/sp48/init.c +++ b/testsuites/sptests/sp48/init.c @@ -33,7 +33,7 @@ rtems_task Init(rtems_task_argument ignored) rtems_build_name('s', 'e', 'm', ' '), 1, RTEMS_DEFAULT_ATTRIBUTES, - 0, + 0, &Semaphores[i] ); /* printf("Creating %i id=0x%08x\n", i, Semaphores[i]); */ diff --git a/testsuites/sptests/sp50/init.c b/testsuites/sptests/sp50/init.c index 64f31e169c..f91bcf45e4 100644 --- a/testsuites/sptests/sp50/init.c +++ b/testsuites/sptests/sp50/init.c @@ -40,7 +40,7 @@ rtems_task Init( puts( "\n\n*** TEST 50 ***" ); sc = rtems_timer_initiate_server( - 1, + 1, RTEMS_MINIMUM_STACK_SIZE, RTEMS_DEFAULT_ATTRIBUTES ); @@ -63,7 +63,7 @@ rtems_task Init( sc = rtems_clock_get_uptime( &uptime ); directive_failed( sc, "rtems_clock_get_uptime" ); - + printf( "Timer fired at %" PRItime_t "\n", uptime.tv_sec ); } diff --git a/testsuites/sptests/sp57/init.c b/testsuites/sptests/sp57/init.c index 7c139edf56..f44313000a 100644 --- a/testsuites/sptests/sp57/init.c +++ b/testsuites/sptests/sp57/init.c @@ -48,7 +48,7 @@ rtems_task Init( puts( "Init - rtems_task_start - delay task - OK" ); status = rtems_task_start( task_id, Delay_task, 0 ); directive_failed( status, "rtems_task_start" ); - + puts( "Init - rtems_task_wake_after - let delay task block - OK" ); status = rtems_task_wake_after( RTEMS_MILLISECONDS_TO_TICKS(1000) ); directive_failed( status, "rtems_task_wake_after" ); @@ -56,7 +56,7 @@ rtems_task Init( puts( "Init - rtems_task_restart - delay task - OK" ); status = rtems_task_restart( task_id, 0 ); directive_failed( status, "rtems_task_restart" ); - + puts( "*** END OF TEST 57 ***" ); rtems_test_exit(0); } diff --git a/testsuites/sptests/sp58/init.c b/testsuites/sptests/sp58/init.c index f97898bfbe..a7adaf99c4 100644 --- a/testsuites/sptests/sp58/init.c +++ b/testsuites/sptests/sp58/init.c @@ -35,7 +35,7 @@ void timespec_divide_by_zero(void) _Timespec_Divide( &t1, &zero, &ival_percentage, &fval_percentage ); rtems_test_assert( ival_percentage == 0 ); rtems_test_assert( fval_percentage == 0 ); - + } rtems_task Init( diff --git a/testsuites/sptests/sp59/init.c b/testsuites/sptests/sp59/init.c index ac52f9482c..0d2683a7ba 100644 --- a/testsuites/sptests/sp59/init.c +++ b/testsuites/sptests/sp59/init.c @@ -67,7 +67,7 @@ rtems_task Init( puts( "Init - rtems_task_start - delay task - OK" ); status = rtems_task_start( task_id, Blocking_task, 0 ); directive_failed( status, "rtems_task_start" ); - + puts( "Init - rtems_region_create - OK" ); status = rtems_region_create( rtems_build_name('R', 'N', '0', '1'), diff --git a/testsuites/sptests/sp60/init.c b/testsuites/sptests/sp60/init.c index 93b467e86f..d89bd502fc 100644 --- a/testsuites/sptests/sp60/init.c +++ b/testsuites/sptests/sp60/init.c @@ -38,19 +38,19 @@ rtems_task Init( puts( "Init - rtems_rate_monotonic_period - short period" ); sc = rtems_rate_monotonic_period(period1, RTEMS_MILLISECONDS_TO_TICKS(200) ); directive_failed( sc, "rtems_rate_monotonic_period" ); - + puts( "Init - rtems_rate_monotonic_period - long period initiated" ); sc = rtems_rate_monotonic_period(period2, RTEMS_MILLISECONDS_TO_TICKS(1000) ); directive_failed( sc, "rtems_rate_monotonic_period" ); - + puts( "Init - rtems_rate_monotonic_period - long period block" ); sc = rtems_rate_monotonic_period(period2, RTEMS_MILLISECONDS_TO_TICKS(1000) ); directive_failed( sc, "rtems_rate_monotonic_period" ); - + puts( "Init - rtems_rate_monotonic_period - verify long period expired" ); sc = rtems_rate_monotonic_period(period1, RTEMS_PERIOD_STATUS ); fatal_directive_status(sc, RTEMS_TIMEOUT, "rtems_task_period status"); - + puts( "*** END OF TEST 60 ***" ); rtems_test_exit(0); } diff --git a/testsuites/sptests/sp61/init.c b/testsuites/sptests/sp61/init.c index 3748d52999..d95d1267b2 100644 --- a/testsuites/sptests/sp61/init.c +++ b/testsuites/sptests/sp61/init.c @@ -27,7 +27,7 @@ rtems_task Init( puts( "Init - restore System State and shutdown for real" ); _System_state_Set( SYSTEM_STATE_UP ); - + puts( "*** END OF TEST 61 ***" ); rtems_test_exit(0); } diff --git a/testsuites/sptests/sp62/init.c b/testsuites/sptests/sp62/init.c index 1bfc3f04e9..249c98bac2 100644 --- a/testsuites/sptests/sp62/init.c +++ b/testsuites/sptests/sp62/init.c @@ -38,7 +38,7 @@ rtems_task Blocker( puts( "Blocker - Got memory after resize" ); case_hit = true; - + (void) rtems_task_delete( RTEMS_SELF ); } @@ -53,7 +53,7 @@ rtems_task Init( size_t size; puts( "\n\n*** TEST 62 ***" ); - + puts( "Init - rtems_task_create Blocker - OK" ); sc = rtems_task_create( rtems_build_name( 'B', 'L', 'C', 'K' ), diff --git a/testsuites/sptests/sp63/init.c b/testsuites/sptests/sp63/init.c index 9e8bb668ba..c1d601177c 100644 --- a/testsuites/sptests/sp63/init.c +++ b/testsuites/sptests/sp63/init.c @@ -116,7 +116,7 @@ rtems_task Init( ) { puts( "\n\n*** TEST 63 ***" ); - + test_case_one(); test_case_two(); diff --git a/testsuites/sptests/sp65/init.c b/testsuites/sptests/sp65/init.c index 247d207169..ceec5241a4 100644 --- a/testsuites/sptests/sp65/init.c +++ b/testsuites/sptests/sp65/init.c @@ -29,14 +29,14 @@ rtems_task Init( { int status; rtems_id Mutex_id, Task_id; - + puts( "\n\n*** TEST " TEST_NAME " ***" ); /* * Create binary semaphore (a.k.a. Mutex) with Priority Ceiling * attribute. */ - + puts( "Creating semaphore" ); status = rtems_semaphore_create( rtems_build_name( 's','e','m','1' ), @@ -50,9 +50,9 @@ rtems_task Init( puts( "Calling rtems_semaphore_obtain" ); status = rtems_semaphore_obtain( Mutex_id, RTEMS_DEFAULT_OPTIONS, 0 ); directive_failed( status, "rtems_semaphore_obtain" ); - + puts( "Calling rtems_task_create" ); - status = rtems_task_create( rtems_build_name( 'T', 'A', 'S', '1' ), + status = rtems_task_create( rtems_build_name( 'T', 'A', 'S', '1' ), TASK_PRIORITY, RTEMS_MINIMUM_STACK_SIZE, RTEMS_DEFAULT_MODES, @@ -60,17 +60,17 @@ rtems_task Init( &Task_id ); directive_failed( status, "rtems_task_create" ); - + puts( "Calling rtems_task_start" ); status = rtems_task_start( Task_id, Task_1, (rtems_task_argument)&Mutex_id ); directive_failed( status, "rtems_task_start" ); - + sleep(1); - + puts( "Calling semaphore release" ); status = rtems_semaphore_release( Mutex_id ); directive_failed( status, "rtems_semaphore_release" ); - + puts( "*** END OF TEST 65 ***" ); diff --git a/testsuites/sptests/sp66/init.c b/testsuites/sptests/sp66/init.c index 3cea6ee161..9aee9d0f1e 100644 --- a/testsuites/sptests/sp66/init.c +++ b/testsuites/sptests/sp66/init.c @@ -21,14 +21,14 @@ rtems_task Init( { int status, ceiling, old_ceiling; rtems_id Mutex_id, Task_id; - + puts( "\n\n*** TEST 66 ***" ); /* * Create binary semaphore (a.k.a. Mutex) with Priority Ceiling * attribute. */ - + puts( "Creating semaphore" ); status = rtems_semaphore_create( rtems_build_name( 's','e','m','1' ), @@ -42,9 +42,9 @@ rtems_task Init( puts( "Calling rtems_semaphore_obtain" ); status = rtems_semaphore_obtain( Mutex_id, RTEMS_DEFAULT_OPTIONS, 0 ); directive_failed( status, "rtems_semaphore_obtain" ); - + puts( "Calling rtems_task_create" ); - status = rtems_task_create( rtems_build_name( 'T', 'A', 'S', '1' ), + status = rtems_task_create( rtems_build_name( 'T', 'A', 'S', '1' ), 2, RTEMS_MINIMUM_STACK_SIZE, RTEMS_DEFAULT_MODES, @@ -52,17 +52,17 @@ rtems_task Init( &Task_id ); directive_failed( status, "rtems_task_create" ); - + puts( "Calling rtems_task_start" ); status = rtems_task_start( Task_id, Task_1, (rtems_task_argument)&Mutex_id ); directive_failed( status, "rtems_task_start" ); - + sleep(1); - + puts( "Calling semaphore release" ); status = rtems_semaphore_release( Mutex_id ); directive_failed( status, "rtems_semaphore_release" ); - + puts( "*** END OF TEST 66 ***" ); rtems_test_exit(0); diff --git a/testsuites/sptests/spchain/init.c b/testsuites/sptests/spchain/init.c index 14f635af1a..9613dd805e 100644 --- a/testsuites/sptests/spchain/init.c +++ b/testsuites/sptests/spchain/init.c @@ -21,9 +21,9 @@ rtems_task Init( rtems_task_argument ignored ) { - rtems_chain_control chain1; + rtems_chain_control chain1; rtems_chain_node *p; - test_node node1, node2; + test_node node1, node2; int id; puts( "\n\n*** TEST OF RTEMS CHAIN API ***" ); diff --git a/testsuites/sptests/spclockget/init.c b/testsuites/sptests/spclockget/init.c index 2d56f6349b..7c9533fa98 100644 --- a/testsuites/sptests/spclockget/init.c +++ b/testsuites/sptests/spclockget/init.c @@ -30,23 +30,23 @@ rtems_task Init( sc = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time ); directive_failed( sc, "rtems_clock_get -- TOD" ); print_time( "Init - rtems_clock_get - ", &time, "\n" ); - + sc = rtems_clock_get( RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH, &interval ); directive_failed( sc, "rtems_clock_get -- Seconds Since Epoch" ); printf( "Init - rtems_clock_get - Seconds Since Epoch = %" PRIdrtems_interval "\n", interval ); - + sc = rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &interval ); directive_failed( sc, "rtems_clock_get -- Ticks Since Boot" ); printf( "Init - rtems_clock_get - Ticks Since Boot = %" PRIdrtems_interval "\n", interval ); - + sc = rtems_clock_get( RTEMS_CLOCK_GET_TICKS_PER_SECOND, &interval ); directive_failed( sc, "rtems_clock_get -- Ticks Per Second" ); printf( "Init - rtems_clock_get - Ticks Per Second = %" PRIdrtems_interval "\n", interval ); - + sc = rtems_clock_get( RTEMS_CLOCK_GET_TIME_VALUE, &timev ); directive_failed( sc, "rtems_clock_get -- Time Value" ); printf( "Init - rtems_clock_get - Time Value = %" PRItime_t "\n", timev.tv_sec ); - + puts( "*** END OF TEST LEGACY RTEMS_CLOCK_GET ***" ); rtems_test_exit(0); } diff --git a/testsuites/sptests/spfatal03/testcase.h b/testsuites/sptests/spfatal03/testcase.h index dc99b82762..ddb3577b85 100644 --- a/testsuites/sptests/spfatal03/testcase.h +++ b/testsuites/sptests/spfatal03/testcase.h @@ -19,7 +19,7 @@ #define FATAL_ERROR_DESCRIPTION "Core Mutex obtain in critical section" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE #define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE -#define FATAL_ERROR_EXPECTED_ERROR INTERNAL_ERROR_MUTEX_OBTAIN_FROM_BAD_STATE +#define FATAL_ERROR_EXPECTED_ERROR INTERNAL_ERROR_MUTEX_OBTAIN_FROM_BAD_STATE void force_error(void) { @@ -45,6 +45,6 @@ void force_error(void) _Thread_Enable_dispatch(); puts("ERROR -- Obtain semaphore should not have returned"); - + /* we will not run this far */ } diff --git a/testsuites/sptests/spfatal05/testcase.h b/testsuites/sptests/spfatal05/testcase.h index ae01d9ac24..1fa9d6b101 100644 --- a/testsuites/sptests/spfatal05/testcase.h +++ b/testsuites/sptests/spfatal05/testcase.h @@ -60,13 +60,13 @@ void force_error() RTEMS_DEFAULT_ATTRIBUTES, &id ); - directive_failed( status, "rtems_task_create" ); + directive_failed( status, "rtems_task_create" ); status = rtems_task_start( id, EmptyTask, 0 ); directive_failed( status, "rtems_task_start" ); status = rtems_task_wake_after( 10 ); directive_failed( status, "rtems_task_wake_after" ); - + /* we will not run this far */ } diff --git a/testsuites/sptests/spfatal07/testcase.h b/testsuites/sptests/spfatal07/testcase.h index 86c465ee0d..8ac826c799 100644 --- a/testsuites/sptests/spfatal07/testcase.h +++ b/testsuites/sptests/spfatal07/testcase.h @@ -40,7 +40,7 @@ rtems_initialization_tasks_table Initialization_tasks[] = { void force_error() { - #if (CPU_ALLOCATE_INTERRUPT_STACK == TRUE) + #if (CPU_ALLOCATE_INTERRUPT_STACK == TRUE) Configuration.interrupt_stack_size = (STACK_MINIMUM_SIZE-1); rtems_initialize_data_structures(); #else @@ -50,6 +50,6 @@ void force_error() ); rtems_test_exit(0); #endif - + /* we will not run this far */ } diff --git a/testsuites/sptests/spfatal08/testcase.h b/testsuites/sptests/spfatal08/testcase.h index ef49f5cee1..80bd18d1cc 100644 --- a/testsuites/sptests/spfatal08/testcase.h +++ b/testsuites/sptests/spfatal08/testcase.h @@ -34,7 +34,7 @@ rtems_initialization_tasks_table Initialization_tasks[] = { #define FATAL_ERROR_TEST_NAME "8" #define FATAL_ERROR_DESCRIPTION "Core workspace too small" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE -#define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE +#define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE #define FATAL_ERROR_EXPECTED_ERROR INTERNAL_ERROR_WORKSPACE_ALLOCATION char Workspace[ 256 ] CPU_STRUCTURE_ALIGNMENT; diff --git a/testsuites/sptests/spfatal09/testcase.h b/testsuites/sptests/spfatal09/testcase.h index 01dedcac5e..7560f3fe12 100644 --- a/testsuites/sptests/spfatal09/testcase.h +++ b/testsuites/sptests/spfatal09/testcase.h @@ -33,7 +33,7 @@ rtems_initialization_tasks_table Initialization_tasks[] = { #define FATAL_ERROR_TEST_NAME "9" #define FATAL_ERROR_DESCRIPTION "Core invalid workspace address" -#define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE +#define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE #define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE #define FATAL_ERROR_EXPECTED_ERROR INTERNAL_ERROR_INVALID_WORKSPACE_ADDRESS diff --git a/testsuites/sptests/spfatal10/testcase.h b/testsuites/sptests/spfatal10/testcase.h index 7d80bc638e..7c2316878e 100644 --- a/testsuites/sptests/spfatal10/testcase.h +++ b/testsuites/sptests/spfatal10/testcase.h @@ -19,6 +19,6 @@ void force_error() { __assert_func( __FILE__, __LINE__, "Init", "forced" ); - + /* we will not run this far */ } diff --git a/testsuites/sptests/spfatal11/testcase.h b/testsuites/sptests/spfatal11/testcase.h index 60ebe481a4..deed297aee 100644 --- a/testsuites/sptests/spfatal11/testcase.h +++ b/testsuites/sptests/spfatal11/testcase.h @@ -19,6 +19,6 @@ void force_error() { __assert_func( __FILE__, __LINE__, NULL, "forced" ); - + /* we will not run this far */ } diff --git a/testsuites/sptests/spfatal_support/init.c b/testsuites/sptests/spfatal_support/init.c index 5d37634689..f42bad2830 100644 --- a/testsuites/sptests/spfatal_support/init.c +++ b/testsuites/sptests/spfatal_support/init.c @@ -141,7 +141,7 @@ void Fatal_extension( else printk( "ERROR==> Fatal Extension is internal set to FALSE expected TRUE\n" ); } - + if ( error != FATAL_ERROR_EXPECTED_ERROR ) { printk( "ERROR==> Fatal Error Expected ("); Put_Error( source, FATAL_ERROR_EXPECTED_ERROR ); diff --git a/testsuites/sptests/spintrcritical01/init.c b/testsuites/sptests/spintrcritical01/init.c index 4251896336..2d8c372a8e 100644 --- a/testsuites/sptests/spintrcritical01/init.c +++ b/testsuites/sptests/spintrcritical01/init.c @@ -58,7 +58,7 @@ Thread_blocking_operation_States getState(void) Semaphore_Control *sem; sem = (Semaphore_Control *)_Objects_Get( - &_Semaphore_Information, Semaphore, &location ); + &_Semaphore_Information, Semaphore, &location ); if ( location != OBJECTS_LOCAL ) { puts( "Bad object lookup" ); rtems_test_exit(0); @@ -122,7 +122,7 @@ rtems_task Init( if ( case_hit ) { puts( "Init - Case hit" ); puts( "*** END OF TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***" ); - } else + } else puts( "Init - Case not hit - ran too long" ); rtems_test_exit(0); diff --git a/testsuites/sptests/spintrcritical06/init.c b/testsuites/sptests/spintrcritical06/init.c index ab22ce2025..8e60b22e0e 100644 --- a/testsuites/sptests/spintrcritical06/init.c +++ b/testsuites/sptests/spintrcritical06/init.c @@ -46,7 +46,7 @@ Thread_blocking_operation_States getState(void) Semaphore_Control *sem; sem = (Semaphore_Control *)_Objects_Get( - &_Semaphore_Information, Semaphore, &location ); + &_Semaphore_Information, Semaphore, &location ); if ( location != OBJECTS_LOCAL ) { puts( "Bad object lookup" ); rtems_test_exit(0); diff --git a/testsuites/sptests/spintrcritical08/init.c b/testsuites/sptests/spintrcritical08/init.c index d7071ebddb..66c2875c6e 100644 --- a/testsuites/sptests/spintrcritical08/init.c +++ b/testsuites/sptests/spintrcritical08/init.c @@ -23,7 +23,7 @@ rtems_rate_monotonic_period_states getState(void) Rate_monotonic_Control *period; period = (Rate_monotonic_Control *)_Objects_Get( - &_Rate_monotonic_Information, Period, &location ); + &_Rate_monotonic_Information, Period, &location ); if ( location != OBJECTS_LOCAL ) { puts( "Bad object lookup" ); rtems_test_exit(0); @@ -79,7 +79,7 @@ rtems_task Init( if ( case_hit ) { puts( "Init - It appears the case has been hit" ); puts( "*** END OF TEST INTERRUPT CRITICAL SECTION 08 ***" ); - } else + } else puts( "Init - Case not hit - ran too long" ); rtems_test_exit(0); } diff --git a/testsuites/sptests/spintrcritical09/init.c b/testsuites/sptests/spintrcritical09/init.c index 93fd7e9529..7ac6e1f1e7 100644 --- a/testsuites/sptests/spintrcritical09/init.c +++ b/testsuites/sptests/spintrcritical09/init.c @@ -23,7 +23,7 @@ Thread_blocking_operation_States getState(void) Semaphore_Control *sem; sem = (Semaphore_Control *)_Objects_Get( - &_Semaphore_Information, Semaphore, &location ); + &_Semaphore_Information, Semaphore, &location ); if ( location != OBJECTS_LOCAL ) { puts( "Bad object lookup" ); rtems_test_exit(0); @@ -79,7 +79,7 @@ rtems_task Init( if ( case_hit ) { puts( "Init - It appears the case has been hit" ); puts( "*** END OF TEST INTERRUPT CRITICAL SECTION 09 ***" ); - } else + } else puts( "Init - Case not hit - ran too long" ); rtems_test_exit(0); diff --git a/testsuites/sptests/spintrcritical16/init.c b/testsuites/sptests/spintrcritical16/init.c index 01cb89204e..cd2093050b 100644 --- a/testsuites/sptests/spintrcritical16/init.c +++ b/testsuites/sptests/spintrcritical16/init.c @@ -26,7 +26,7 @@ Thread_blocking_operation_States getState(void) Semaphore_Control *sem; sem = (Semaphore_Control *)_Objects_Get( - &_Semaphore_Information, Semaphore, &location ); + &_Semaphore_Information, Semaphore, &location ); if ( location != OBJECTS_LOCAL ) { puts( "Bad object lookup" ); rtems_test_exit(0); @@ -91,7 +91,7 @@ rtems_task Init( if ( case_hit ) { puts( "Init - Case hit" ); puts( "*** END OF TEST INTERRUPT CRITICAL SECTION " TEST_NAME " ***" ); - } else + } else puts( "Init - Case not hit - ran too long" ); diff --git a/testsuites/sptests/spintrcritical_support/intrcritical.c b/testsuites/sptests/spintrcritical_support/intrcritical.c index 003cc9ece2..08390a3d27 100644 --- a/testsuites/sptests/spintrcritical_support/intrcritical.c +++ b/testsuites/sptests/spintrcritical_support/intrcritical.c @@ -41,7 +41,7 @@ static bool interrupt_critical_busy_wait( void ) if ( max > 0 ) { Maximum_current = max - 1; - + return false; } else { Maximum_current = Maximum; diff --git a/testsuites/sptests/spnotepad01/init.c b/testsuites/sptests/spnotepad01/init.c index 22029025b5..2c66004d25 100644 --- a/testsuites/sptests/spnotepad01/init.c +++ b/testsuites/sptests/spnotepad01/init.c @@ -1,4 +1,4 @@ -/* +/* * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * diff --git a/testsuites/sptests/spobjgetnext/init.c b/testsuites/sptests/spobjgetnext/init.c index 4c53e8bd36..42fcb410c0 100644 --- a/testsuites/sptests/spobjgetnext/init.c +++ b/testsuites/sptests/spobjgetnext/init.c @@ -16,14 +16,14 @@ #include "system.h" /* prototypes */ -int scan_objects( +int scan_objects( Objects_Information *information, Objects_Id start ); #define MAX_SCAN 10 -int scan_objects( +int scan_objects( Objects_Information *information, Objects_Id start ) @@ -44,7 +44,7 @@ int scan_objects( &id ); if ( !o[i] ) - break; + break; if ( location == OBJECTS_ERROR ) break; /* XXX check dispatch level with macros */ @@ -54,7 +54,7 @@ int scan_objects( /* XXX should be able to check that next Id is not one we have seen */ } return i; -} +} rtems_task Init( rtems_task_argument argument diff --git a/testsuites/sptests/spprintk/init.c b/testsuites/sptests/spprintk/init.c index eb86089163..2135412c65 100644 --- a/testsuites/sptests/spprintk/init.c +++ b/testsuites/sptests/spprintk/init.c @@ -44,7 +44,7 @@ rtems_task Init( printk( "%%u of -16 -- %u\n", -16 ); /* string formats */ - printk( "%%s of Mary Had a Little Lamb -- (%s)\n", + printk( "%%s of Mary Had a Little Lamb -- (%s)\n", "Mary Had a Little Lamb" ); printk( "%%s of NULL -- (%s)\n", NULL ); printk( "%%12s of joel -- (%20s)\n", "joel" ); diff --git a/testsuites/sptests/spstkalloc/init.c b/testsuites/sptests/spstkalloc/init.c index 097a572ec0..5c48770f96 100644 --- a/testsuites/sptests/spstkalloc/init.c +++ b/testsuites/sptests/spstkalloc/init.c @@ -37,7 +37,7 @@ rtems_task Init( rtems_task_argument ignored ) { - rtems_status_code rc; + rtems_status_code rc; rtems_id taskId; rtems_id taskId1; diff --git a/testsuites/sptests/spwkspace/init.c b/testsuites/sptests/spwkspace/init.c index abf4946f54..fb316d61ff 100644 --- a/testsuites/sptests/spwkspace/init.c +++ b/testsuites/sptests/spwkspace/init.c @@ -33,28 +33,28 @@ rtems_task Init( assert( retbool == true ); puts( "rtems_workspace_allocate - null pointer" ); - retbool = rtems_workspace_allocate( 42, NULL ); + retbool = rtems_workspace_allocate( 42, NULL ); assert( retbool == false ); puts( "rtems_workspace_allocate - 0 bytes" ); - retbool = rtems_workspace_allocate( 0, &p1 ); + retbool = rtems_workspace_allocate( 0, &p1 ); assert( retbool == false ); puts( "rtems_workspace_allocate - too many bytes" ); - retbool = rtems_workspace_allocate( info.Free.largest * 2, &p1 ); + retbool = rtems_workspace_allocate( info.Free.largest * 2, &p1 ); assert( retbool == false ); puts( "rtems_workspace_allocate - 42 bytes" ); - retbool = rtems_workspace_allocate( 42, &p1 ); + retbool = rtems_workspace_allocate( 42, &p1 ); assert( retbool == true ); assert( p1 != NULL ); puts( "rtems_workspace_free - NULL" ); - retbool = rtems_workspace_free( NULL ); + retbool = rtems_workspace_free( NULL ); assert( retbool == false ); puts( "rtems_workspace_free - previous pointer to 42 bytes" ); - retbool = rtems_workspace_free( p1 ); + retbool = rtems_workspace_free( p1 ); assert( retbool == true ); puts( "*** END OF TEST WORKSPACE CLASSIC API ***" ); -- cgit v1.2.3