diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-10-26 11:29:24 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-10-26 11:29:24 +0000 |
commit | fde1456d5db1923966ac78b04eda4cd30b9f5704 (patch) | |
tree | b801b044eb4aa44758c66b5cf2f98f8aa3421361 | |
parent | 2009-10-26 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
download | rtems-fde1456d5db1923966ac78b04eda4cd30b9f5704.tar.bz2 |
Use PRIxrtems_id to print rtems_ids.
Diffstat (limited to '')
-rw-r--r-- | testsuites/sptests/sp02/task1.c | 4 | ||||
-rw-r--r-- | testsuites/sptests/sp12/task1.c | 2 | ||||
-rw-r--r-- | testsuites/sptests/sp13/task1.c | 2 | ||||
-rw-r--r-- | testsuites/sptests/sp14/task1.c | 2 | ||||
-rw-r--r-- | testsuites/sptests/sp15/task1.c | 4 | ||||
-rw-r--r-- | testsuites/sptests/sp16/task1.c | 2 | ||||
-rw-r--r-- | testsuites/sptests/sp20/task1.c | 8 | ||||
-rw-r--r-- | testsuites/sptests/sp22/init.c | 2 | ||||
-rw-r--r-- | testsuites/sptests/sp22/task1.c | 2 | ||||
-rw-r--r-- | testsuites/sptests/sp23/task1.c | 2 | ||||
-rw-r--r-- | testsuites/sptests/sp25/task1.c | 6 | ||||
-rw-r--r-- | testsuites/sptests/sp31/init.c | 4 | ||||
-rw-r--r-- | testsuites/sptests/sp31/task1.c | 4 | ||||
-rw-r--r-- | testsuites/sptests/sp34/changepri.c | 2 | ||||
-rw-r--r-- | testsuites/sptests/sp35/priinv.c | 14 | ||||
-rw-r--r-- | testsuites/sptests/sp43/init.c | 4 | ||||
-rw-r--r-- | testsuites/sptests/sp45/init.c | 4 | ||||
-rw-r--r-- | testsuites/sptests/spwatchdog/init.c | 2 | ||||
-rw-r--r-- | testsuites/sptests/spwatchdog/task1.c | 2 |
19 files changed, 36 insertions, 36 deletions
diff --git a/testsuites/sptests/sp02/task1.c b/testsuites/sptests/sp02/task1.c index 026cbc0fa0..998fd50141 100644 --- a/testsuites/sptests/sp02/task1.c +++ b/testsuites/sptests/sp02/task1.c @@ -36,7 +36,7 @@ rtems_task Task_1( status = rtems_task_ident( Task_name[ 2 ], RTEMS_SEARCH_ALL_NODES, &tid2 ); directive_failed( status, "rtems_task_ident of TA2" ); - printf( "TA1 - rtems_task_ident - tid of TA2 (0x%.8x)\n", tid2 ); + printf( "TA1 - rtems_task_ident - tid of TA2 (0x%.8" PRIxrtems_id ")\n", tid2 ); status = rtems_object_get_classic_name( tid2, &tid2_name ); directive_failed( status, "rtems_object_get_classic_name of TA2" ); @@ -46,7 +46,7 @@ rtems_task Task_1( status = rtems_task_ident( Task_name[ 3 ], RTEMS_SEARCH_ALL_NODES, &tid3 ); directive_failed( status, "rtems_task_ident of TA3" ); - printf( "TA1 - rtems_task_ident - tid of TA3 (0x%.8x)\n", tid3 ); + printf( "TA1 - rtems_task_ident - tid of TA3 (0x%.8" PRIxrtems_id ")\n", tid3 ); status = rtems_task_set_priority( tid3, 2, &previous_priority ); directive_failed( status, "rtems_task_set_priority" ); diff --git a/testsuites/sptests/sp12/task1.c b/testsuites/sptests/sp12/task1.c index 1f5a072a61..c1413e3a12 100644 --- a/testsuites/sptests/sp12/task1.c +++ b/testsuites/sptests/sp12/task1.c @@ -31,7 +31,7 @@ rtems_task Task_1( RTEMS_SEARCH_ALL_NODES, &smid ); - printf( "TA1 - rtems_semaphore_ident - smid => %08x\n", smid ); + printf( "TA1 - rtems_semaphore_ident - smid => %08" PRIxrtems_id "\n", smid ); directive_failed( status, "rtems_semaphore_ident of SM1" ); puts( "TA1 - rtems_semaphore_obtain - wait forever on SM2" ); diff --git a/testsuites/sptests/sp13/task1.c b/testsuites/sptests/sp13/task1.c index fd8c054b88..c4ad345e22 100644 --- a/testsuites/sptests/sp13/task1.c +++ b/testsuites/sptests/sp13/task1.c @@ -66,7 +66,7 @@ rtems_task Task_1( RTEMS_SEARCH_ALL_NODES, &qid ); - printf( "TA1 - rtems_message_queue_ident - qid => %08x\n", qid ); + printf( "TA1 - rtems_message_queue_ident - qid => %08" PRIxrtems_id "\n", qid ); directive_failed( status, "rtems_message_queue_ident" ); Fill_buffer( "BUFFER 1 TO Q 1", buffer ); diff --git a/testsuites/sptests/sp14/task1.c b/testsuites/sptests/sp14/task1.c index 898a1afce8..39f3319f3a 100644 --- a/testsuites/sptests/sp14/task1.c +++ b/testsuites/sptests/sp14/task1.c @@ -96,7 +96,7 @@ rtems_test_pause(); puts( "TA1 - timer routine got the correct arguments" ); else printf( - "TA1 - timer got (0x%x, %p) instead of (0x%x, %p)!!!!\n", + "TA1 - timer got (0x%" PRIxrtems_id ", %p) instead of (0x%" PRIxrtems_id ", %p)!!!!\n", Timer_got_this_id, Timer_got_this_pointer, Timer_id[ 1 ], diff --git a/testsuites/sptests/sp15/task1.c b/testsuites/sptests/sp15/task1.c index d74d009881..80967c1fa6 100644 --- a/testsuites/sptests/sp15/task1.c +++ b/testsuites/sptests/sp15/task1.c @@ -38,7 +38,7 @@ rtems_task Task_1( &ptid_1 ); directive_failed( status, "rtems_partition_ident of PT1" ); - printf( "%08x\n", ptid_1 ); + printf( "%08" PRIxrtems_id "\n", ptid_1 ); puts_nocr( "TA1 - rtems_partition_ident - partition 2 id = " ); status = rtems_partition_ident( @@ -47,7 +47,7 @@ rtems_task Task_1( &ptid_2 ); directive_failed( status, "rtems_partition_ident of PT2" ); - printf( "%08x\n", ptid_2 ); + printf( "%08" PRIxrtems_id "\n", ptid_2 ); puts_nocr( "TA1 - rtems_partition_get_buffer - buffer 1 from partition 1 - " diff --git a/testsuites/sptests/sp16/task1.c b/testsuites/sptests/sp16/task1.c index 0e600d15bb..7e4422465f 100644 --- a/testsuites/sptests/sp16/task1.c +++ b/testsuites/sptests/sp16/task1.c @@ -31,7 +31,7 @@ rtems_task Task_1( rtems_status_code status; status = rtems_region_ident( Region_name[ 1 ], &rnid ); - printf( "TA1 - rtems_region_ident - rnid => %08x\n", rnid ); + printf( "TA1 - rtems_region_ident - rnid => %08" PRIxrtems_id "\n", rnid ); directive_failed( status, "rtems_region_ident of RN1" ); puts( diff --git a/testsuites/sptests/sp20/task1.c b/testsuites/sptests/sp20/task1.c index 236fac1bd0..431c72f2b5 100644 --- a/testsuites/sptests/sp20/task1.c +++ b/testsuites/sptests/sp20/task1.c @@ -44,20 +44,20 @@ rtems_task Task_1_through_6( status = rtems_rate_monotonic_create( argument, &rmid ); directive_failed( status, "rtems_rate_monotonic_create" ); put_name( Task_name[ argument ], FALSE ); - printf( "- rtems_rate_monotonic_create id = 0x%08x\n", rmid ); + printf( "- rtems_rate_monotonic_create id = 0x%08" PRIxrtems_id "\n", rmid ); status = rtems_rate_monotonic_ident( argument, &test_rmid ); directive_failed( status, "rtems_rate_monotonic_ident" ); put_name( Task_name[ argument ], FALSE ); - printf( "- rtems_rate_monotonic_ident id = 0x%08x\n", test_rmid ); + printf( "- rtems_rate_monotonic_ident id = 0x%08" PRIxrtems_id "\n", test_rmid ); if ( rmid != test_rmid ) { - printf( "RMID's DO NOT MATCH (0x%x and 0x%x)\n", rmid, test_rmid ); + printf( "RMID's DO NOT MATCH (0x%" PRIxrtems_id " and 0x%" PRIxrtems_id ")\n", rmid, test_rmid ); rtems_test_exit( 0 ); } put_name( Task_name[ argument ], FALSE ); - printf( "- (0x%08x) period %d\n", rmid, Periods[ argument ] ); + printf( "- (0x%08" PRIxrtems_id ") period %d\n", rmid, Periods[ argument ] ); status = rtems_task_wake_after( 2 ); directive_failed( status, "rtems_task_wake_after" ); diff --git a/testsuites/sptests/sp22/init.c b/testsuites/sptests/sp22/init.c index 987b5671b3..6a3068bf1e 100644 --- a/testsuites/sptests/sp22/init.c +++ b/testsuites/sptests/sp22/init.c @@ -58,7 +58,7 @@ rtems_task Init( status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] ); directive_failed( status, "rtems_timer_create" ); - printf( "INIT - timer 1 has id (0x%x)\n", Timer_id[ 1 ] ); + printf( "INIT - timer 1 has id (0x%" PRIxrtems_id ")\n", Timer_id[ 1 ] ); status = rtems_task_delete( RTEMS_SELF ); directive_failed( status, "rtems_task_delete of RTEMS_SELF" ); diff --git a/testsuites/sptests/sp22/task1.c b/testsuites/sptests/sp22/task1.c index 930a2b6001..5f8fbb1dca 100644 --- a/testsuites/sptests/sp22/task1.c +++ b/testsuites/sptests/sp22/task1.c @@ -33,7 +33,7 @@ rtems_task Task_1( puts( "TA1 - rtems_timer_ident - identing timer 1" ); status = rtems_timer_ident( Timer_name[ 1 ], &tmid ); directive_failed( status, "rtems_timer_ident" ); - printf( "TA1 - timer 1 has id (0x%x)\n", tmid ); + printf( "TA1 - timer 1 has id (0x%" PRIxrtems_id ")\n", tmid ); /* after which is allowed to fire */ diff --git a/testsuites/sptests/sp23/task1.c b/testsuites/sptests/sp23/task1.c index afc004717c..57955277a1 100644 --- a/testsuites/sptests/sp23/task1.c +++ b/testsuites/sptests/sp23/task1.c @@ -32,7 +32,7 @@ rtems_task Task_1( status = rtems_port_ident( Port_name[ 1 ], &dpid ); directive_failed( status, "rtems_port_ident" ); - printf( "TA1 - rtems_port_ident - 0x%08x\n", dpid ); + printf( "TA1 - rtems_port_ident - 0x%08" PRIxrtems_id "\n", dpid ); to_be_converted = &External_port_area[ 0xe ]; status = rtems_port_external_to_internal( diff --git a/testsuites/sptests/sp25/task1.c b/testsuites/sptests/sp25/task1.c index a1f47ba1e4..9483fad47e 100644 --- a/testsuites/sptests/sp25/task1.c +++ b/testsuites/sptests/sp25/task1.c @@ -38,7 +38,7 @@ rtems_task Task_1( /* Obtain the region id */ status = rtems_region_ident(Region_name[ 1 ], ®ion_id); - printf( "TA1 - rtems_region_ident - 0x%08x\n", region_id ); + printf( "TA1 - rtems_region_ident - 0x%08" PRIxrtems_id "\n", region_id ); directive_failed(status, "rtems_region_ident of RN01"); /* Get a 64 byte segment from the region */ @@ -186,7 +186,7 @@ rtems_task Task_1( printf( "TA1 - got segment size of %d\n", segment_size ); /* Get information about the region */ - printf( "TA1 - rtems_region_get_information - 0x%08x\n", region_id ); + printf( "TA1 - rtems_region_get_information - 0x%08" PRIxrtems_id "\n", region_id ); status = rtems_region_get_information(region_id, ®ion_info); directive_failed(status, "rtems_region_get_information of RN01"); printf( @@ -195,7 +195,7 @@ rtems_task Task_1( region_info.Used.number ); - printf( "TA1 - rtems_region_get_free_information - 0x%08x\n", region_id ); + printf( "TA1 - rtems_region_get_free_information - 0x%08" PRIxrtems_id "\n", region_id ); status = rtems_region_get_free_information(region_id, ®ion_info); directive_failed(status, "rtems_region_get_free_information of RN01"); printf( diff --git a/testsuites/sptests/sp31/init.c b/testsuites/sptests/sp31/init.c index f1e2dd89c6..64d1b998c8 100644 --- a/testsuites/sptests/sp31/init.c +++ b/testsuites/sptests/sp31/init.c @@ -65,12 +65,12 @@ rtems_task Init( puts( "INIT - rtems_timer_create - creating timer 1" ); status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] ); directive_failed( status, "rtems_timer_create" ); - printf( "INIT - timer 1 has id (0x%x)\n", Timer_id[ 1 ] ); + printf( "INIT - timer 1 has id (0x%" PRIxrtems_id ")\n", Timer_id[ 1 ] ); puts( "INIT - rtems_timer_create - creating timer 2" ); status = rtems_timer_create( Timer_name[ 2 ], &Timer_id[ 2 ] ); directive_failed( status, "rtems_timer_create" ); - printf( "INIT - timer 2 has id (0x%x)\n", Timer_id[ 2 ] ); + printf( "INIT - timer 2 has id (0x%" PRIxrtems_id ")\n", Timer_id[ 2 ] ); status = rtems_task_delete( RTEMS_SELF ); directive_failed( status, "rtems_task_delete of RTEMS_SELF" ); diff --git a/testsuites/sptests/sp31/task1.c b/testsuites/sptests/sp31/task1.c index 7fde2ce4c9..73f0222cc5 100644 --- a/testsuites/sptests/sp31/task1.c +++ b/testsuites/sptests/sp31/task1.c @@ -50,12 +50,12 @@ rtems_task Task_1( puts( "TA1 - rtems_timer_ident - identing timer 1" ); status = rtems_timer_ident( Timer_name[ 1 ], &tmid ); directive_failed( status, "rtems_timer_ident" ); - printf( "TA1 - timer 1 has id (0x%x)\n", tmid ); + printf( "TA1 - timer 1 has id (0x%" PRIxrtems_id ")\n", tmid ); puts( "TA1 - rtems_timer_ident - identing timer 2" ); status = rtems_timer_ident( Timer_name[ 2 ], &tmid2 ); directive_failed( status, "rtems_timer_ident" ); - printf( "TA1 - timer 2 has id (0x%x)\n", tmid2 ); + printf( "TA1 - timer 2 has id (0x%" PRIxrtems_id ")\n", tmid2 ); /* make sure insertion does not unintentionally fire a timer per PR147 */ diff --git a/testsuites/sptests/sp34/changepri.c b/testsuites/sptests/sp34/changepri.c index d5571bb4a7..5e10ebc84b 100644 --- a/testsuites/sptests/sp34/changepri.c +++ b/testsuites/sptests/sp34/changepri.c @@ -123,7 +123,7 @@ rtems_task Init(rtems_task_argument ignored) &Blockers[i]); /* Assigned ID */ directive_failed( status, "rtems_task_create (BLKn)" ); - printf( "Blockers[%d] Id = 0x%08x\n", i, Blockers[i] ); + printf( "Blockers[%d] Id = 0x%08" PRIxrtems_id "\n", i, Blockers[i] ); status = rtems_task_start( Blockers[i], BlockingTasks, diff --git a/testsuites/sptests/sp35/priinv.c b/testsuites/sptests/sp35/priinv.c index 8b5daf89b2..e2691d7c60 100644 --- a/testsuites/sptests/sp35/priinv.c +++ b/testsuites/sptests/sp35/priinv.c @@ -377,7 +377,7 @@ rtems_task Init(rtems_task_argument ignored) &LocalHwSync_S); /* *id */ directive_failed( status, "rtems_semaphore_create (SYNC)" ); - printf( "Sync Mutex Id = 0x%08x\n", LocalHwSync_S ); + 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( @@ -391,7 +391,7 @@ rtems_task Init(rtems_task_argument ignored) &LocalHwAccess_R); /* *id */ directive_failed( status, "rtems_semaphore_create (RES1)" ); - printf( "Local Mutex Id = 0x%08x\n", LocalHwAccess_R ); + printf( "Local Mutex Id = 0x%08" PRIxrtems_id "\n", LocalHwAccess_R ); /* Create resource semaphore for exclusive access to the remote HW */ status = rtems_semaphore_create( @@ -405,7 +405,7 @@ rtems_task Init(rtems_task_argument ignored) &RemoteHwAccess_R); /* *id */ directive_failed( status, "rtems_semaphore_create (RES2)" ); - printf( "Remote Mutex Id = 0x%08x\n", RemoteHwAccess_R ); + 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 */ @@ -429,7 +429,7 @@ rtems_task Init(rtems_task_argument ignored) &TaMedium[i]); /* Assigned ID */ directive_failed( status, "rtems_task_create (MEDn)" ); - printf( "TaMedium[%d] Id = 0x%08x\n", i, TaMedium[i] ); + printf( "TaMedium[%d] Id = 0x%08" PRIxrtems_id "\n", i, TaMedium[i] ); status = rtems_task_start( TaMedium[i], Medium_Exec, @@ -449,7 +449,7 @@ rtems_task Init(rtems_task_argument ignored) &TaHigh); /* Assigned ID */ directive_failed( status, "rtems_task_create (HIGH)" ); - printf( "TaHigh Id = 0x%08x\n", TaHigh ); + printf( "TaHigh Id = 0x%08" PRIxrtems_id "\n", TaHigh ); status = rtems_task_start(TaHigh, High_Exec, 0); directive_failed( status, "rtems_task_start (HIGH)" ); @@ -464,7 +464,7 @@ rtems_task Init(rtems_task_argument ignored) &TaLow); /* Assigned ID */ directive_failed( status, "rtems_task_create (LOW)" ); - printf( "TaLow Id = 0x%08x\n", TaLow ); + printf( "TaLow Id = 0x%08" PRIxrtems_id "\n", TaLow ); status = rtems_task_start(TaLow, Low_Exec, 0); directive_failed( status, "rtems_task_start (LOW)" ); @@ -479,7 +479,7 @@ rtems_task Init(rtems_task_argument ignored) &TaHwSim); /* Assigned ID */ directive_failed( status, "rtems_task_create (HWSM)" ); - printf( "TaHwSim Id = 0x%08x\n", TaHwSim ); + printf( "TaHwSim Id = 0x%08" PRIxrtems_id "\n", TaHwSim ); status = rtems_task_start(TaHwSim, LocalHwSim_Exec, 0); directive_failed( status, "rtems_task_start (HWSM)" ); diff --git a/testsuites/sptests/sp43/init.c b/testsuites/sptests/sp43/init.c index e7f4f5d9f3..b18e44d36f 100644 --- a/testsuites/sptests/sp43/init.c +++ b/testsuites/sptests/sp43/init.c @@ -46,8 +46,8 @@ void print_class_info( { printf( "%s API %s Information\n" - " minimum id : 0x%08x maximum id: 0x%08x\n" - " maximum : %7d available : %d\n" + " minimum id : 0x%08" PRIxrtems_id " maximum id: 0x%08" PRIxrtems_id "\n" + " maximum : %7" PRIu32 " available : %" PRIu32 "\n" " auto_extend : %s\n", rtems_object_get_api_name(api), rtems_object_get_api_class_name(api, class), diff --git a/testsuites/sptests/sp45/init.c b/testsuites/sptests/sp45/init.c index 0fbc879011..576c1f7532 100644 --- a/testsuites/sptests/sp45/init.c +++ b/testsuites/sptests/sp45/init.c @@ -69,12 +69,12 @@ rtems_task Init( puts( "INIT - rtems_timer_create - creating timer 1" ); status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] ); directive_failed( status, "rtems_timer_create" ); - printf( "INIT - timer 1 has id (0x%x)\n", Timer_id[ 1 ] ); + printf( "INIT - timer 1 has id (0x%" PRIxrtems_id ")\n", Timer_id[ 1 ] ); puts( "INIT - rtems_timer_create - creating timer 2" ); status = rtems_timer_create( Timer_name[ 2 ], &Timer_id[ 2 ] ); directive_failed( status, "rtems_timer_create" ); - printf( "INIT - timer 2 has id (0x%x)\n", Timer_id[ 2 ] ); + printf( "INIT - timer 2 has id (0x%" PRIxrtems_id ")\n", Timer_id[ 2 ] ); /* * Schedule malloc TSR for 1 second from now diff --git a/testsuites/sptests/spwatchdog/init.c b/testsuites/sptests/spwatchdog/init.c index 192264859d..3129aff6e9 100644 --- a/testsuites/sptests/spwatchdog/init.c +++ b/testsuites/sptests/spwatchdog/init.c @@ -59,7 +59,7 @@ rtems_task Init( status = rtems_timer_create( Timer_name[ 1 ], &Timer_id[ 1 ] ); directive_failed( status, "rtems_timer_create" ); - printf( "INIT - timer 1 has id (0x%x)\n", Timer_id[ 1 ] ); + printf( "INIT - timer 1 has id (0x%" PRIxrtems_id ")\n", Timer_id[ 1 ] ); status = rtems_task_delete( RTEMS_SELF ); directive_failed( status, "rtems_task_delete of RTEMS_SELF" ); diff --git a/testsuites/sptests/spwatchdog/task1.c b/testsuites/sptests/spwatchdog/task1.c index f770507dd9..a60e73a65b 100644 --- a/testsuites/sptests/spwatchdog/task1.c +++ b/testsuites/sptests/spwatchdog/task1.c @@ -31,7 +31,7 @@ rtems_task Task_1( puts( "TA1 - rtems_timer_ident - identing timer 1" ); status = rtems_timer_ident( Timer_name[ 1 ], &tmid ); directive_failed( status, "rtems_timer_ident" ); - printf( "TA1 - timer 1 has id (0x%x)\n", tmid ); + printf( "TA1 - timer 1 has id (0x%" PRIxrtems_id ")\n", tmid ); /* after which is allowed to fire */ |