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

	* rtems/include/rtems.h,
	rtems/include/rtems/rtems/asr.h,
	rtems/include/rtems/rtems/attr.h,
	rtems/include/rtems/rtems/clock.h,
	rtems/include/rtems/rtems/config.h,
	rtems/include/rtems/rtems/dpmem.h,
	rtems/include/rtems/rtems/eventset.h,
	rtems/include/rtems/rtems/message.h,
	rtems/include/rtems/rtems/modes.h,
	rtems/include/rtems/rtems/msgmp.h,
	rtems/include/rtems/rtems/options.h,
	rtems/include/rtems/rtems/part.h,
	rtems/include/rtems/rtems/ratemon.h,
	rtems/include/rtems/rtems/region.h,
	rtems/include/rtems/rtems/regionmp.h,
	rtems/include/rtems/rtems/sem.h,
	rtems/include/rtems/rtems/support.h,
	rtems/include/rtems/rtems/taskmp.h,
	rtems/include/rtems/rtems/tasks.h,
	rtems/include/rtems/rtems/timer.h,
	rtems/inline/rtems/rtems/part.inl,
	rtems/inline/rtems/rtems/region.inl,
	rtems/macros/rtems/rtems/part.inl,
	rtems/src/attr.c,
	rtems/src/dpmem.c,
	rtems/src/dpmemcreate.c,
	rtems/src/dpmemexternal2internal.c,
	rtems/src/dpmeminternal2external.c,
	rtems/src/eventseize.c,
	rtems/src/msg.c,
	rtems/src/msgmp.c,
	rtems/src/msgqallocate.c,
	rtems/src/msgqbroadcast.c,
	rtems/src/msgqcreate.c,
	rtems/src/msgqflush.c,
	rtems/src/msgqgetnumberpending.c,
	rtems/src/msgqident.c,
	rtems/src/msgqreceive.c,
	rtems/src/msgqsend.c,
	rtems/src/msgqsubmit.c,
	rtems/src/msgqtranslatereturncode.c,
	rtems/src/msgqurgent.c,
	rtems/src/part.c,
	rtems/src/partcreate.c,
	rtems/src/partident.c,
	rtems/src/partmp.c,
	rtems/src/ratemon.c,
	rtems/src/region.c,
	rtems/src/regioncreate.c,
	rtems/src/regionextend.c,
	rtems/src/regiongetsegment.c,
	rtems/src/regiongetsegmentsize.c,
	rtems/src/regionmp.c,
	rtems/src/regionreturnsegment.c,
	rtems/src/rtemstimer.c,
	rtems/src/sem.c,
	rtems/src/semcreate.c,
	rtems/src/semident.c,
	rtems/src/semmp.c,
	rtems/src/semobtain.c,
	rtems/src/semtranslatereturncode.c,
	rtems/src/taskcreate.c,
	rtems/src/taskgetnote.c,
	rtems/src/taskident.c,
	rtems/src/taskinitusers.c,
	rtems/src/taskmp.c,
	rtems/src/taskrestart.c,
	rtems/src/tasks.c,
	rtems/src/tasksetnote.c,
	rtems/src/taskstart.c,
	rtems/src/timerserver.c: Convert to using c99 fixed size types.

20 files changed, 98 insertions, 98 deletions

