From d8e681e7fbd86dc032d71c069122e92bc1f20d11 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 30 Mar 2004 11:18:29 +0000 Subject: 2004-03-30 Ralf Corsepius * mp02/task1.c, mp03/system.h, mp03/task1.c, mp04/task1.c, mp05/system.h, mp06/task1.c, mp07/task1.c, mp08/task1.c, mp09/recvmsg.c, mp09/sendmsg.c, mp09/task1.c, mp10/task1.c, mp11/init.c, mp12/init.c, mp13/task1.c, mp14/evtask1.c, mp14/evtmtask.c, mp14/init.c, mp14/msgtask1.c, mp14/pttask1.c, mp14/smtask1.c, mp14/system.h: Convert to using c99 fixed size types. --- testsuites/mptests/ChangeLog | 10 ++++++++++ testsuites/mptests/mp02/task1.c | 4 ++-- testsuites/mptests/mp03/system.h | 2 +- testsuites/mptests/mp03/task1.c | 2 +- testsuites/mptests/mp04/task1.c | 2 +- testsuites/mptests/mp05/system.h | 6 +++--- testsuites/mptests/mp06/task1.c | 4 ++-- testsuites/mptests/mp07/task1.c | 4 ++-- testsuites/mptests/mp08/task1.c | 2 +- testsuites/mptests/mp09/recvmsg.c | 4 ++-- testsuites/mptests/mp09/sendmsg.c | 2 +- testsuites/mptests/mp09/task1.c | 4 ++-- testsuites/mptests/mp10/task1.c | 2 +- testsuites/mptests/mp11/init.c | 4 ++-- testsuites/mptests/mp12/init.c | 2 +- testsuites/mptests/mp13/task1.c | 2 +- testsuites/mptests/mp14/evtask1.c | 4 ++-- testsuites/mptests/mp14/evtmtask.c | 4 ++-- testsuites/mptests/mp14/init.c | 2 +- testsuites/mptests/mp14/msgtask1.c | 12 ++++++------ testsuites/mptests/mp14/pttask1.c | 4 ++-- testsuites/mptests/mp14/smtask1.c | 4 ++-- testsuites/mptests/mp14/system.h | 2 +- 23 files changed, 49 insertions(+), 39 deletions(-) (limited to 'testsuites') diff --git a/testsuites/mptests/ChangeLog b/testsuites/mptests/ChangeLog index b3a5d9e089..fe69962af8 100644 --- a/testsuites/mptests/ChangeLog +++ b/testsuites/mptests/ChangeLog @@ -1,3 +1,13 @@ +2004-03-30 Ralf Corsepius + + * mp02/task1.c, mp03/system.h, mp03/task1.c, mp04/task1.c, + mp05/system.h, mp06/task1.c, mp07/task1.c, mp08/task1.c, + mp09/recvmsg.c, mp09/sendmsg.c, mp09/task1.c, mp10/task1.c, + mp11/init.c, mp12/init.c, mp13/task1.c, mp14/evtask1.c, + mp14/evtmtask.c, mp14/init.c, mp14/msgtask1.c, mp14/pttask1.c, + mp14/smtask1.c, mp14/system.h: Convert to using c99 fixed size + types. + 2004-03-25 Ralf Corsepius * configure.ac: Add 2nd arg to RTEMS_TOP. diff --git a/testsuites/mptests/mp02/task1.c b/testsuites/mptests/mp02/task1.c index 6ad7b177c9..c00df840ba 100644 --- a/testsuites/mptests/mp02/task1.c +++ b/testsuites/mptests/mp02/task1.c @@ -29,10 +29,10 @@ rtems_task Test_task( { rtems_id tid; rtems_status_code status; - rtems_unsigned32 remote_node; + uint32_t remote_node; rtems_id remote_tid; rtems_id test_tid; - rtems_unsigned32 note; + uint32_t note; status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid ); diff --git a/testsuites/mptests/mp03/system.h b/testsuites/mptests/mp03/system.h index a63e71880c..e04b4bf3c8 100644 --- a/testsuites/mptests/mp03/system.h +++ b/testsuites/mptests/mp03/system.h @@ -52,7 +52,7 @@ TEST_EXTERN rtems_name Task_name[ 4 ]; /* array of task names */ TEST_EXTERN rtems_id Timer_id[ 2 ]; /* array of timer ids */ TEST_EXTERN rtems_name Timer_name[ 2 ]; /* array of timer names */ -TEST_EXTERN rtems_unsigned32 remote_node; +TEST_EXTERN uint32_t remote_node; TEST_EXTERN rtems_id remote_tid; /* end of include file */ diff --git a/testsuites/mptests/mp03/task1.c b/testsuites/mptests/mp03/task1.c index 7e449448bc..f1a3d90760 100644 --- a/testsuites/mptests/mp03/task1.c +++ b/testsuites/mptests/mp03/task1.c @@ -26,7 +26,7 @@ */ void Test_Task_Support( - rtems_unsigned32 node + uint32_t node ) { rtems_event_set events; diff --git a/testsuites/mptests/mp04/task1.c b/testsuites/mptests/mp04/task1.c index f2d819f4b6..78b3952666 100644 --- a/testsuites/mptests/mp04/task1.c +++ b/testsuites/mptests/mp04/task1.c @@ -27,7 +27,7 @@ rtems_task Test_task( { rtems_id tid; rtems_status_code status; - rtems_unsigned32 remote_node; + uint32_t remote_node; rtems_id remote_tid; rtems_task_priority previous_priority; rtems_task_priority previous_priority_1; diff --git a/testsuites/mptests/mp05/system.h b/testsuites/mptests/mp05/system.h index b7db3c1182..7a60925a7c 100644 --- a/testsuites/mptests/mp05/system.h +++ b/testsuites/mptests/mp05/system.h @@ -53,11 +53,11 @@ TEST_EXTERN rtems_name Timer_name[ 2 ]; /* array of timer names */ TEST_EXTERN volatile rtems_boolean Stop_Test; -TEST_EXTERN rtems_unsigned32 remote_node; +TEST_EXTERN uint32_t remote_node; TEST_EXTERN rtems_id remote_tid; TEST_EXTERN rtems_signal_set remote_signal; TEST_EXTERN rtems_signal_set expected_signal; -TEST_EXTERN volatile rtems_unsigned32 signal_count; -TEST_EXTERN volatile rtems_unsigned32 signal_caught; +TEST_EXTERN volatile uint32_t signal_count; +TEST_EXTERN volatile uint32_t signal_caught; /* end of include file */ diff --git a/testsuites/mptests/mp06/task1.c b/testsuites/mptests/mp06/task1.c index fdfee8cb49..ec5ab571ca 100644 --- a/testsuites/mptests/mp06/task1.c +++ b/testsuites/mptests/mp06/task1.c @@ -86,8 +86,8 @@ rtems_task Test_task( ) { rtems_status_code status; - rtems_unsigned32 count; - rtems_unsigned32 remote_node; + uint32_t count; + uint32_t remote_node; rtems_id remote_tid; rtems_event_set event_out; rtems_event_set event_for_this_iteration; diff --git a/testsuites/mptests/mp07/task1.c b/testsuites/mptests/mp07/task1.c index 5d04d04b68..f964506d04 100644 --- a/testsuites/mptests/mp07/task1.c +++ b/testsuites/mptests/mp07/task1.c @@ -36,8 +36,8 @@ rtems_task Test_task( ) { rtems_status_code status; - rtems_unsigned32 count; - rtems_unsigned32 remote_node; + uint32_t count; + uint32_t remote_node; rtems_id remote_tid; rtems_event_set event_out; diff --git a/testsuites/mptests/mp08/task1.c b/testsuites/mptests/mp08/task1.c index 50c5055e81..f547cccfe0 100644 --- a/testsuites/mptests/mp08/task1.c +++ b/testsuites/mptests/mp08/task1.c @@ -24,7 +24,7 @@ rtems_task Test_task( rtems_task_argument argument ) { - rtems_unsigned32 count; + uint32_t count; rtems_status_code status; puts( "Getting SMID of semaphore" ); diff --git a/testsuites/mptests/mp09/recvmsg.c b/testsuites/mptests/mp09/recvmsg.c index 4228cbebc2..29bab26247 100644 --- a/testsuites/mptests/mp09/recvmsg.c +++ b/testsuites/mptests/mp09/recvmsg.c @@ -22,8 +22,8 @@ void Receive_messages() { rtems_status_code status; - rtems_unsigned32 index; - rtems_unsigned32 size; + uint32_t index; + uint32_t size; char receive_buffer[16]; for ( index=1 ; index <=3 ; index++ ) { diff --git a/testsuites/mptests/mp09/sendmsg.c b/testsuites/mptests/mp09/sendmsg.c index 70b5390afa..03f02790e5 100644 --- a/testsuites/mptests/mp09/sendmsg.c +++ b/testsuites/mptests/mp09/sendmsg.c @@ -22,7 +22,7 @@ void Send_messages() { rtems_status_code status; - rtems_unsigned32 broadcast_count; + uint32_t broadcast_count; puts_nocr( "rtems_message_queue_send: " ); puts( buffer1 ); diff --git a/testsuites/mptests/mp09/task1.c b/testsuites/mptests/mp09/task1.c index f7d198323d..3c7fff9ab4 100644 --- a/testsuites/mptests/mp09/task1.c +++ b/testsuites/mptests/mp09/task1.c @@ -30,8 +30,8 @@ rtems_task Test_task( ) { rtems_status_code status; - rtems_unsigned32 count; - rtems_unsigned32 size; + uint32_t count; + uint32_t size; char receive_buffer[16]; status = rtems_task_wake_after( TICKS_PER_SECOND ); diff --git a/testsuites/mptests/mp10/task1.c b/testsuites/mptests/mp10/task1.c index 3762ed7948..12ae7a540c 100644 --- a/testsuites/mptests/mp10/task1.c +++ b/testsuites/mptests/mp10/task1.c @@ -25,7 +25,7 @@ rtems_task Test_task1( ) { char receive_buffer[16]; - rtems_unsigned32 size; + uint32_t size; rtems_status_code status; puts( "Getting QID of message queue" ); diff --git a/testsuites/mptests/mp11/init.c b/testsuites/mptests/mp11/init.c index 8b1285ce77..fe904b92ca 100644 --- a/testsuites/mptests/mp11/init.c +++ b/testsuites/mptests/mp11/init.c @@ -27,7 +27,7 @@ #define TEST_INIT #include "system.h" -rtems_unsigned8 my_partition[0x30000] CPU_STRUCTURE_ALIGNMENT; +uint8_t my_partition[0x30000] CPU_STRUCTURE_ALIGNMENT; rtems_task Init( rtems_task_argument argument @@ -90,7 +90,7 @@ rtems_task Init( puts( "Attempting to create Partition (Global)" ); status = rtems_partition_create( 1, - (rtems_unsigned8 *) my_partition, + (uint8_t *) my_partition, 128, 64, RTEMS_GLOBAL, diff --git a/testsuites/mptests/mp12/init.c b/testsuites/mptests/mp12/init.c index 028cbb4675..1177092db7 100644 --- a/testsuites/mptests/mp12/init.c +++ b/testsuites/mptests/mp12/init.c @@ -29,7 +29,7 @@ #define TEST_INIT #include "system.h" -rtems_unsigned8 Partition_area[ 1024 ] CPU_STRUCTURE_ALIGNMENT; +uint8_t Partition_area[ 1024 ] CPU_STRUCTURE_ALIGNMENT; rtems_task Init( rtems_task_argument argument diff --git a/testsuites/mptests/mp13/task1.c b/testsuites/mptests/mp13/task1.c index 824c6c1b45..2c1938b284 100644 --- a/testsuites/mptests/mp13/task1.c +++ b/testsuites/mptests/mp13/task1.c @@ -26,7 +26,7 @@ rtems_task Test_task1( ) { char receive_buffer[16]; - rtems_unsigned32 size; + uint32_t size; rtems_status_code status; puts( "Getting QID of message queue" ); diff --git a/testsuites/mptests/mp14/evtask1.c b/testsuites/mptests/mp14/evtask1.c index ed699b9f0b..d8665e73ca 100644 --- a/testsuites/mptests/mp14/evtask1.c +++ b/testsuites/mptests/mp14/evtask1.c @@ -28,8 +28,8 @@ rtems_task Test_task( ) { rtems_status_code status; - rtems_unsigned32 count; - rtems_unsigned32 remote_node; + uint32_t count; + uint32_t remote_node; rtems_id remote_tid; rtems_event_set event_out; diff --git a/testsuites/mptests/mp14/evtmtask.c b/testsuites/mptests/mp14/evtmtask.c index 2a8ad0ff61..cad9a5e212 100644 --- a/testsuites/mptests/mp14/evtmtask.c +++ b/testsuites/mptests/mp14/evtmtask.c @@ -24,8 +24,8 @@ rtems_task Delayed_events_task( rtems_task_argument argument ) { - rtems_unsigned32 count; - rtems_unsigned32 previous_mode; + uint32_t count; + uint32_t previous_mode; rtems_status_code status; rtems_event_set events; diff --git a/testsuites/mptests/mp14/init.c b/testsuites/mptests/mp14/init.c index 76b518de07..378737cce2 100644 --- a/testsuites/mptests/mp14/init.c +++ b/testsuites/mptests/mp14/init.c @@ -24,7 +24,7 @@ #define TEST_INIT #include "system.h" -rtems_unsigned8 my_partition[0x30000] CPU_STRUCTURE_ALIGNMENT; +uint8_t my_partition[0x30000] CPU_STRUCTURE_ALIGNMENT; rtems_timer_service_routine Stop_Test_TSR( rtems_id ignored_id, diff --git a/testsuites/mptests/mp14/msgtask1.c b/testsuites/mptests/mp14/msgtask1.c index b70a332ff3..567546f5b1 100644 --- a/testsuites/mptests/mp14/msgtask1.c +++ b/testsuites/mptests/mp14/msgtask1.c @@ -27,11 +27,11 @@ rtems_task Message_queue_task( ) { rtems_status_code status; - rtems_unsigned32 count; - rtems_unsigned32 yield_count; - rtems_unsigned32 *buffer_count; - rtems_unsigned32 *overflow_count; - rtems_unsigned32 size; + uint32_t count; + uint32_t yield_count; + uint32_t *buffer_count; + uint32_t *overflow_count; + uint32_t size; Msg_buffer[ index ][0] = 0; Msg_buffer[ index ][1] = 0; @@ -78,7 +78,7 @@ rtems_task Message_queue_task( ); directive_failed( status, "rtems_message_queue_receive" ); - if ( *buffer_count == (rtems_unsigned32)0xffffffff ) { + if ( *buffer_count == (uint32_t )0xffffffff ) { *buffer_count = 0; *overflow_count += 1; } else diff --git a/testsuites/mptests/mp14/pttask1.c b/testsuites/mptests/mp14/pttask1.c index b5b83d671f..c2322a3f87 100644 --- a/testsuites/mptests/mp14/pttask1.c +++ b/testsuites/mptests/mp14/pttask1.c @@ -26,9 +26,9 @@ rtems_task Partition_task( rtems_task_argument argument ) { - rtems_unsigned32 count; + uint32_t count; rtems_status_code status; - rtems_unsigned32 yield_count; + uint32_t yield_count; void *buffer; puts( "Getting ID of partition" ); diff --git a/testsuites/mptests/mp14/smtask1.c b/testsuites/mptests/mp14/smtask1.c index 9f1cce8b7c..eeda002a9d 100644 --- a/testsuites/mptests/mp14/smtask1.c +++ b/testsuites/mptests/mp14/smtask1.c @@ -25,9 +25,9 @@ rtems_task Semaphore_task( rtems_task_argument argument ) { - rtems_unsigned32 count; + uint32_t count; rtems_status_code status; - rtems_unsigned32 yield_count; + uint32_t yield_count; puts( "Getting SMID of semaphore" ); while ( FOREVER ) { diff --git a/testsuites/mptests/mp14/system.h b/testsuites/mptests/mp14/system.h index 68a6bf2aba..33c1ff9e60 100644 --- a/testsuites/mptests/mp14/system.h +++ b/testsuites/mptests/mp14/system.h @@ -102,7 +102,7 @@ TEST_EXTERN rtems_name Task_name[ 4 ]; /* remote event task names */ TEST_EXTERN rtems_id Timer_id[ 4 ]; /* event timer ids */ TEST_EXTERN rtems_name Timer_name[ 4 ]; /* event timer names */ -TEST_EXTERN rtems_unsigned32 Msg_buffer[ 4 ][ 4 ]; +TEST_EXTERN uint32_t Msg_buffer[ 4 ][ 4 ]; extern rtems_multiprocessing_table Multiprocessing_configuration; -- cgit v1.2.3