2004-03-30 Ralf Corsepius <ralf_corsepius@rtems.org>

* sp02/task1.c, sp04/system.h, sp04/task1.c, sp04/tswitch.c, sp05/task1.c, sp06/task1.c, sp09/screen01.c, sp09/screen07.c, sp09/screen12.c, sp09/system.h, sp09/task3.c, sp11/task1.c, sp12/pridrv.c, sp12/pritask.c, sp12/system.h, sp13/task1.c, sp13/task2.c, sp13/task3.c, sp14/system.h, sp15/system.h, sp16/system.h, sp17/system.h, sp19/first.c, sp19/fptask.c, sp19/inttest.h, sp19/system.h, sp19/task1.c, sp20/init.c, sp20/system.h, sp20/task1.c, sp23/system.h, sp24/init.c, sp25/system.h, sp30/init.c, spfatal/fatal.c, spfatal/puterr.c, spfatal/system.h, spsize/size.c: Convert to using c99 fixed size types.
2025-12-26 22:48:23 +00:00 · 2004-03-30 11:15:35 +00:00
parent 9919946a82
commit c87608fd82
39 changed files with 92 additions and 80 deletions
--- a/testsuites/sptests/ChangeLog
+++ b/testsuites/sptests/ChangeLog
@@ -1,3 +1,17 @@
+2004-03-30	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* sp02/task1.c, sp04/system.h, sp04/task1.c, sp04/tswitch.c,
+	sp05/task1.c, sp06/task1.c, sp09/screen01.c, sp09/screen07.c,
+	sp09/screen12.c, sp09/system.h, sp09/task3.c, sp11/task1.c,
+	sp12/pridrv.c, sp12/pritask.c, sp12/system.h, sp13/task1.c,
+	sp13/task2.c, sp13/task3.c, sp14/system.h, sp15/system.h,
+	sp16/system.h, sp17/system.h, sp19/first.c, sp19/fptask.c,
+	sp19/inttest.h, sp19/system.h, sp19/task1.c, sp20/init.c,
+	sp20/system.h, sp20/task1.c, sp23/system.h, sp24/init.c,
+	sp25/system.h, sp30/init.c, spfatal/fatal.c, spfatal/puterr.c,
+	spfatal/system.h, spsize/size.c: Convert to using c99 fixed size
+	types.
+
 2004-03-25	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

 	* configure.ac: Add 2nd arg to RTEMS_TOP.