diff --git a/cpukit/rtems/include/rtems.h b/cpukit/rtems/include/rtems.h
index 526c9352d8..bbe0035774 100644
--- a/cpukit/rtems/include/rtems.h
+++ b/cpukit/rtems/include/rtems.h
@@ -106,10 +106,10 @@ extern "C" {
 #define RTEMS_MINIMUM_PACKET_SIZE  MP_PACKET_MINIMUM_PACKET_SIZE
  
 /*
- *  The following constant defines the number of unsigned32's
+ *  The following constant defines the number of uint32_t  's
  *  in a packet which must be converted to native format in a
  *  heterogeneous system.  In packets longer than
- *  MP_PACKET_MINIMUN_HETERO_CONVERSION unsigned32's, some of the "extra" data
+ *  MP_PACKET_MINIMUN_HETERO_CONVERSION uint32_t  's, some of the "extra" data
  *  may a user message buffer which is not automatically endian swapped.
  */
  
diff --git a/cpukit/rtems/include/rtems/rtems/asr.h b/cpukit/rtems/include/rtems/rtems/asr.h
index 0aec1efa2b..740ff8ac68 100644
--- a/cpukit/rtems/include/rtems/rtems/asr.h
+++ b/cpukit/rtems/include/rtems/rtems/asr.h
@@ -29,7 +29,7 @@ extern "C" {
  *  each signal set.
  */
 
-typedef unsigned32 rtems_signal_set;
+typedef uint32_t   rtems_signal_set;
 
 /*
  *  Return type for ASR Handler
@@ -58,7 +58,7 @@ typedef struct {
   Modes_Control     mode_set;         /* RTEMS_ASR mode */
   rtems_signal_set  signals_posted;   /* signal set */
   rtems_signal_set  signals_pending;  /* pending signal set */
-  unsigned32        nest_level;       /* nest level of RTEMS_ASR */
+  uint32_t          nest_level;       /* nest level of RTEMS_ASR */
 }   ASR_Information;
 
 /*
diff --git a/cpukit/rtems/include/rtems/rtems/attr.h b/cpukit/rtems/include/rtems/rtems/attr.h
index 6b1fb928ab..200a434ce6 100644
--- a/cpukit/rtems/include/rtems/rtems/attr.h
+++ b/cpukit/rtems/include/rtems/rtems/attr.h
@@ -22,7 +22,7 @@ extern "C" {
 
 /* types */
 
-typedef unsigned32 rtems_attribute;
+typedef uint32_t   rtems_attribute;
 
 /* constants */
 
diff --git a/cpukit/rtems/include/rtems/rtems/clock.h b/cpukit/rtems/include/rtems/rtems/clock.h
index fc7c2be837..8008ba6f89 100644
--- a/cpukit/rtems/include/rtems/rtems/clock.h
+++ b/cpukit/rtems/include/rtems/rtems/clock.h
@@ -48,8 +48,8 @@ typedef enum {
  */
 
 typedef struct {
-  unsigned32  seconds;
-  unsigned32  microseconds;
+  uint32_t    seconds;
+  uint32_t    microseconds;
 } rtems_clock_time_value;
 
 /*
diff --git a/cpukit/rtems/include/rtems/rtems/config.h b/cpukit/rtems/include/rtems/rtems/config.h
index 911f643768..ac965c8aca 100644
--- a/cpukit/rtems/include/rtems/rtems/config.h
+++ b/cpukit/rtems/include/rtems/rtems/config.h
@@ -33,15 +33,15 @@ extern "C" {
  */
 
 typedef struct {
-  rtems_unsigned32                  maximum_tasks;
-  rtems_unsigned32                  maximum_timers;
-  rtems_unsigned32                  maximum_semaphores;
-  rtems_unsigned32                  maximum_message_queues;
-  rtems_unsigned32                  maximum_partitions;
-  rtems_unsigned32                  maximum_regions;
-  rtems_unsigned32                  maximum_ports;
-  rtems_unsigned32                  maximum_periods;
-  rtems_unsigned32                  number_of_initialization_tasks;
+  uint32_t                    maximum_tasks;
+  uint32_t                    maximum_timers;
+  uint32_t                    maximum_semaphores;
+  uint32_t                    maximum_message_queues;
+  uint32_t                    maximum_partitions;
+  uint32_t                    maximum_regions;
+  uint32_t                    maximum_ports;
+  uint32_t                    maximum_periods;
+  uint32_t                    number_of_initialization_tasks;
   rtems_initialization_tasks_table *User_initialization_tasks_table;
 } rtems_api_configuration_table;
 
diff --git a/cpukit/rtems/include/rtems/rtems/dpmem.h b/cpukit/rtems/include/rtems/rtems/dpmem.h
index cb358764b9..53bb4bfd3e 100644
--- a/cpukit/rtems/include/rtems/rtems/dpmem.h
+++ b/cpukit/rtems/include/rtems/rtems/dpmem.h
@@ -43,7 +43,7 @@ typedef struct {
   Objects_Control  Object;
   void            *internal_base; /* base internal address */
   void            *external_base; /* base external address */
-  unsigned32       length;        /* length of dual-ported area */
+  uint32_t         length;        /* length of dual-ported area */
 }   Dual_ported_memory_Control;
 
 /*
@@ -61,7 +61,7 @@ RTEMS_EXTERN Objects_Information  _Dual_ported_memory_Information;
  */
 
 void _Dual_ported_memory_Manager_initialization(
-  unsigned32 maximum_ports
+  uint32_t   maximum_ports
 );
 
 /*
@@ -80,7 +80,7 @@ rtems_status_code rtems_port_create(
   rtems_name    name,
   void         *internal_start,
   void         *external_start,
-  unsigned32    length,
+  uint32_t      length,
   Objects_Id   *id
 );
 
diff --git a/cpukit/rtems/include/rtems/rtems/eventset.h b/cpukit/rtems/include/rtems/rtems/eventset.h
index e32dee848e..e70f5d858b 100644
--- a/cpukit/rtems/include/rtems/rtems/eventset.h
+++ b/cpukit/rtems/include/rtems/rtems/eventset.h
@@ -25,7 +25,7 @@ extern "C" {
  *  The following defines the type used to control event sets.
  */
 
-typedef unsigned32 rtems_event_set;
+typedef uint32_t   rtems_event_set;
 
 /*
  *  The following constants define the individual events which may
diff --git a/cpukit/rtems/include/rtems/rtems/message.h b/cpukit/rtems/include/rtems/rtems/message.h
index 66f34bd16c..b32c53f417 100644
--- a/cpukit/rtems/include/rtems/rtems/message.h
+++ b/cpukit/rtems/include/rtems/rtems/message.h
@@ -78,7 +78,7 @@ RTEMS_EXTERN Objects_Information  _Message_queue_Information;
  */
 
 void _Message_queue_Manager_initialization(
-  unsigned32 maximum_message_queues
+  uint32_t   maximum_message_queues
 );
 
 /*
@@ -96,8 +96,8 @@ void _Message_queue_Manager_initialization(
 
 rtems_status_code rtems_message_queue_create(
   rtems_name       name,
-  unsigned32       count,
-  unsigned32       max_message_size,
+  uint32_t         count,
+  uint32_t         max_message_size,
   rtems_attribute  attribute_set,
   Objects_Id      *id
 );
@@ -118,7 +118,7 @@ rtems_status_code rtems_message_queue_create(
 
 rtems_status_code rtems_message_queue_ident(
   rtems_name    name,
-  unsigned32    node,
+  uint32_t      node,
   Objects_Id   *id
 );
 
@@ -154,7 +154,7 @@ rtems_status_code rtems_message_queue_delete(
 rtems_status_code rtems_message_queue_send(
   Objects_Id            id,
   void                 *buffer,
-  unsigned32            size
+  uint32_t              size
 );
 
 /*
@@ -172,7 +172,7 @@ rtems_status_code rtems_message_queue_send(
 rtems_status_code rtems_message_queue_urgent(
   Objects_Id            id,
   void                 *buffer,
-  unsigned32            size
+  uint32_t              size
 );
 
 /*
@@ -189,8 +189,8 @@ rtems_status_code rtems_message_queue_urgent(
 rtems_status_code rtems_message_queue_broadcast(
   Objects_Id            id,
   void                 *buffer,
-  unsigned32            size,
-  unsigned32           *count
+  uint32_t              size,
+  uint32_t             *count
 );
 
 /*
@@ -210,8 +210,8 @@ rtems_status_code rtems_message_queue_broadcast(
 rtems_status_code rtems_message_queue_receive(
   Objects_Id            id,
   void                 *buffer,
-  unsigned32           *size,
-  unsigned32            option_set,
+  uint32_t             *size,
+  uint32_t              option_set,
   rtems_interval        timeout
 );
 
@@ -228,7 +228,7 @@ rtems_status_code rtems_message_queue_receive(
 
 rtems_status_code rtems_message_queue_flush(
   Objects_Id  id,
-  unsigned32 *count
+  uint32_t   *count
 );
 
 /*
@@ -244,7 +244,7 @@ rtems_status_code rtems_message_queue_flush(
 
 rtems_status_code rtems_message_queue_get_number_pending(
   Objects_Id  id,
-  unsigned32 *count
+  uint32_t   *count
 );
 
 
@@ -264,7 +264,7 @@ rtems_status_code rtems_message_queue_get_number_pending(
 rtems_status_code _Message_queue_Submit(
   Objects_Id                  id,
   void                       *buffer,
-  unsigned32                  size,
+  uint32_t                    size,
   Message_queue_Submit_types  submit_type
 );
 
@@ -278,8 +278,8 @@ rtems_status_code _Message_queue_Submit(
  */
 
 Message_queue_Control *_Message_queue_Allocate (
-    unsigned32          count,
-    unsigned32          max_message_size
+    uint32_t            count,
+    uint32_t            max_message_size
 );
 
 /*
@@ -292,7 +292,7 @@ Message_queue_Control *_Message_queue_Allocate (
  */
  
 rtems_status_code _Message_queue_Translate_core_message_queue_return_code (
-  unsigned32 the_message_queue_status
+  uint32_t   the_message_queue_status
 );
 
 /*
diff --git a/cpukit/rtems/include/rtems/rtems/modes.h b/cpukit/rtems/include/rtems/rtems/modes.h
index 31cb897f52..085b1fe940 100644
--- a/cpukit/rtems/include/rtems/rtems/modes.h
+++ b/cpukit/rtems/include/rtems/rtems/modes.h
@@ -27,7 +27,7 @@ extern "C" {
  *  each a mode set.
  */
 
-typedef unsigned32 Modes_Control;
+typedef uint32_t   Modes_Control;
 
 /*
  *  The following constants define the individual modes and masks
diff --git a/cpukit/rtems/include/rtems/rtems/msgmp.h b/cpukit/rtems/include/rtems/rtems/msgmp.h
index 4721994a2f..c954fb90d6 100644
--- a/cpukit/rtems/include/rtems/rtems/msgmp.h
+++ b/cpukit/rtems/include/rtems/rtems/msgmp.h
@@ -61,9 +61,9 @@ typedef struct {
   rtems_name                         name;
   rtems_option                       option_set;
   Objects_Id                         proxy_id;
-  unsigned32                         count;
-  unsigned32                         size;
-  unsigned32                         pad0;
+  uint32_t                           count;
+  uint32_t                           size;
+  uint32_t                           pad0;
   CORE_message_queue_Buffer          Buffer;
 }   Message_queue_MP_Packet;
 
@@ -96,7 +96,7 @@ rtems_status_code _Message_queue_MP_Send_request_packet (
   Message_queue_MP_Remote_operations  operation,
   Objects_Id                          message_queue_id,
   void                               *buffer,
-  unsigned32                         *size_p,
+  uint32_t                           *size_p,
   rtems_option                        option_set,
   Watchdog_Interval                   timeout
 );
diff --git a/cpukit/rtems/include/rtems/rtems/options.h b/cpukit/rtems/include/rtems/rtems/options.h
index f3a76c562e..aaad18ddd5 100644
--- a/cpukit/rtems/include/rtems/rtems/options.h
+++ b/cpukit/rtems/include/rtems/rtems/options.h
@@ -25,7 +25,7 @@ extern "C" {
  *  option sets.
  */
 
-typedef unsigned32 rtems_option;
+typedef uint32_t   rtems_option;
 
 /*
  *  The following constants define the individual options which may
diff --git a/cpukit/rtems/include/rtems/rtems/part.h b/cpukit/rtems/include/rtems/rtems/part.h
index 08dd0225ef..9f1a112bc8 100644
--- a/cpukit/rtems/include/rtems/rtems/part.h
+++ b/cpukit/rtems/include/rtems/rtems/part.h
@@ -42,10 +42,10 @@ extern "C" {
 typedef struct {
   Objects_Control     Object;
   void               *starting_address;      /* physical address */
-  unsigned32          length;                /* in bytes */
-  unsigned32          buffer_size;           /* in bytes */
+  uint32_t            length;                /* in bytes */
+  uint32_t            buffer_size;           /* in bytes */
   rtems_attribute  attribute_set;         /* attributes */
-  unsigned32          number_of_used_blocks; /* or allocated buffers */
+  uint32_t            number_of_used_blocks; /* or allocated buffers */
   Chain_Control       Memory;                /* buffer chain */
 }   Partition_Control;
 
@@ -65,7 +65,7 @@ RTEMS_EXTERN Objects_Information _Partition_Information;
  */
 
 void _Partition_Manager_initialization(
-  unsigned32 maximum_partitions
+  uint32_t   maximum_partitions
 );
 
 /*
@@ -85,8 +85,8 @@ void _Partition_Manager_initialization(
 rtems_status_code rtems_partition_create(
   rtems_name          name,
   void               *starting_address,
-  unsigned32          length,
-  unsigned32          buffer_size,
+  uint32_t            length,
+  uint32_t            buffer_size,
   rtems_attribute  attribute_set,
   Objects_Id         *id
 );
@@ -107,7 +107,7 @@ rtems_status_code rtems_partition_create(
 
 rtems_status_code rtems_partition_ident(
   rtems_name    name,
-  unsigned32    node,
+  uint32_t      node,
   Objects_Id   *id
 );
 
diff --git a/cpukit/rtems/include/rtems/rtems/ratemon.h b/cpukit/rtems/include/rtems/rtems/ratemon.h
index 209f73b9ff..7e5944db7b 100644
--- a/cpukit/rtems/include/rtems/rtems/ratemon.h
+++ b/cpukit/rtems/include/rtems/rtems/ratemon.h
@@ -61,8 +61,8 @@ typedef enum {
 
 typedef struct {
   rtems_rate_monotonic_period_states  state;
-  unsigned32                          ticks_since_last_period;
-  unsigned32                          ticks_executed_since_last_period;
+  uint32_t                            ticks_since_last_period;
+  uint32_t                            ticks_executed_since_last_period;
 }  rtems_rate_monotonic_period_status;
 
 /*
@@ -74,9 +74,9 @@ typedef struct {
   Objects_Control                     Object;
   Watchdog_Control                    Timer;
   rtems_rate_monotonic_period_states  state;
-  unsigned32                          owner_ticks_executed_at_period;
-  unsigned32                          time_at_period;
-  unsigned32                          next_length;
+  uint32_t                            owner_ticks_executed_at_period;
+  uint32_t                            time_at_period;
+  uint32_t                            next_length;
   Thread_Control                     *owner;
 }   Rate_monotonic_Control;
 
@@ -91,7 +91,7 @@ RTEMS_EXTERN Objects_Information _Rate_monotonic_Information;
  */
 
 void _Rate_monotonic_Manager_initialization(
-  unsigned32 maximum_periods
+  uint32_t   maximum_periods
 );
 
 /*
diff --git a/cpukit/rtems/include/rtems/rtems/region.h b/cpukit/rtems/include/rtems/rtems/region.h
index 1cba5f326e..780ca6af83 100644
--- a/cpukit/rtems/include/rtems/rtems/region.h
+++ b/cpukit/rtems/include/rtems/rtems/region.h
@@ -45,11 +45,11 @@ typedef struct {
   Objects_Control       Object;
   Thread_queue_Control  Wait_queue;            /* waiting threads        */
   void                 *starting_address;      /* physical start addr    */
-  unsigned32            length;                /* physical length(bytes) */
-  unsigned32            page_size;             /* in bytes               */
-  unsigned32            maximum_segment_size;  /* in bytes               */
+  uint32_t              length;                /* physical length(bytes) */
+  uint32_t              page_size;             /* in bytes               */
+  uint32_t              maximum_segment_size;  /* in bytes               */
   rtems_attribute       attribute_set;
-  unsigned32            number_of_used_blocks; /* blocks allocated       */
+  uint32_t              number_of_used_blocks; /* blocks allocated       */
   Heap_Control          Memory;
 }  Region_Control;
 
