From 6965fc4342e0c7fb4f96dd12b7d589cc7b4fce1b Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 30 Mar 2004 11:16:17 +0000 Subject: 2004-03-30 Ralf Corsepius * psx06/init.c, psx06/system.h, psx06/task.c, psx06/task2.c: Convert to using c99 fixed size types. --- testsuites/psxtests/ChangeLog | 5 +++++ testsuites/psxtests/psx06/init.c | 4 ++-- testsuites/psxtests/psx06/system.h | 4 ++-- testsuites/psxtests/psx06/task.c | 4 ++-- testsuites/psxtests/psx06/task2.c | 4 ++-- 5 files changed, 13 insertions(+), 8 deletions(-) (limited to 'testsuites') diff --git a/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog index f210a4abb1..c8dc0f537d 100644 --- a/testsuites/psxtests/ChangeLog +++ b/testsuites/psxtests/ChangeLog @@ -1,3 +1,8 @@ +2004-03-30 Ralf Corsepius + + * psx06/init.c, psx06/system.h, psx06/task.c, psx06/task2.c: Convert + to using c99 fixed size types. + 2004-03-26 Ralf Corsepius * Makefile.am: Remove include from SUBDIRS. diff --git a/testsuites/psxtests/psx06/init.c b/testsuites/psxtests/psx06/init.c index 42f3dc32df..290d54fbb0 100644 --- a/testsuites/psxtests/psx06/init.c +++ b/testsuites/psxtests/psx06/init.c @@ -34,7 +34,7 @@ void *POSIX_Init( { int status; unsigned int remaining; - rtems_unsigned32 *key_data; + uint32_t *key_data; puts( "\n\n*** POSIX TEST 6 ***" ); @@ -94,7 +94,7 @@ void *POSIX_Init( key_data = pthread_getspecific( Key_id ); printf( "Init: Got the key value of %ld\n", - (unsigned long) ((rtems_unsigned32 *)key_data - Data_array) ); + (unsigned long) ((uint32_t *)key_data - Data_array) ); remaining = sleep( 3 ); if ( remaining ) diff --git a/testsuites/psxtests/psx06/system.h b/testsuites/psxtests/psx06/system.h index 9e6ee07e20..cb049a5063 100644 --- a/testsuites/psxtests/psx06/system.h +++ b/testsuites/psxtests/psx06/system.h @@ -53,7 +53,7 @@ TEST_EXTERN pthread_t Init_id; TEST_EXTERN pthread_t Task_id; TEST_EXTERN pthread_t Task2_id; TEST_EXTERN pthread_key_t Key_id; -TEST_EXTERN rtems_unsigned32 Data_array[ CONFIGURE_MAXIMUM_POSIX_THREADS ]; -TEST_EXTERN rtems_unsigned32 Destructor_invoked; +TEST_EXTERN uint32_t Data_array[ CONFIGURE_MAXIMUM_POSIX_THREADS ]; +TEST_EXTERN uint32_t Destructor_invoked; /* end of include file */ diff --git a/testsuites/psxtests/psx06/task.c b/testsuites/psxtests/psx06/task.c index 51dc740ea5..0fab530f5b 100644 --- a/testsuites/psxtests/psx06/task.c +++ b/testsuites/psxtests/psx06/task.c @@ -26,7 +26,7 @@ void *Task_1( ) { int status; - rtems_unsigned32 *key_data; + uint32_t *key_data; printf( "Task_1: Setting the key to %d\n", 1 ); status = pthread_setspecific( Key_id, &Data_array[ 1 ] ); @@ -36,7 +36,7 @@ void *Task_1( key_data = pthread_getspecific( Key_id ); printf( "Task_1: Got the key value of %ld\n", - (unsigned long) ((rtems_unsigned32 *)key_data - Data_array) ); + (unsigned long) ((uint32_t *)key_data - Data_array) ); if ( status ) printf( "status = %d\n", status ); assert( !status ); diff --git a/testsuites/psxtests/psx06/task2.c b/testsuites/psxtests/psx06/task2.c index 9556a3404d..497b592f2c 100644 --- a/testsuites/psxtests/psx06/task2.c +++ b/testsuites/psxtests/psx06/task2.c @@ -25,7 +25,7 @@ void *Task_2( ) { int status; - rtems_unsigned32 *key_data; + uint32_t *key_data; printf( "Destructor invoked %d times\n", Destructor_invoked ); @@ -37,7 +37,7 @@ void *Task_2( key_data = pthread_getspecific( Key_id ); printf( "Task_2: Got the key value of %ld\n", - (unsigned long) ((rtems_unsigned32 *)key_data - Data_array) ); + (unsigned long) ((uint32_t *)key_data - Data_array) ); if ( status ) printf( "status = %d\n", status ); assert( !status ); -- cgit v1.2.3