From 073dff354d05021fbcd65e895fa65fa090cb6dd3 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 27 Oct 2009 06:59:20 +0000 Subject: Use PRIdrtems_task_argument to print rtems_task_argument's. --- testsuites/sptests/sp12/pritask.c | 2 +- testsuites/sptests/sp28/init.c | 6 +++--- testsuites/sptests/sp33/init.c | 4 ++-- testsuites/sptests/sp34/changepri.c | 4 ++-- testsuites/sptests/sp35/priinv.c | 12 ++++++------ testsuites/sptests/sp44/init.c | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) (limited to 'testsuites/sptests') diff --git a/testsuites/sptests/sp12/pritask.c b/testsuites/sptests/sp12/pritask.c index 6aec7d4b29..c825c0c3f3 100644 --- a/testsuites/sptests/sp12/pritask.c +++ b/testsuites/sptests/sp12/pritask.c @@ -47,7 +47,7 @@ rtems_task Priority_task( directive_failed( status, "rtems_semaphore_obtain of SM2" ); if ( its_priority < PRIORITY_INHERIT_BASE_PRIORITY ) { - printf( "PRI%d - WHY AM I HERE? (pri=%" PRIdrtems_task_priority ")", its_index, its_priority ); + printf( "PRI%" PRIdrtems_task_argument " - WHY AM I HERE? (pri=%" PRIdrtems_task_priority ")", its_index, its_priority ); rtems_test_exit( 0 ); } diff --git a/testsuites/sptests/sp28/init.c b/testsuites/sptests/sp28/init.c index 0aad441ab3..d5c9147665 100644 --- a/testsuites/sptests/sp28/init.c +++ b/testsuites/sptests/sp28/init.c @@ -50,7 +50,7 @@ subtask (rtems_task_argument arg) taskvar = (void *)((uintptr_t)taskvar + 1); rtems_task_wake_after (0); if ((uintptr_t)taskvar != localvar) { - printf ("Task:%d taskvar:%d localvar:%d\n", + printf ("Task:%" PRIdrtems_task_argument " taskvar:%" PRIuPTR " localvar:%" PRIuPTR "\n", arg, (uintptr_t)taskvar, localvar); rtems_task_suspend (RTEMS_SELF); } @@ -60,7 +60,7 @@ subtask (rtems_task_argument arg) directive_failed( sc, "task variable delete" ); if ((uintptr_t)taskvar == localvar) { - printf("Task:%d deleted taskvar:%d localvar:%d\n", + printf("Task:%" PRIdrtems_task_argument " deleted taskvar:%" PRIuPTR " localvar:%" PRIuPTR "\n", arg, (uintptr_t)taskvar, localvar); nRunning--; rtems_task_suspend (RTEMS_SELF); @@ -73,7 +73,7 @@ subtask (rtems_task_argument arg) if (nRunning <= 1) break; if ((uintptr_t)taskvar == localvar) { - printf("Task:%d taskvar:%d localvar:%d\n", + printf("Task:%" PRIdrtems_task_argument " taskvar:%" PRIuPTR " localvar:%" PRIuPTR "\n", arg, (uintptr_t)taskvar, localvar); nRunning--; rtems_task_suspend(RTEMS_SELF); diff --git a/testsuites/sptests/sp33/init.c b/testsuites/sptests/sp33/init.c index 6b5e04ad99..28d31fffb1 100644 --- a/testsuites/sptests/sp33/init.c +++ b/testsuites/sptests/sp33/init.c @@ -39,10 +39,10 @@ rtems_task Waiter( { rtems_status_code status; - printf( "Waiter %d waiting on barrier\n", number ); + printf( "Waiter %" PRIdrtems_task_argument " waiting on barrier\n", number ); status = rtems_barrier_wait( Barrier, RTEMS_NO_TIMEOUT ); - printf( "Waiter %d back from barrier\n", number ); + printf( "Waiter %" PRIdrtems_task_argument " back from barrier\n", number ); if ( SuccessfulCase == TRUE ) { directive_failed(status, "rtems_barrier_wait"); diff --git a/testsuites/sptests/sp34/changepri.c b/testsuites/sptests/sp34/changepri.c index 40eef1349b..b444bf1a19 100644 --- a/testsuites/sptests/sp34/changepri.c +++ b/testsuites/sptests/sp34/changepri.c @@ -76,7 +76,7 @@ rtems_task BlockingTasks(rtems_task_argument arg) status = rtems_task_set_priority(RTEMS_SELF, RTEMS_CURRENT_PRIORITY, &opri); directive_failed( status, "rtems_task_set_priority" ); - printf("semaphore_obtain -- BlockingTask %d @ pri=%" PRIdrtems_task_priority ") blocks\n", arg, opri); + printf("semaphore_obtain -- BlockingTask %" PRIdrtems_task_argument " @ pri=%" PRIdrtems_task_priority ") blocks\n", arg, opri); status = rtems_semaphore_obtain(Semaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT); directive_failed( status, "rtems_semaphore_obtain" ); @@ -84,7 +84,7 @@ rtems_task BlockingTasks(rtems_task_argument arg) status = rtems_task_set_priority(RTEMS_SELF, RTEMS_CURRENT_PRIORITY, &npri); directive_failed( status, "rtems_task_set_priority" ); - printf("semaphore_obtain -- BlockingTask %d @ pri=%" PRIdrtems_task_priority ") returns\n", arg, npri); + printf("semaphore_obtain -- BlockingTask %" PRIdrtems_task_argument " @ pri=%" PRIdrtems_task_priority ") returns\n", arg, npri); (void) rtems_task_delete( RTEMS_SELF ); } diff --git a/testsuites/sptests/sp35/priinv.c b/testsuites/sptests/sp35/priinv.c index 4b0821ea73..ba3ed482ce 100644 --- a/testsuites/sptests/sp35/priinv.c +++ b/testsuites/sptests/sp35/priinv.c @@ -123,7 +123,7 @@ volatile bool StartHw = false; rtems_task Medium_Exec(rtems_task_argument TaskArg) { - printf("Medium_Exec (%d) begins...\n", TaskArg); + printf("Medium_Exec (%" PRIdrtems_task_argument ") begins...\n", TaskArg); rtems_task_wake_after(50); @@ -133,7 +133,7 @@ rtems_task Medium_Exec(rtems_task_argument TaskArg) /* JRS - task does not get here */ - printf("Medium_Exec (%d) ends...\n", TaskArg); + printf("Medium_Exec (%" PRIdrtems_task_argument ") ends...\n", TaskArg); while(1) { rtems_task_wake_after(10000); } @@ -141,7 +141,7 @@ rtems_task Medium_Exec(rtems_task_argument TaskArg) rtems_task High_Exec(rtems_task_argument TaskArg) { - printf("High_Exec (%d) begins...\n", TaskArg); + printf("High_Exec (%" PRIdrtems_task_argument ") begins...\n", TaskArg); /* Delay more than the Low-prio task so that Remote HW access resource is * taken before call to AccesRemoteHw. @@ -154,7 +154,7 @@ rtems_task High_Exec(rtems_task_argument TaskArg) /* JRS - task does not get here */ - printf("High_Exec (%d) ends...\n", TaskArg); + printf("High_Exec (%" PRIdrtems_task_argument ") ends...\n", TaskArg); while(1) { rtems_task_wake_after(10000); } @@ -163,7 +163,7 @@ rtems_task High_Exec(rtems_task_argument TaskArg) rtems_task Low_Exec(rtems_task_argument TaskArg) { - printf("Low_Exec (%d) begins...\n", TaskArg); + printf("Low_Exec (%" PRIdrtems_task_argument ") begins...\n", TaskArg); /* Delay less than High-prio task so that we take the remote HW access * resource before it does it. However, delay longer than the mid-prio @@ -178,7 +178,7 @@ rtems_task Low_Exec(rtems_task_argument TaskArg) /* JRS - task does not get here */ - printf("Low_Exec (%d) ends...\n", TaskArg); + printf("Low_Exec (%" PRIdrtems_task_argument ") ends...\n", TaskArg); while(1) { rtems_task_wake_after(10000); } diff --git a/testsuites/sptests/sp44/init.c b/testsuites/sptests/sp44/init.c index 0af5205c3a..7a1e3e9e41 100644 --- a/testsuites/sptests/sp44/init.c +++ b/testsuites/sptests/sp44/init.c @@ -77,7 +77,7 @@ rtems_task TaskAB_entry(rtems_task_argument me) while(1) { if (turn == me) { - printf("Task #%d's turn. Now setting turn to %d\n", me, 1 - me); + printf("Task #%" PRIdrtems_task_argument "'s turn. Now setting turn to %d\n", me, 1 - me); turn = 1 - me; if ( ++iterations == 10 ) { -- cgit v1.2.3