@@ -69,7 +69,7 @@ RTEMS_EXTERN Objects_Information _Region_Information;
  */
 
 void _Region_Manager_initialization(
-  unsigned32 maximum_regions
+  uint32_t   maximum_regions
 );
 
 /*
@@ -89,8 +89,8 @@ void _Region_Manager_initialization(
 rtems_status_code rtems_region_create(
   rtems_name          name,
   void               *starting_address,
-  unsigned32          length,
-  unsigned32          page_size,
+  uint32_t            length,
+  uint32_t            page_size,
   rtems_attribute  attribute_set,
   Objects_Id         *id
 );
@@ -109,7 +109,7 @@ rtems_status_code rtems_region_create(
 rtems_status_code rtems_region_extend(
   Objects_Id          id,
   void               *starting_address,
-  unsigned32          length
+  uint32_t            length
 );
 
 /*
@@ -172,7 +172,7 @@ rtems_status_code rtems_region_delete(
 
 rtems_status_code rtems_region_get_segment(
   Objects_Id         id,
-  unsigned32         size,
+  uint32_t           size,
   rtems_option       option_set,
   rtems_interval     timeout,
   void              **segment
@@ -190,7 +190,7 @@ rtems_status_code rtems_region_get_segment(
 rtems_status_code rtems_region_get_segment_size(
   Objects_Id         id,
   void              *segment,
-  unsigned32        *size
+  uint32_t          *size
 );
 
 /*
diff --git a/cpukit/rtems/include/rtems/rtems/regionmp.h b/cpukit/rtems/include/rtems/rtems/regionmp.h
index 0d11f6eda1..105621bdc7 100644
--- a/cpukit/rtems/include/rtems/rtems/regionmp.h
+++ b/cpukit/rtems/include/rtems/rtems/regionmp.h
@@ -52,7 +52,7 @@ typedef struct {
   Region_MP_Remote_operations  operation;
   rtems_name                   name;
   rtems_option                 option_set;
-  unsigned32                   size;
+  uint32_t                     size;
   Objects_Id                   proxy_id;
   void                        *segment;
 }   Region_MP_Packet;
@@ -86,7 +86,7 @@ rtems_status_code _Region_MP_Send_request_packet (
   Region_MP_Remote_operations  operation,
   Objects_Id                   region_id,
   void                        *segment,
-  unsigned32                   size,
+  uint32_t                     size,
   rtems_option                 option_set,
   rtems_interval               timeout
 );
diff --git a/cpukit/rtems/include/rtems/rtems/sem.h b/cpukit/rtems/include/rtems/rtems/sem.h
index 750a527256..e9a1343fc3 100644
--- a/cpukit/rtems/include/rtems/rtems/sem.h
+++ b/cpukit/rtems/include/rtems/rtems/sem.h
@@ -68,7 +68,7 @@ RTEMS_EXTERN Objects_Information  _Semaphore_Information;
  */
 
 void _Semaphore_Manager_initialization(
-  unsigned32 maximum_semaphores
+  uint32_t   maximum_semaphores
 );
 
 /*
@@ -85,7 +85,7 @@ void _Semaphore_Manager_initialization(
 
 rtems_status_code rtems_semaphore_create(
   rtems_name           name,
-  unsigned32           count,
+  uint32_t             count,
   rtems_attribute      attribute_set,
   rtems_task_priority  priority_ceiling,
   rtems_id            *id
@@ -107,7 +107,7 @@ rtems_status_code rtems_semaphore_create(
 
 rtems_status_code rtems_semaphore_ident(
   rtems_name    name,
-  unsigned32    node,
+  uint32_t      node,
   rtems_id     *id
 );
 
@@ -140,7 +140,7 @@ rtems_status_code rtems_semaphore_delete(
 
 rtems_status_code rtems_semaphore_obtain(
   rtems_id       id,
-  unsigned32     option_set,
+  uint32_t       option_set,
   rtems_interval timeout
 );
 
@@ -184,7 +184,7 @@ rtems_status_code rtems_semaphore_flush(
 
 boolean _Semaphore_Seize(
   Semaphore_Control *the_semaphore,
-  unsigned32         option_set
+  uint32_t           option_set
 );
 
 /*
@@ -197,7 +197,7 @@ boolean _Semaphore_Seize(
  */
  
 rtems_status_code _Semaphore_Translate_core_mutex_return_code (
-  unsigned32 the_mutex_status
+  uint32_t   the_mutex_status
 );
 
 /*
@@ -210,7 +210,7 @@ rtems_status_code _Semaphore_Translate_core_mutex_return_code (
  */
  
 rtems_status_code _Semaphore_Translate_core_semaphore_return_code (
-  unsigned32 the_mutex_status
+  uint32_t   the_mutex_status
 );
  
 /*PAGE
diff --git a/cpukit/rtems/include/rtems/rtems/support.h b/cpukit/rtems/include/rtems/rtems/support.h
index 6c9555bb00..694d9ff690 100644
--- a/cpukit/rtems/include/rtems/rtems/support.h
+++ b/cpukit/rtems/include/rtems/rtems/support.h
@@ -37,7 +37,7 @@ extern "C" {
  */
  
 #define rtems_build_name( _C1, _C2, _C3, _C4 ) \