--- a/testsuites/sptests/sp02/task1.c
+++ b/testsuites/sptests/sp02/task1.c
@@ -27,7 +27,7 @@ rtems_task Task_1(
  rtems_id          tid3;
  rtems_status_code status;
  rtems_name        tid2_name;
-  rtems_unsigned32  previous_priority;
+  uint32_t    previous_priority;

  puts( "TA1 - rtems_task_wake_after - sleep 1 second" );
  status = rtems_task_wake_after( 1*TICKS_PER_SECOND );
--- a/testsuites/sptests/sp04/system.h
+++ b/testsuites/sptests/sp04/system.h
@@ -62,7 +62,7 @@ TEST_EXTERN rtems_id   Extension_id[ 4 ];
 TEST_EXTERN rtems_name Extension_name[ 4 ];  /* array of task names */
 
 /* array of task run counts */
-TEST_EXTERN volatile rtems_unsigned32 Run_count[ 4 ];  
+TEST_EXTERN volatile uint32_t   Run_count[ 4 ];  
 
 /*
 * Keep track of task switches
--- a/testsuites/sptests/sp04/task1.c
+++ b/testsuites/sptests/sp04/task1.c
@@ -36,13 +36,13 @@ rtems_task Task_1(
  rtems_task_argument argument
 )
 {
-  rtems_unsigned32  seconds;
-  rtems_unsigned32  old_seconds;
+  uint32_t    seconds;
+  uint32_t    old_seconds;
  rtems_mode        previous_mode;
  rtems_time_of_day time;
  rtems_status_code status;
-  rtems_unsigned32  start_time;
-  rtems_unsigned32  end_time;
+  uint32_t    start_time;
+  uint32_t    end_time;

  puts( "TA1 - rtems_task_suspend - on Task 2" );
  status = rtems_task_suspend( Task_id[ 2 ] );
--- a/testsuites/sptests/sp04/tswitch.c
+++ b/testsuites/sptests/sp04/tswitch.c
@@ -31,7 +31,7 @@ rtems_extension Task_switch(
  rtems_tcb *heir
 )
 {
-  rtems_unsigned32  index;
+  uint32_t    index;
  rtems_time_of_day time;
  rtems_status_code status;

--- a/testsuites/sptests/sp05/task1.c
+++ b/testsuites/sptests/sp05/task1.c
@@ -28,7 +28,7 @@ rtems_task Task_1(
 {
  rtems_id          tid2;
  rtems_id          tid3;
-  rtems_unsigned32  pass;
+  uint32_t    pass;
  rtems_status_code status;

  status = rtems_task_ident( Task_name[ 2 ], 1, &tid2 );
--- a/testsuites/sptests/sp06/task1.c
+++ b/testsuites/sptests/sp06/task1.c
@@ -21,9 +21,9 @@
 #include "system.h"

 rtems_task Task_1( argument )
-rtems_unsigned32 argument;
+uint32_t   argument;
 {
-  rtems_unsigned32  pass;
+  uint32_t    pass;
  rtems_status_code status;

  puts( "TA1 - is beginning to run" );
--- a/testsuites/sptests/sp09/screen01.c
+++ b/testsuites/sptests/sp09/screen01.c
@@ -20,7 +20,7 @@

 void Screen1()
 {
-  rtems_unsigned32    notepad_value;
+  uint32_t      notepad_value;
  rtems_id            self_id;
  rtems_task_priority previous_priority;
  rtems_status_code   status;
--- a/testsuites/sptests/sp09/screen07.c
+++ b/testsuites/sptests/sp09/screen07.c
@@ -23,8 +23,8 @@
 void Screen7()
 {
  long              buffer[ 4 ];
-  rtems_unsigned32  size;
-  rtems_unsigned32  count;
+  uint32_t    size;
+  uint32_t    count;
  rtems_status_code status;

  status = rtems_message_queue_broadcast( 100, buffer, MESSAGE_SIZE, &count );
--- a/testsuites/sptests/sp09/screen12.c
+++ b/testsuites/sptests/sp09/screen12.c
@@ -23,9 +23,9 @@ void Screen12()
  void              *segment_address_1;
  void              *segment_address_2;
  void              *segment_address_3;
-  rtems_unsigned32   offset;
-  rtems_unsigned32   good_front_flag;
-  rtems_unsigned32   good_back_flag;
+  uint32_t     offset;
+  uint32_t     good_front_flag;
+  uint32_t     good_back_flag;
  rtems_status_code  status;

  status = rtems_region_create(
--- a/testsuites/sptests/sp09/system.h
+++ b/testsuites/sptests/sp09/system.h
@@ -130,10 +130,10 @@ TEST_EXTERN rtems_id   Junk_id;             /* id used to return errors */
 #define Internal_port_area (void *) 0x00001000
 #define External_port_area (void *) 0x00002000
 
-TEST_EXTERN rtems_unsigned8 Partition_good_area[256] CPU_STRUCTURE_ALIGNMENT;
+TEST_EXTERN uint8_t   Partition_good_area[256] CPU_STRUCTURE_ALIGNMENT;
 #define Partition_bad_area (void *) 0x00000006
 
-TEST_EXTERN rtems_unsigned32 Region_good_area[4096] CPU_STRUCTURE_ALIGNMENT;
+TEST_EXTERN uint32_t   Region_good_area[4096] CPU_STRUCTURE_ALIGNMENT;
 #define Region_bad_area    (void *) 0x00000006
 #define REGION_START_OFFSET 1024
 #define REGION_LENGTH       512
--- a/testsuites/sptests/sp09/task3.c
+++ b/testsuites/sptests/sp09/task3.c
@@ -27,7 +27,7 @@ rtems_task Task_3(
 {
  rtems_status_code status;
  long              buffer[ 4 ];
-  rtems_unsigned32  size;
+  uint32_t    size;

  puts( "TA3 - rtems_message_queue_receive - Q 1 - RTEMS_WAIT FOREVER" );
  status = rtems_message_queue_receive(
--- a/testsuites/sptests/sp11/task1.c
+++ b/testsuites/sptests/sp11/task1.c
@@ -26,7 +26,7 @@ rtems_task Task_1(
  rtems_event_set   eventout;
  rtems_time_of_day time;
  rtems_status_code status;
-  rtems_unsigned32  index;
+  uint32_t    index;

  puts( "TA1 - rtems_event_send - send RTEMS_EVENT_16 to TA2" );
  status = rtems_event_send( Task_id[ 2 ], RTEMS_EVENT_16 );
--- a/testsuites/sptests/sp12/pridrv.c
+++ b/testsuites/sptests/sp12/pridrv.c
@@ -24,11 +24,11 @@
 #include "system.h"

 void Priority_test_driver(
-  rtems_unsigned32 priority_base
+  uint32_t   priority_base
 )
 {
  rtems_task_priority previous_priority;
-  rtems_unsigned32    index;
+  uint32_t      index;
  rtems_status_code   status;

  for ( index = 1 ; index <= 5 ; index++ ) {
--- a/testsuites/sptests/sp12/pritask.c
+++ b/testsuites/sptests/sp12/pritask.c
@@ -27,7 +27,7 @@ rtems_task Priority_task(
  rtems_task_priority its_priority;
  rtems_task_priority current_priority;
  rtems_status_code   status;
-  rtems_unsigned32    index;
+  uint32_t      index;

  its_priority = Task_priority[ its_index ];

--- a/testsuites/sptests/sp12/system.h
+++ b/testsuites/sptests/sp12/system.h
@@ -22,7 +22,7 @@ rtems_task Init(
 );
 
 void Priority_test_driver(
-  rtems_unsigned32 priority_base
+  uint32_t   priority_base
 );
 
 rtems_task Priority_task(
--- a/testsuites/sptests/sp13/task1.c
+++ b/testsuites/sptests/sp13/task1.c
@@ -29,7 +29,7 @@ long    buffer[ 4 ];

 void dope_buffer(unsigned char *buff,
                 int   buff_size,
-                 unsigned32 v)
+                 uint32_t   v)
 {
    int i;
    unsigned char ch;
@@ -49,11 +49,11 @@ rtems_task Task_1(
 )
 {
  rtems_id          qid;
-  rtems_unsigned32  index;
-  rtems_unsigned32  count;
+  uint32_t    index;
+  uint32_t    count;
  rtems_status_code status;
-  rtems_unsigned32  size;
-  rtems_unsigned32  queue_size;
+  uint32_t    size;
+  uint32_t    queue_size;
  char             *cp;
  
  status = rtems_message_queue_ident(
--- a/testsuites/sptests/sp13/task2.c
+++ b/testsuites/sptests/sp13/task2.c
@@ -27,7 +27,7 @@ rtems_task Task_2(
 )
 {
  long                buffer[ 4 ];
-  rtems_unsigned32    size;
+  uint32_t      size;
  rtems_task_priority previous_priority;
  rtems_status_code   status;

--- a/testsuites/sptests/sp13/task3.c
+++ b/testsuites/sptests/sp13/task3.c
@@ -25,8 +25,8 @@ rtems_task Task_3(
 )
 {
  long              buffer[ 4 ];
-  rtems_unsigned32  size;
-  rtems_unsigned32  count;
+  uint32_t    size;
+  uint32_t    count;
  rtems_status_code status;

  puts(
--- a/testsuites/sptests/sp14/system.h
+++ b/testsuites/sptests/sp14/system.h
@@ -61,12 +61,12 @@ TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
 TEST_EXTERN rtems_id   Timer_id[ 3 ];      /* array of timer ids */
 TEST_EXTERN rtems_name Timer_name[ 3 ];    /* array of timer names */

-TEST_EXTERN volatile rtems_unsigned32 Signals_sent;
+TEST_EXTERN volatile uint32_t   Signals_sent;
                                      /* set to TRUE to indicate that a */
                                      /* signal set has been sent from  */
                                      /* an ISR to the executing task   */

-TEST_EXTERN volatile rtems_unsigned32 Asr_fired;
+TEST_EXTERN volatile uint32_t   Asr_fired;
                                      /* set to TRUE to indicate that the */
                                      /* RTEMS_ASR has executed and was   */
                                      /* passed the correct signal set    */
--- a/testsuites/sptests/sp15/system.h
+++ b/testsuites/sptests/sp15/system.h
@@ -46,15 +46,15 @@ TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */
 TEST_EXTERN rtems_name Partition_id[ 4 ];   /* array of partition ids */
 TEST_EXTERN rtems_name Partition_name[ 4 ]; /* array of partition names */
 
-TEST_EXTERN rtems_unsigned8 Area_1[4096] CPU_STRUCTURE_ALIGNMENT;
-TEST_EXTERN rtems_unsigned8 Area_2[274] CPU_STRUCTURE_ALIGNMENT;
+TEST_EXTERN uint8_t   Area_1[4096] CPU_STRUCTURE_ALIGNMENT;
+TEST_EXTERN uint8_t   Area_2[274] CPU_STRUCTURE_ALIGNMENT;
 
 #define Put_address_from_area_1( _to_be_printed ) \
   printf( "0x%08lx", \
-     (unsigned long)((rtems_unsigned8 *)(_to_be_printed) - Area_1 ) )
+     (unsigned long)((uint8_t   *)(_to_be_printed) - Area_1 ) )
 
 #define Put_address_from_area_2( _to_be_printed ) \
   printf( "0x%08lx", \
-     (unsigned long)((rtems_unsigned8 *)(_to_be_printed) - Area_2 ) )
+     (unsigned long)((uint8_t   *)(_to_be_printed) - Area_2 ) )
 
 /* end of include file */
--- a/testsuites/sptests/sp16/system.h
+++ b/testsuites/sptests/sp16/system.h
@@ -63,27 +63,27 @@ TEST_EXTERN rtems_name Task_name[ 6 ];    /* array of task names */
 TEST_EXTERN rtems_id   Region_id[ 5 ];    /* array of region ids */
 TEST_EXTERN rtems_name Region_name[ 5 ];  /* array of region names */

-TEST_EXTERN rtems_unsigned8 Area_1[4096] CPU_STRUCTURE_ALIGNMENT;
-TEST_EXTERN rtems_unsigned8 Area_2[4096] CPU_STRUCTURE_ALIGNMENT;
-TEST_EXTERN rtems_unsigned8 Area_3[4096] CPU_STRUCTURE_ALIGNMENT;
-TEST_EXTERN rtems_unsigned8 Area_4[8192] CPU_STRUCTURE_ALIGNMENT;
+TEST_EXTERN uint8_t   Area_1[4096] CPU_STRUCTURE_ALIGNMENT;
+TEST_EXTERN uint8_t   Area_2[4096] CPU_STRUCTURE_ALIGNMENT;
+TEST_EXTERN uint8_t   Area_3[4096] CPU_STRUCTURE_ALIGNMENT;
+TEST_EXTERN uint8_t   Area_4[8192] CPU_STRUCTURE_ALIGNMENT;

 #define BASE_PRIORITY 140

 #define Put_address_from_area_1( _to_be_printed ) \
   printf( "0x%08lx", \
-     (unsigned long) ((rtems_unsigned8 *)(_to_be_printed) - Area_1 ) )
+     (unsigned long) ((uint8_t   *)(_to_be_printed) - Area_1 ) )

 #define Put_address_from_area_2( _to_be_printed ) \
   printf( "0x%08lx", \
-     (unsigned long) ((rtems_unsigned8 *)(_to_be_printed) - Area_2 ) )
+     (unsigned long) ((uint8_t   *)(_to_be_printed) - Area_2 ) )

 #define Put_address_from_area_3( _to_be_printed ) \
   printf( "0x%08lx", \
-     (unsigned long) ((rtems_unsigned8 *)(_to_be_printed) - Area_3 ) )
+     (unsigned long) ((uint8_t   *)(_to_be_printed) - Area_3 ) )

 #define Put_address_from_area_4( _to_be_printed ) \
   printf( "0x%08lx", \
-     (unsigned long) ((rtems_unsigned8 *)(_to_be_printed) - Area_4 ) )
+     (unsigned long) ((uint8_t   *)(_to_be_printed) - Area_4 ) )

 /* end of include file */
--- a/testsuites/sptests/sp17/system.h
+++ b/testsuites/sptests/sp17/system.h
@@ -51,6 +51,6 @@ rtems_task Task_2(
 TEST_EXTERN rtems_id   Task_id[ 4 ];         /* array of task ids */
 TEST_EXTERN rtems_name Task_name[ 4 ];       /* array of task names */

-TEST_EXTERN rtems_unsigned32 Task_2_preempted;
+TEST_EXTERN uint32_t   Task_2_preempted;

 /* end of include file */
--- a/testsuites/sptests/sp19/first.c
+++ b/testsuites/sptests/sp19/first.c
@@ -30,7 +30,7 @@ rtems_task First_FP_task(
  rtems_status_code status;
  rtems_id          tid;
  rtems_time_of_day time;
-  rtems_unsigned32  task_index;
+  uint32_t    task_index;
  INTEGER_DECLARE;
  FP_DECLARE;

--- a/testsuites/sptests/sp19/fptask.c
+++ b/testsuites/sptests/sp19/fptask.c
@@ -30,8 +30,8 @@ rtems_task FP_task(
  rtems_status_code status;
  rtems_id          tid;
  rtems_time_of_day time;
-  rtems_unsigned32  task_index;
-  rtems_unsigned32  previous_seconds;
+  uint32_t    task_index;
+  uint32_t    previous_seconds;
  INTEGER_DECLARE;
  FP_DECLARE;

--- a/testsuites/sptests/sp19/inttest.h
+++ b/testsuites/sptests/sp19/inttest.h
@@ -30,7 +30,7 @@
 #define __INTEGER_TEST_h

 #include <stdio.h>
-#define REG_VARIABLE rtems_unsigned32
+#define REG_VARIABLE uint32_t  

 #define INTEGER_DECLARE \
    REG_VARIABLE int01 = 1; \
--- a/testsuites/sptests/sp19/system.h
+++ b/testsuites/sptests/sp19/system.h
@@ -54,5 +54,5 @@ TEST_EXTERN rtems_id Task_id[ 7 ];     /* array of task ids */
 TEST_EXTERN rtems_id Task_name[ 7 ];   /* array of task names */

 TEST_EXTERN rtems_double FP_factors[ 10 ];  /* FP "uniqueness" factors */
-TEST_EXTERN rtems_unsigned32 INTEGER_factors[ 10 ];  /* INT "uniqueness" factors */
+TEST_EXTERN uint32_t   INTEGER_factors[ 10 ];  /* INT "uniqueness" factors */
 /* end of include file */
--- a/testsuites/sptests/sp19/task1.c
+++ b/testsuites/sptests/sp19/task1.c
@@ -28,7 +28,7 @@ rtems_task Task_1(
  rtems_status_code status;
  rtems_id          tid;
  rtems_time_of_day time;
-  rtems_unsigned32  task_index;
+  uint32_t    task_index;
  INTEGER_DECLARE;

  status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid );
--- a/testsuites/sptests/sp20/init.c
+++ b/testsuites/sptests/sp20/init.c
@@ -28,7 +28,7 @@ rtems_task Init(
  rtems_task_argument argument
 )
 {
-  rtems_unsigned32  index;
+  uint32_t    index;
  rtems_status_code status;

  puts( "\n\n*** TEST 20 ***" );
--- a/testsuites/sptests/sp20/system.h
+++ b/testsuites/sptests/sp20/system.h
@@ -18,7 +18,7 @@
 /* types */

 struct counters {
-  rtems_unsigned32 count[7];
+  uint32_t   count[7];
 };

 /* functions */
--- a/testsuites/sptests/sp20/task1.c
+++ b/testsuites/sptests/sp20/task1.c
@@ -26,19 +26,19 @@
 #define TA6_ITERATIONS 10
 #define TA6_PERIOD_FACTOR 10

-rtems_unsigned32    Periods[7]    = { 0,   2,   2,   2,   2, 100, 0 };
-rtems_unsigned32    Iterations[7] = { 0,  50,  50,  50,  50,   1, TA6_ITERATIONS };
+uint32_t      Periods[7]    = { 0,   2,   2,   2,   2, 100, 0 };
+uint32_t      Iterations[7] = { 0,  50,  50,  50,  50,   1, TA6_ITERATIONS };
 rtems_task_priority Priorities[7] = { 0,   1,   1,   3,   4,   5, 1 };

 rtems_task Task_1_through_6(
-  rtems_unsigned32 argument
+  uint32_t   argument
 )
 {
  rtems_id          rmid;
  rtems_id          test_rmid;
-  rtems_unsigned32  index;
-  rtems_unsigned32  pass;
-  rtems_unsigned32  failed;
+  uint32_t    index;
+  uint32_t    pass;
+  uint32_t    failed;
  rtems_status_code status;

  status = rtems_rate_monotonic_create( argument, &rmid );
@@ -120,7 +120,7 @@ rtems_task Task_1_through_6(
    case 6:
      /* test changing periods */
      {
-        unsigned32 time[TA6_ITERATIONS+1];
+        uint32_t   time[TA6_ITERATIONS+1];
        rtems_interval period;

        period = 1*TA6_PERIOD_FACTOR;
--- a/testsuites/sptests/sp23/system.h
+++ b/testsuites/sptests/sp23/system.h
@@ -48,10 +48,10 @@ TEST_EXTERN rtems_name Task_name[ 2 ];   /* array of task names */
 TEST_EXTERN rtems_id   Port_id[ 2 ];     /* array of port ids */
 TEST_EXTERN rtems_name Port_name[ 2 ];   /* array of port names */
 
-#define Internal_port_area ((rtems_unsigned8 *) 0x00001000)
-#define External_port_area ((rtems_unsigned8 *) 0x00002000)
+#define Internal_port_area ((uint8_t   *) 0x00001000)
+#define External_port_area ((uint8_t   *) 0x00002000)
 
-#define Below_port_area    ((rtems_unsigned8 *) 0x00000500)
-#define Above_port_area    ((rtems_unsigned8 *) 0x00003000)
+#define Below_port_area    ((uint8_t   *) 0x00000500)
+#define Above_port_area    ((uint8_t   *) 0x00003000)

 /* end of include file */
--- a/testsuites/sptests/sp24/init.c
+++ b/testsuites/sptests/sp24/init.c
@@ -29,7 +29,7 @@ rtems_task Init(
 )
 {
  rtems_time_of_day time;
-  rtems_unsigned32  index;
+  uint32_t    index;
  rtems_status_code status;

  puts( "\n\n*** TEST 24 ***" );
--- a/testsuites/sptests/sp25/system.h
+++ b/testsuites/sptests/sp25/system.h
@@ -44,12 +44,12 @@ TEST_EXTERN rtems_name Task_name[ 6 ];    /* array of task names */
 TEST_EXTERN rtems_id   Region_id[ 2 ];    /* array of region ids */
 TEST_EXTERN rtems_name Region_name[ 2 ];  /* array of region names */
 
-TEST_EXTERN rtems_unsigned8 Area_1[64000]  CPU_STRUCTURE_ALIGNMENT;
+TEST_EXTERN uint8_t   Area_1[64000]  CPU_STRUCTURE_ALIGNMENT;
 
 #define BASE_PRIORITY 140
 
 #define Put_address_from_area_1( _to_be_printed ) \
   printf( "0x%08lx", \
-     (unsigned long) ((rtems_unsigned8 *)(_to_be_printed) - Area_1 ) )
+     (unsigned long) ((uint8_t   *)(_to_be_printed) - Area_1 ) )
 
 /* end of include file */
--- a/testsuites/sptests/sp30/init.c
+++ b/testsuites/sptests/sp30/init.c
@@ -29,7 +29,7 @@ rtems_task Init(
 )
 {
  rtems_time_of_day time;
-  rtems_unsigned32  index;
+  uint32_t    index;
  rtems_status_code status;

  puts( "\n\n*** TEST 30 ***" );
--- a/testsuites/sptests/spfatal/fatal.c
+++ b/testsuites/sptests/spfatal/fatal.c
@@ -51,14 +51,14 @@ jmp_buf Restart_Context;
 *  occurs automatically because this is part of the BSS.
 */

-rtems_unsigned32  First_Time_Through;
+uint32_t    First_Time_Through;

 void Process_case();

 rtems_extension Fatal_extension(
-  rtems_unsigned32 source,
+  uint32_t   source,
  boolean          is_internal,
-  rtems_unsigned32 error
+  uint32_t   error
 )
 {
  int index;
--- a/testsuites/sptests/spfatal/puterr.c
+++ b/testsuites/sptests/spfatal/puterr.c
@@ -51,7 +51,7 @@ char *Errors[] = {
 /* Task states */

 void put_error(
-  rtems_unsigned32  error,
+  uint32_t    error,
  rtems_status_code expected
 )
 {
--- a/testsuites/sptests/spfatal/system.h
+++ b/testsuites/sptests/spfatal/system.h
@@ -22,14 +22,14 @@ rtems_task Init(
 );
 
 void put_error(
-  rtems_unsigned32  error,
+  uint32_t    error,
  rtems_status_code expected
 );
 
 rtems_extension Fatal_extension(
-  rtems_unsigned32 source,
+  uint32_t   source,
  boolean          is_internal,
-  rtems_unsigned32 error
+  uint32_t   error
 );
 
 rtems_task Task_1(
--- a/testsuites/sptests/spsize/size.c
+++ b/testsuites/sptests/spsize/size.c
@@ -128,9 +128,7 @@ int getint( void );
    (STACK_MINIMUM_SIZE + sizeof(Thread_Control) + SYSTEM_IDLE_FP + \
     MP_SYSTEM_TASKS)

-#define rtems_unsigned32 unsigned32
-
-rtems_unsigned32 sys_req;
+uint32_t   sys_req;

 void help_size();
 void print_formula();