-  ( (unsigned32)(_C1) << 24 | (unsigned32)(_C2) << 16 | (unsigned32)(_C3) << 8 | (unsigned32)(_C4) )
+  ( (uint32_t  )(_C1) << 24 | (uint32_t  )(_C2) << 16 | (uint32_t  )(_C3) << 8 | (uint32_t  )(_C4) )
  
 /*
  *  rtems_get_class
diff --git a/cpukit/rtems/include/rtems/rtems/taskmp.h b/cpukit/rtems/include/rtems/rtems/taskmp.h
index aab1311bac..d78a4e6a61 100644
--- a/cpukit/rtems/include/rtems/rtems/taskmp.h
+++ b/cpukit/rtems/include/rtems/rtems/taskmp.h
@@ -57,8 +57,8 @@ typedef struct {
   RTEMS_tasks_MP_Remote_operations  operation;
   rtems_name                        name;
   rtems_task_priority               the_priority;
-  unsigned32                        notepad;
-  unsigned32                        note;
+  uint32_t                          notepad;
+  uint32_t                          note;
 }   RTEMS_tasks_MP_Packet;
 
 /*
@@ -89,8 +89,8 @@ rtems_status_code _RTEMS_tasks_MP_Send_request_packet (
   RTEMS_tasks_MP_Remote_operations operation,
   Objects_Id                       task_id,
   rtems_task_priority                 the_priority,
-  unsigned32                       notepad,
-  unsigned32                       note
+  uint32_t                         notepad,
+  uint32_t                         note
 );
 
 /*
diff --git a/cpukit/rtems/include/rtems/rtems/tasks.h b/cpukit/rtems/include/rtems/rtems/tasks.h
index e2448abc8f..dde8794465 100644
--- a/cpukit/rtems/include/rtems/rtems/tasks.h
+++ b/cpukit/rtems/include/rtems/rtems/tasks.h
@@ -118,7 +118,7 @@ typedef void rtems_task;
  *  The following defines the argument to an RTEMS task.
  */
  
-typedef unsigned32 rtems_task_argument;
+typedef uint32_t   rtems_task_argument;
 
 /*
  *  The following defines the type for the entry point of an RTEMS task.
@@ -137,12 +137,12 @@ typedef rtems_task ( *rtems_task_entry )(
  
 typedef struct {
   rtems_name            name;              /* task name */
-  unsigned32            stack_size;        /* task stack size */
+  uint32_t              stack_size;        /* task stack size */
   rtems_task_priority   initial_priority;  /* task priority */
   rtems_attribute       attribute_set;     /* task attributes */
   rtems_task_entry      entry_point;       /* task entry point */
   rtems_mode            mode_set;          /* task initial mode */
-  unsigned32            argument;          /* task argument */
+  uint32_t              argument;          /* task argument */
 } rtems_initialization_tasks_table;
 
 /*
@@ -152,7 +152,7 @@ typedef struct {
 
  
 typedef struct {
-  unsigned32               Notepads[ RTEMS_NUMBER_NOTEPADS ];
+  uint32_t                 Notepads[ RTEMS_NUMBER_NOTEPADS ];
   rtems_event_set          pending_events;
   rtems_event_set          event_condition;
   ASR_Information          Signal;
@@ -171,7 +171,7 @@ RTEMS_EXTERN Objects_Information _RTEMS_tasks_Information;
 
 RTEMS_EXTERN rtems_initialization_tasks_table 
                *_RTEMS_tasks_User_initialization_tasks;
-RTEMS_EXTERN unsigned32   _RTEMS_tasks_Number_of_initialization_tasks;
+RTEMS_EXTERN uint32_t     _RTEMS_tasks_Number_of_initialization_tasks;
 
 /*
  *  _RTEMS_tasks_Manager_initialization
@@ -182,8 +182,8 @@ RTEMS_EXTERN unsigned32   _RTEMS_tasks_Number_of_initialization_tasks;
  */
  
 void _RTEMS_tasks_Manager_initialization(
-  unsigned32                        maximum_tasks,
-  unsigned32                        number_of_initialization_tasks,
+  uint32_t                          maximum_tasks,
+  uint32_t                          number_of_initialization_tasks,
   rtems_initialization_tasks_table *user_tasks
 );
 
@@ -203,7 +203,7 @@ void _RTEMS_tasks_Manager_initialization(
 rtems_status_code rtems_task_create(
   rtems_name           name,
   rtems_task_priority  initial_priority,
-  unsigned32           stack_size,
+  uint32_t             stack_size,
   rtems_mode           initial_modes,
   rtems_attribute      attribute_set,
   Objects_Id          *id
@@ -225,7 +225,7 @@ rtems_status_code rtems_task_create(
 
 rtems_status_code rtems_task_ident(
   rtems_name    name,
-  unsigned32    node,
+  uint32_t      node,
   Objects_Id   *id
 );
 
@@ -254,8 +254,8 @@ rtems_status_code rtems_task_delete(
 
 rtems_status_code rtems_task_get_note(
   Objects_Id  id,
-  unsigned32  notepad,
-  unsigned32 *note
+  uint32_t    notepad,
+  uint32_t   *note
 );
 
 /*
@@ -270,8 +270,8 @@ rtems_status_code rtems_task_get_note(
 
 rtems_status_code rtems_task_set_note(
   Objects_Id id,
-  unsigned32 notepad,
-  unsigned32 note
+  uint32_t   notepad,
+  uint32_t   note
 );
 
 /*
@@ -303,7 +303,7 @@ rtems_status_code rtems_task_mode(
 
 rtems_status_code rtems_task_restart(
   Objects_Id id,
-  unsigned32 arg
+  uint32_t   arg
 );
 
 /*
@@ -362,7 +362,7 @@ rtems_status_code rtems_task_set_priority(
 rtems_status_code rtems_task_start(
   Objects_Id   id,
   rtems_task_entry entry_point,
-  unsigned32   argument
+  uint32_t     argument
 );
 
 /*
diff --git a/cpukit/rtems/include/rtems/rtems/timer.h b/cpukit/rtems/include/rtems/rtems/timer.h
index b308c8c878..0c54ef2eb3 100644
--- a/cpukit/rtems/include/rtems/rtems/timer.h
+++ b/cpukit/rtems/include/rtems/rtems/timer.h
@@ -116,7 +116,7 @@ typedef struct {
  */
 
 void _Timer_Manager_initialization(
-  unsigned32 maximum_timers
+  uint32_t   maximum_timers
 );
 
 /*
@@ -131,7 +131,7 @@ void _Timer_Manager_initialization(
  */
 
 Thread _Timer_Server_body(
-  unsigned32 ignored
+  uint32_t   ignored
 );
 
 /*
@@ -295,8 +295,8 @@ rtems_status_code rtems_timer_reset(
 #define RTEMS_TIMER_SERVER_DEFAULT_PRIORITY -1
 
 rtems_status_code rtems_timer_initiate_server(
-  unsigned32           priority,
-  unsigned32           stack_size,
+  uint32_t             priority,
+  uint32_t             stack_size,
   rtems_attribute      attribute_set
 );