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

	* score/src/Unlimited.txt, score/src/chain.c, score/src/coremsg.c,
	score/src/coremsgbroadcast.c, score/src/coremsgclose.c,
	score/src/coremsgflush.c, score/src/coremsgflushsupp.c,
	score/src/coremsgseize.c, score/src/coremsgsubmit.c,
	score/src/coremutex.c, score/src/coremutexflush.c,
	score/src/coresem.c, score/src/coresemflush.c, score/src/coretod.c,
	score/src/coretodtickle.c, score/src/coretodtoseconds.c,
	score/src/coretodvalidate.c, score/src/heap.c,
	score/src/heapallocate.c, score/src/heapextend.c,
	score/src/heapfree.c, score/src/heapsizeofuserarea.c,
	score/src/interr.c, score/src/iterateoverthreads.c,
	score/src/mpci.c, score/src/object.c, score/src/objectallocate.c,
	score/src/objectallocatebyindex.c, score/src/objectclearname.c,
	score/src/objectcomparenameraw.c,
	score/src/objectcomparenamestring.c, score/src/objectcopynameraw.c,
	score/src/objectcopynamestring.c,
	score/src/objectextendinformation.c, score/src/objectfree.c,
	score/src/objectget.c, score/src/objectgetbyindex.c,
	score/src/objectgetisr.c, score/src/objectgetnoprotection.c,
	score/src/objectidtoname.c, score/src/objectinitializeinformation.c,
	score/src/objectmp.c, score/src/objectnametoid.c,
	score/src/objectshrinkinformation.c, score/src/thread.c,
	score/src/threadcreateidle.c, score/src/threadget.c,
	score/src/threadidlebody.c, score/src/threadinitialize.c,
	score/src/threadmp.c, score/src/threadq.c,
	score/src/threadqdequeuepriority.c,
	score/src/threadqenqueuepriority.c,
	score/src/threadqfirstpriority.c, score/src/threadqflush.c,
	score/src/threadreset.c, score/src/threadrestart.c,
	score/src/threadsettransient.c, score/src/threadstackallocate.c,
	score/src/threadstart.c, score/src/userext.c,
	score/src/watchdoginsert.c, score/src/wkspace.c: Convert to using
	c99 fixed size types.

63 files changed, 176 insertions, 176 deletions

diff --git a/cpukit/score/src/Unlimited.txt b/cpukit/score/src/Unlimited.txt
index 7340fc2dfe..be777d338a 100644
--- a/cpukit/score/src/Unlimited.txt
+++ b/cpukit/score/src/Unlimited.txt
@@ -192,22 +192,22 @@ o Object Information Structure
       all memory is used. When false the current functionallity is
       maintained.
 
-    unsigned32 allocation_size -
+    uint32_t   allocation_size -
     
       When auto_extend is true, it is the value in the Configuration
       table and is the number of objects the object's information
       tables are extended or shrunk.
 
-   unsigned32 size -
+   uint32_t   size -
    
       The size of the object. It is used to calculate the size of
       memory required to be allocated when extending the table.
 
-   unsigned32 inactive -
+   uint32_t   inactive -
    
       The number of elements on the Inactive chain.
 
-   unsigned32 *inactive_per_block -
+   uint32_t   *inactive_per_block -
    
       Pointer to a table of counts of the inactive objects from a
       block on the Inactive chain. It is used to know which blocks are
diff --git a/cpukit/score/src/chain.c b/cpukit/score/src/chain.c
index a7361319f0..4e280fecd7 100644
--- a/cpukit/score/src/chain.c
+++ b/cpukit/score/src/chain.c
@@ -39,11 +39,11 @@
 void _Chain_Initialize(
   Chain_Control *the_chain,
   void           *starting_address,
-  unsigned32     number_nodes,
-  unsigned32     node_size
+  uint32_t       number_nodes,
+  uint32_t       node_size
 )
 {
-  unsigned32  count;
+  uint32_t    count;
   Chain_Node *current;
   Chain_Node *next;
 
diff --git a/cpukit/score/src/coremsg.c b/cpukit/score/src/coremsg.c
index 05238b3bc8..7af308d616 100644
--- a/cpukit/score/src/coremsg.c
+++ b/cpukit/score/src/coremsg.c
@@ -51,12 +51,12 @@
 boolean _CORE_message_queue_Initialize(
   CORE_message_queue_Control    *the_message_queue,
   CORE_message_queue_Attributes *the_message_queue_attributes,
-  unsigned32                     maximum_pending_messages,
-  unsigned32                     maximum_message_size
+  uint32_t                       maximum_pending_messages,
+  uint32_t                       maximum_message_size
 )
 {
-  unsigned32 message_buffering_required;
-  unsigned32 allocated_message_size;
+  uint32_t   message_buffering_required;
+  uint32_t   allocated_message_size;
 
   the_message_queue->maximum_pending_messages   = maximum_pending_messages;
   the_message_queue->number_of_pending_messages = 0;
@@ -68,9 +68,9 @@ boolean _CORE_message_queue_Initialize(
    */
  
   allocated_message_size = maximum_message_size;
-  if (allocated_message_size & (sizeof(unsigned32) - 1)) {
-      allocated_message_size += sizeof(unsigned32);
-      allocated_message_size &= ~(sizeof(unsigned32) - 1);
+  if (allocated_message_size & (sizeof(uint32_t  ) - 1)) {
+      allocated_message_size += sizeof(uint32_t  );
+      allocated_message_size &= ~(sizeof(uint32_t  ) - 1);
   }
    
   message_buffering_required = maximum_pending_messages *
diff --git a/cpukit/score/src/coremsgbroadcast.c b/cpukit/score/src/coremsgbroadcast.c
index 9e996bba15..d19c7b7a0d 100644
--- a/cpukit/score/src/coremsgbroadcast.c
+++ b/cpukit/score/src/coremsgbroadcast.c
@@ -53,16 +53,16 @@
 CORE_message_queue_Status _CORE_message_queue_Broadcast(
   CORE_message_queue_Control                *the_message_queue,
   void                                      *buffer,
-  unsigned32                                 size,
+  uint32_t                                   size,
   Objects_Id                                 id,
   CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support,
-  unsigned32                                *count
+  uint32_t                                  *count
 )
 {
   Thread_Control          *the_thread;
-  unsigned32               number_broadcasted;
+  uint32_t                 number_broadcasted;
   Thread_Wait_information *waitp;
-  unsigned32               constrained_size;
+  uint32_t                 constrained_size;
 
   /*
    *  If there are pending messages, then there can't be threads
@@ -98,7 +98,7 @@ CORE_message_queue_Status _CORE_message_queue_Broadcast(
       constrained_size
     );
 
-    *(unsigned32 *)the_thread->Wait.return_argument_1 = size;
+    *(uint32_t   *)the_thread->Wait.return_argument_1 = size;
 
 #if defined(RTEMS_MULTIPROCESSING)
     if ( !_Objects_Is_local_id( the_thread->Object.id ) )
diff --git a/cpukit/score/src/coremsgclose.c b/cpukit/score/src/coremsgclose.c
index 3f86f498c5..2561255375 100644
--- a/cpukit/score/src/coremsgclose.c
+++ b/cpukit/score/src/coremsgclose.c
@@ -47,7 +47,7 @@
 void _CORE_message_queue_Close(
   CORE_message_queue_Control *the_message_queue,
   Thread_queue_Flush_callout  remote_extract_callout,
-  unsigned32                  status
+  uint32_t                    status
 )
 {
 
diff --git a/cpukit/score/src/coremsgflush.c b/cpukit/score/src/coremsgflush.c
index c9b11681e1..0398974acc 100644
--- a/cpukit/score/src/coremsgflush.c
+++ b/cpukit/score/src/coremsgflush.c
@@ -43,7 +43,7 @@
  *    returns - the number of messages flushed from the queue
  */
  
-unsigned32 _CORE_message_queue_Flush(
+uint32_t   _CORE_message_queue_Flush(
   CORE_message_queue_Control *the_message_queue
 )
 {
diff --git a/cpukit/score/src/coremsgflushsupp.c b/cpukit/score/src/coremsgflushsupp.c
index 717bde9f5b..ca68512419 100644
--- a/cpukit/score/src/coremsgflushsupp.c
+++ b/cpukit/score/src/coremsgflushsupp.c
@@ -47,7 +47,7 @@
  *    only case
  */
 
-unsigned32 _CORE_message_queue_Flush_support(
+uint32_t   _CORE_message_queue_Flush_support(
   CORE_message_queue_Control *the_message_queue
 )
 {
@@ -55,7 +55,7 @@ unsigned32 _CORE_message_queue_Flush_support(
   Chain_Node *inactive_first;
   Chain_Node *message_queue_first;
   Chain_Node *message_queue_last;
-  unsigned32  count;
+  uint32_t    count;
 
   /*
    *  Currently, RTEMS supports no API that has both flush and blocking
diff --git a/cpukit/score/src/coremsgseize.c b/cpukit/score/src/coremsgseize.c
index a01bf1468d..fdbbcb0a0d 100644
--- a/cpukit/score/src/coremsgseize.c
+++ b/cpukit/score/src/coremsgseize.c
@@ -59,7 +59,7 @@ void _CORE_message_queue_Seize(
   CORE_message_queue_Control      *the_message_queue,
   Objects_Id                       id,
   void                            *buffer,
-  unsigned32                      *size,
+  uint32_t                        *size,
   boolean                          wait,
   Watchdog_Interval                timeout
 )
@@ -103,7 +103,7 @@ void _CORE_message_queue_Seize(
      */
 
     the_message->priority  = the_thread->Wait.count;
-    the_message->Contents.size = (unsigned32)the_thread->Wait.return_argument_1;
+    the_message->Contents.size = (uint32_t  )the_thread->Wait.return_argument_1;
     _CORE_message_queue_Copy_buffer(
       the_thread->Wait.return_argument,
       the_message->Contents.buffer,
diff --git a/cpukit/score/src/coremsgsubmit.c b/cpukit/score/src/coremsgsubmit.c
index f491e4683e..05ea8c9479 100644
--- a/cpukit/score/src/coremsgsubmit.c
+++ b/cpukit/score/src/coremsgsubmit.c
@@ -56,7 +56,7 @@
 CORE_message_queue_Status _CORE_message_queue_Submit(
   CORE_message_queue_Control                *the_message_queue,
   void                                      *buffer,
-  unsigned32                                 size,
+  uint32_t                                   size,
   Objects_Id                                 id,
   CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support,
   CORE_message_queue_Submit_types            submit_type,
@@ -84,7 +84,7 @@ CORE_message_queue_Status _CORE_message_queue_Submit(
         the_thread->Wait.return_argument,
         size
       );
-      *(unsigned32 *)the_thread->Wait.return_argument_1 = size;
+      *(uint32_t   *)the_thread->Wait.return_argument_1 = size;
       the_thread->Wait.count = submit_type;
     
 #if defined(RTEMS_MULTIPROCESSING)
diff --git a/cpukit/score/src/coremutex.c b/cpukit/score/src/coremutex.c
index cebcbad8ff..23bfa5a46e 100644
--- a/cpukit/score/src/coremutex.c
+++ b/cpukit/score/src/coremutex.c
@@ -41,7 +41,7 @@
 void _CORE_mutex_Initialize(
   CORE_mutex_Control           *the_mutex,
   CORE_mutex_Attributes        *the_mutex_attributes,
-  unsigned32                    initial_lock
+  uint32_t                      initial_lock
 )
 {
 
diff --git a/cpukit/score/src/coremutexflush.c b/cpukit/score/src/coremutexflush.c
index c486dd83b4..2ac5e2d397 100644
--- a/cpukit/score/src/coremutexflush.c
+++ b/cpukit/score/src/coremutexflush.c
@@ -40,7 +40,7 @@
 void _CORE_mutex_Flush(
   CORE_mutex_Control         *the_mutex,
   Thread_queue_Flush_callout  remote_extract_callout,
-  unsigned32                  status
+  uint32_t                    status
 )
 {
   _Thread_queue_Flush(
diff --git a/cpukit/score/src/coresem.c b/cpukit/score/src/coresem.c
index 25e6a45ecf..8c77878b76 100644
--- a/cpukit/score/src/coresem.c
+++ b/cpukit/score/src/coresem.c
@@ -45,7 +45,7 @@
 void _CORE_semaphore_Initialize(
   CORE_semaphore_Control       *the_semaphore,
   CORE_semaphore_Attributes    *the_semaphore_attributes,
-  unsigned32                    initial_value
+  uint32_t                      initial_value
 )
 {
 
diff --git a/cpukit/score/src/coresemflush.c b/cpukit/score/src/coresemflush.c
index 8f238f0a32..80d150778d 100644
--- a/cpukit/score/src/coresemflush.c
+++ b/cpukit/score/src/coresemflush.c
@@ -44,7 +44,7 @@
 void _CORE_semaphore_Flush(
   CORE_semaphore_Control     *the_semaphore,
   Thread_queue_Flush_callout  remote_extract_callout,
-  unsigned32                  status
+  uint32_t                    status
 )
 {
  
diff --git a/cpukit/score/src/coretod.c b/cpukit/score/src/coretod.c
index 2f5d040fe5..30824108ac 100644
--- a/cpukit/score/src/coretod.c
+++ b/cpukit/score/src/coretod.c
@@ -31,7 +31,7 @@
  */
 
 void _TOD_Handler_initialization(
-  unsigned32 microseconds_per_tick
+  uint32_t   microseconds_per_tick
 )
 {
   _TOD_Microseconds_per_tick = microseconds_per_tick;
diff --git a/cpukit/score/src/coretodtickle.c b/cpukit/score/src/coretodtickle.c
index 820db37baf..408b819ac2 100644
--- a/cpukit/score/src/coretodtickle.c
+++ b/cpukit/score/src/coretodtickle.c
@@ -38,7 +38,7 @@ void _TOD_Tickle(
   void       *ignored
 )
 {
-  unsigned32 leap;
+  uint32_t   leap;
 
   _TOD_Current.ticks = 0;
   ++_TOD_Seconds_since_epoch;
diff --git a/cpukit/score/src/coretodtoseconds.c b/cpukit/score/src/coretodtoseconds.c
index 7e251d7bdb..95e3efaaf9 100644
--- a/cpukit/score/src/coretodtoseconds.c
+++ b/cpukit/score/src/coretodtoseconds.c
@@ -32,12 +32,12 @@
  *    returns    - seconds since epoch until the_tod
  */
 
-unsigned32 _TOD_To_seconds(
+uint32_t   _TOD_To_seconds(
   TOD_Control *the_tod
 )
 {
-  unsigned32 time;
-  unsigned32 year_mod_4;
+  uint32_t   time;
+  uint32_t   year_mod_4;
 
   time = the_tod->day - 1;
   year_mod_4 = the_tod->year & 3;
diff --git a/cpukit/score/src/coretodvalidate.c b/cpukit/score/src/coretodvalidate.c
index 9f0dd5635b..4a4f7d3b0e 100644
--- a/cpukit/score/src/coretodvalidate.c
+++ b/cpukit/score/src/coretodvalidate.c
@@ -38,7 +38,7 @@ boolean _TOD_Validate(
   TOD_Control *the_tod
 )
 {
-  unsigned32 days_in_month;
+  uint32_t   days_in_month;
 
   if ((the_tod->ticks  >= _TOD_Ticks_per_second)  ||
       (the_tod->second >= TOD_SECONDS_PER_MINUTE) ||
diff --git a/cpukit/score/src/heap.c b/cpukit/score/src/heap.c
index 9aa69576e8..fdafffdf9d 100644
--- a/cpukit/score/src/heap.c
+++ b/cpukit/score/src/heap.c
@@ -55,15 +55,15 @@
  *            +--------------------------------+
  */
 
-unsigned32 _Heap_Initialize(
+uint32_t   _Heap_Initialize(
   Heap_Control        *the_heap,
   void                *starting_address,
-  unsigned32           size,
-  unsigned32           page_size
+  uint32_t             size,
+  uint32_t             page_size
 )
 {
   Heap_Block        *the_block;
-  unsigned32         the_size;
+  uint32_t           the_size;
 
   if ( !_Heap_Is_page_size_valid( page_size ) ||
        (size < HEAP_MINIMUM_SIZE) )
diff --git a/cpukit/score/src/heapallocate.c b/cpukit/score/src/heapallocate.c
index 8cf23a22ef..13165bcfce 100644
--- a/cpukit/score/src/heapallocate.c
+++ b/cpukit/score/src/heapallocate.c
@@ -33,20 +33,20 @@
 
 void *_Heap_Allocate(
   Heap_Control        *the_heap,
-  unsigned32           size
+  uint32_t             size
 )
 {
-  unsigned32  excess;
-  unsigned32  the_size;
+  uint32_t    excess;
+  uint32_t    the_size;
   Heap_Block *the_block;
   Heap_Block *next_block;
   Heap_Block *temporary_block;
   void       *ptr;
-  unsigned32  offset;
+  uint32_t    offset;
 
   /*
    * Catch the case of a user allocating close to the limit of the
-   * unsigned32.
+   * uint32_t  .
    */
 
   if ( size >= (-1 - HEAP_BLOCK_USED_OVERHEAD) )
@@ -96,14 +96,14 @@ void *_Heap_Allocate(
    * Have to save the bump amount in the buffer so that free can figure it out
    */
   
-  offset = the_heap->page_size - (((unsigned32) ptr) & (the_heap->page_size - 1));
+  offset = the_heap->page_size - (((uint32_t  ) ptr) & (the_heap->page_size - 1));
   ptr = _Addresses_Add_offset( ptr, offset );
-  *(((unsigned32 *) ptr) - 1) = offset;
+  *(((uint32_t   *) ptr) - 1) = offset;
 
 #ifdef RTEMS_DEBUG
   {
-      unsigned32 ptr_u32;
-      ptr_u32 = (unsigned32) ptr;
+      uint32_t   ptr_u32;
+      ptr_u32 = (uint32_t  ) ptr;
       if (ptr_u32 & (the_heap->page_size - 1))
           abort();
   }
diff --git a/cpukit/score/src/heapextend.c b/cpukit/score/src/heapextend.c
index 450ab56172..7bc4d24a11 100644
--- a/cpukit/score/src/heapextend.c
+++ b/cpukit/score/src/heapextend.c
@@ -35,12 +35,12 @@
 Heap_Extend_status _Heap_Extend(
   Heap_Control        *the_heap,
   void                *starting_address,
-  unsigned32           size,
-  unsigned32          *amount_extended
+  uint32_t             size,
+  uint32_t            *amount_extended
 )
 {
   Heap_Block        *the_block;
-  unsigned32        *p;
+  uint32_t          *p;
   
   /*
    *  The overhead was taken from the original heap memory.
@@ -102,8 +102,8 @@ Heap_Extend_status _Heap_Extend(
    *  So add in the offset field.
    */
 
-  p = (unsigned32 *) &old_final->next;
-  *p = sizeof(unsigned32);
+  p = (uint32_t   *) &old_final->next;
+  *p = sizeof(uint32_t  );
   p++;
   _Heap_Free( the_heap, p );
   
diff --git a/cpukit/score/src/heapfree.c b/cpukit/score/src/heapfree.c
index c7163be96b..715f23d9a5 100644
--- a/cpukit/score/src/heapfree.c
+++ b/cpukit/score/src/heapfree.c
@@ -42,7 +42,7 @@ boolean _Heap_Free(
   Heap_Block        *new_next_block;
   Heap_Block        *previous_block;
   Heap_Block        *temporary_block;
-  unsigned32         the_size;
+  uint32_t           the_size;
 
   the_block = _Heap_User_block_at( starting_address );
 
diff --git a/cpukit/score/src/heapsizeofuserarea.c b/cpukit/score/src/heapsizeofuserarea.c
index 60ee7d033b..da101d730c 100644
--- a/cpukit/score/src/heapsizeofuserarea.c
+++ b/cpukit/score/src/heapsizeofuserarea.c
@@ -37,12 +37,12 @@
 boolean _Heap_Size_of_user_area(
   Heap_Control        *the_heap,
   void                *starting_address,
-  unsigned32          *size
+  uint32_t            *size
 )
 {
   Heap_Block        *the_block;
   Heap_Block        *next_block;
-  unsigned32         the_size;
+  uint32_t           the_size;
 
   the_block = _Heap_User_block_at( starting_address );
   
diff --git a/cpukit/score/src/interr.c b/cpukit/score/src/interr.c
index 1d36d4a757..3dda8e6f9d 100644
--- a/cpukit/score/src/interr.c
+++ b/cpukit/score/src/interr.c
@@ -42,7 +42,7 @@
 void volatile _Internal_error_Occurred(
   Internal_errors_Source  the_source,
   boolean                 is_internal,
-  unsigned32              the_error
+  uint32_t                the_error
 )
 {
 
diff --git a/cpukit/score/src/iterateoverthreads.c b/cpukit/score/src/iterateoverthreads.c
index 418f87b304..60b27842e5 100644
--- a/cpukit/score/src/iterateoverthreads.c
+++ b/cpukit/score/src/iterateoverthreads.c
@@ -20,8 +20,8 @@
 
 void rtems_iterate_over_all_threads(rtems_per_thread_routine routine)
 {
-  unsigned32           i;
-  unsigned32           api_index;
+  uint32_t             i;
+  uint32_t             api_index;
   Thread_Control      *the_thread;
   Objects_Information *information;
  
diff --git a/cpukit/score/src/mpci.c b/cpukit/score/src/mpci.c
index de467b90de..bacac3891e 100644
--- a/cpukit/score/src/mpci.c
+++ b/cpukit/score/src/mpci.c
@@ -37,7 +37,7 @@
 
 void _MPCI_Handler_initialization( 
   MPCI_Control            *users_mpci_table,
-  unsigned32               timeout_status
+  uint32_t                 timeout_status
 )
 {
   CORE_semaphore_Attributes    attributes;
@@ -212,14 +212,14 @@ void _MPCI_Return_packet (
  */
 
 void _MPCI_Send_process_packet (
-  unsigned32          destination,
+  uint32_t            destination,
   MP_packet_Prefix   *the_packet
 )
 {
   the_packet->source_tid = _Thread_Executing->Object.id;
   the_packet->to_convert =
      ( the_packet->to_convert - sizeof(MP_packet_Prefix) ) /
-       sizeof(unsigned32);
+       sizeof(uint32_t  );
 
   (*_MPCI_table->send_packet)( destination, the_packet );
 }
@@ -232,8 +232,8 @@ void _MPCI_Send_process_packet (
  *  MPCI send callout.
  */
 
-unsigned32 _MPCI_Send_request_packet (
-  unsigned32          destination,
+uint32_t   _MPCI_Send_request_packet (
+  uint32_t            destination,
   MP_packet_Prefix   *the_packet,
   States_Control      extra_state
 )
@@ -242,7 +242,7 @@ unsigned32 _MPCI_Send_request_packet (
   the_packet->source_priority = _Thread_Executing->current_priority;
   the_packet->to_convert =
      ( the_packet->to_convert - sizeof(MP_packet_Prefix) ) /
-       sizeof(unsigned32);
+       sizeof(uint32_t  );
 
   _Thread_Executing->Wait.id = the_packet->id;
 
@@ -280,7 +280,7 @@ unsigned32 _MPCI_Send_request_packet (
  */
 
 void _MPCI_Send_response_packet (
-  unsigned32          destination,
+  uint32_t            destination,
   MP_packet_Prefix   *the_packet
 )
 {
@@ -344,7 +344,7 @@ Thread_Control *_MPCI_Process_response (
  */
 
 Thread _MPCI_Receive_server(
-  unsigned32 ignored
+  uint32_t   ignored
 )
 {
  
@@ -463,8 +463,8 @@ void _MPCI_Internal_packets_Process_packet (
 )
 {
   MPCI_Internal_packet *the_packet;
-  unsigned32                  maximum_nodes;
-  unsigned32                  maximum_global_objects;
+  uint32_t                    maximum_nodes;
+  uint32_t                    maximum_global_objects;
  
   the_packet = (MPCI_Internal_packet *) the_packet_prefix;
  
diff --git a/cpukit/score/src/object.c b/cpukit/score/src/object.c
index 35e25390c3..56b3dad4a2 100644
--- a/cpukit/score/src/object.c
+++ b/cpukit/score/src/object.c
@@ -39,9 +39,9 @@
  */
 
 void _Objects_Handler_initialization(
-  unsigned32 node,
-  unsigned32 maximum_nodes,
-  unsigned32 maximum_global_objects
+  uint32_t   node,
+  uint32_t   maximum_nodes,
+  uint32_t   maximum_global_objects
 )
 {
   if ( node < 1 || node > maximum_nodes )
diff --git a/cpukit/score/src/objectallocate.c b/cpukit/score/src/objectallocate.c
index 0d394df856..2bac4d3378 100644
--- a/cpukit/score/src/objectallocate.c
+++ b/cpukit/score/src/objectallocate.c
@@ -53,7 +53,7 @@ Objects_Control *_Objects_Allocate(
     }
   
     if ( the_object ) {
-      unsigned32 block;
+      uint32_t   block;
     
       block = _Objects_Get_index( the_object->id ) -
               _Objects_Get_index( information->minimum_id );
diff --git a/cpukit/score/src/objectallocatebyindex.c b/cpukit/score/src/objectallocatebyindex.c
index 04809bbca4..ec951d9747 100644
--- a/cpukit/score/src/objectallocatebyindex.c
+++ b/cpukit/score/src/objectallocatebyindex.c
@@ -37,8 +37,8 @@
 
 Objects_Control *_Objects_Allocate_by_index(
   Objects_Information *information,
-  unsigned32           index,
-  unsigned32           sizeof_control
+  uint32_t             index,
+  uint32_t             sizeof_control
 )
 {
   Objects_Control *the_object;
diff --git a/cpukit/score/src/objectclearname.c b/cpukit/score/src/objectclearname.c
index 56898deb30..3d48ac039f 100644
--- a/cpukit/score/src/objectclearname.c
+++ b/cpukit/score/src/objectclearname.c
@@ -34,12 +34,12 @@
 
 void _Objects_Clear_name(
   void       *name,
-  unsigned32  length
+  uint32_t    length
 )
 {
-  unsigned32  index;
-  unsigned32  maximum = length / OBJECTS_NAME_ALIGNMENT;
-  unsigned32 *name_ptr = (unsigned32 *) name;
+  uint32_t    index;
+  uint32_t    maximum = length / OBJECTS_NAME_ALIGNMENT;
+  uint32_t   *name_ptr = (uint32_t   *) name;
 
   for ( index=0 ; index < maximum ; index++ ) 
     *name_ptr++ = 0;
diff --git a/cpukit/score/src/objectcomparenameraw.c b/cpukit/score/src/objectcomparenameraw.c
index b2291154e6..12dcd11763 100644
--- a/cpukit/score/src/objectcomparenameraw.c
+++ b/cpukit/score/src/objectcomparenameraw.c
@@ -34,13 +34,13 @@
 boolean _Objects_Compare_name_raw(
   void       *name_1,
   void       *name_2,
-  unsigned32  length
+  uint32_t    length
 )
 {
 #if 0
-  unsigned32 *name_1_p = (unsigned32 *) name_1;
-  unsigned32 *name_2_p = (unsigned32 *) name_2;
-  unsigned32  tmp_length = length / OBJECTS_NAME_ALIGNMENT;
+  uint32_t   *name_1_p = (uint32_t   *) name_1;
+  uint32_t   *name_2_p = (uint32_t   *) name_2;
+  uint32_t    tmp_length = length / OBJECTS_NAME_ALIGNMENT;
 #endif
  
   if ( name_1 == name_2 )
diff --git a/cpukit/score/src/objectcomparenamestring.c b/cpukit/score/src/objectcomparenamestring.c
index 4a1468bbc7..7b93315e5b 100644
--- a/cpukit/score/src/objectcomparenamestring.c
+++ b/cpukit/score/src/objectcomparenamestring.c
@@ -44,7 +44,7 @@
 boolean _Objects_Compare_name_string(
   void       *name_1,
   void       *name_2,
-  unsigned32  length
+  uint32_t    length
 )
 {
   if ( !strncmp( name_1, name_2, length ) )
diff --git a/cpukit/score/src/objectcopynameraw.c b/cpukit/score/src/objectcopynameraw.c
index c267d3efe0..ef2d0186d6 100644
--- a/cpukit/score/src/objectcopynameraw.c
+++ b/cpukit/score/src/objectcopynameraw.c
@@ -34,12 +34,12 @@
 void _Objects_Copy_name_raw(
   void       *source,
   void       *destination,
-  unsigned32  length
+  uint32_t    length
 )
 {
-  unsigned32 *source_p = (unsigned32 *) source;
-  unsigned32 *destination_p = (unsigned32 *) destination;
-  unsigned32  tmp_length = length / OBJECTS_NAME_ALIGNMENT;
+  uint32_t   *source_p = (uint32_t   *) source;
+  uint32_t   *destination_p = (uint32_t   *) destination;
+  uint32_t    tmp_length = length / OBJECTS_NAME_ALIGNMENT;
  
   while ( tmp_length-- )
     *destination_p++ = *source_p++;
diff --git a/cpukit/score/src/objectcopynamestring.c b/cpukit/score/src/objectcopynamestring.c
index 96acddc4d0..084d349bf2 100644
--- a/cpukit/score/src/objectcopynamestring.c
+++ b/cpukit/score/src/objectcopynamestring.c
@@ -36,8 +36,8 @@ void _Objects_Copy_name_string(
   void       *destination
 )
 {
-  unsigned8 *source_p = (unsigned8 *) source;
-  unsigned8 *destination_p = (unsigned8 *) destination;
+  uint8_t   *source_p = (uint8_t   *) source;
+  uint8_t   *destination_p = (uint8_t   *) destination;
  
   *destination_p = '\0';
   if ( source_p ) {
diff --git a/cpukit/score/src/objectextendinformation.c b/cpukit/score/src/objectextendinformation.c
index e404d092ad..abd87e79db 100644
--- a/cpukit/score/src/objectextendinformation.c
+++ b/cpukit/score/src/objectextendinformation.c
@@ -45,11 +45,11 @@ void _Objects_Extend_information(
   Objects_Control  *the_object;
   void             *name_area;
   Chain_Control     Inactive;
-  unsigned32        block_count;
-  unsigned32        block;
-  unsigned32        index_base;
-  unsigned32        minimum_index;
-  unsigned32        index;
+  uint32_t          block_count;
+  uint32_t          block;
+  uint32_t          index_base;
+  uint32_t          minimum_index;
+  uint32_t          index;
 
   /*
    *  Search for a free block of indexes. The block variable ends up set
@@ -81,9 +81,9 @@ void _Objects_Extend_information(
     ISR_Level         level;
     void            **object_blocks;
     Objects_Name     *name_table;
-    unsigned32       *inactive_per_block;
+    uint32_t         *inactive_per_block;
     Objects_Control **local_table;
-    unsigned32        maximum;
+    uint32_t          maximum;
     void             *old_tables;    
     
     /*
@@ -96,7 +96,7 @@ void _Objects_Extend_information(
      *  The allocation has :
      *
      *      void            *objects[block_count];
-     *      unsigned32       inactive_count[block_count];
+     *      uint32_t         inactive_count[block_count];
      *      Objects_Name    *name_table[block_count];
      *      Objects_Control *local_table[maximum];
      *
@@ -120,7 +120,7 @@ void _Objects_Extend_information(
       object_blocks = (void**)
         _Workspace_Allocate(
           block_count *
-             (sizeof(void *) + sizeof(unsigned32) + sizeof(Objects_Name *)) +
+             (sizeof(void *) + sizeof(uint32_t  ) + sizeof(Objects_Name *)) +
           ((maximum + minimum_index) * sizeof(Objects_Control *))
           );
 
@@ -131,7 +131,7 @@ void _Objects_Extend_information(
       object_blocks = (void**)
         _Workspace_Allocate_or_fatal_error(
           block_count * 
-             (sizeof(void *) + sizeof(unsigned32) + sizeof(Objects_Name *)) +
+             (sizeof(void *) + sizeof(uint32_t  ) + sizeof(Objects_Name *)) +
           ((maximum + minimum_index) * sizeof(Objects_Control *))
         );
     }
@@ -141,10 +141,10 @@ void _Objects_Extend_information(
      *
      */
      
-    inactive_per_block = (unsigned32 *) _Addresses_Add_offset(
+    inactive_per_block = (uint32_t   *) _Addresses_Add_offset(
         object_blocks, block_count * sizeof(void*) );
     name_table = (Objects_Name *) _Addresses_Add_offset(
-        inactive_per_block, block_count * sizeof(unsigned32) );
+        inactive_per_block, block_count * sizeof(uint32_t  ) );
     local_table = (Objects_Control **) _Addresses_Add_offset(
         name_table, block_count * sizeof(Objects_Name *) );
     
@@ -167,7 +167,7 @@ void _Objects_Extend_information(
               block_count * sizeof(void*) );
       memcpy( inactive_per_block,
               information->inactive_per_block,
-              block_count * sizeof(unsigned32) );
+              block_count * sizeof(uint32_t  ) );
       memcpy( name_table,
               information->name_table,
               block_count * sizeof(Objects_Name *) );
diff --git a/cpukit/score/src/objectfree.c b/cpukit/score/src/objectfree.c
index 3f3fd63d66..4a5fe2be10 100644
--- a/cpukit/score/src/objectfree.c
+++ b/cpukit/score/src/objectfree.c
@@ -39,12 +39,12 @@ void _Objects_Free(
   Objects_Control     *the_object
 )
 {
-  unsigned32  allocation_size = information->allocation_size;
+  uint32_t    allocation_size = information->allocation_size;
 
   _Chain_Append( &information->Inactive, &the_object->Node );
 
   if ( information->auto_extend ) {
-    unsigned32  block;
+    uint32_t    block;
     
     block = 
       _Objects_Get_index( the_object->id ) - _Objects_Get_index( information->minimum_id );
diff --git a/cpukit/score/src/objectget.c b/cpukit/score/src/objectget.c
index 508110c9a2..def31ca1d4 100644
--- a/cpukit/score/src/objectget.c
+++ b/cpukit/score/src/objectget.c
@@ -51,7 +51,7 @@ Objects_Control *_Objects_Get(
 )
 {
   Objects_Control *the_object;
-  unsigned32       index;
+  uint32_t         index;
 
 #if defined(RTEMS_MULTIPROCESSING)
   index = id - information->minimum_id + 1;
@@ -59,7 +59,7 @@ Objects_Control *_Objects_Get(
   /* index = _Objects_Get_index( id ); */
   index = id & 0x0000ffff;
   /* This should work but doesn't always :( */
-  /* index = (unsigned16) id; */
+  /* index = (uint16_t  ) id; */
 #endif
 
    if ( information->maximum >= index ) { 
diff --git a/cpukit/score/src/objectgetbyindex.c b/cpukit/score/src/objectgetbyindex.c
index 0498dd1e31..f83562e753 100644
--- a/cpukit/score/src/objectgetbyindex.c
+++ b/cpukit/score/src/objectgetbyindex.c
@@ -46,7 +46,7 @@
 
 Objects_Control *_Objects_Get_by_index(
   Objects_Information *information,
-  unsigned32           index,
+  uint32_t             index,
   Objects_Locations   *location
 )
 {
diff --git a/cpukit/score/src/objectgetisr.c b/cpukit/score/src/objectgetisr.c
index 0035c923a1..2f25025bcf 100644
--- a/cpukit/score/src/objectgetisr.c
+++ b/cpukit/score/src/objectgetisr.c
@@ -54,7 +54,7 @@ Objects_Control *_Objects_Get_isr_disable(
 )
 {
   Objects_Control *the_object;
-  unsigned32       index;
+  uint32_t         index;
   ISR_Level        level;
 
 #if defined(RTEMS_MULTIPROCESSING)
@@ -63,7 +63,7 @@ Objects_Control *_Objects_Get_isr_disable(
   /* index = _Objects_Get_index( id ); */
   index = id & 0x0000ffff;
   /* This should work but doesn't always :( */
-  /* index = (unsigned16) id; */
+  /* index = (uint16_t  ) id; */
 #endif
 
   _ISR_Disable( level );
diff --git a/cpukit/score/src/objectgetnoprotection.c b/cpukit/score/src/objectgetnoprotection.c
index 2c9a2b517b..8dfd5b9617 100644
--- a/cpukit/score/src/objectgetnoprotection.c
+++ b/cpukit/score/src/objectgetnoprotection.c
@@ -51,7 +51,7 @@ Objects_Control *_Objects_Get_no_protection(
 )
 {
   Objects_Control *the_object;
-  unsigned32       index;
+  uint32_t         index;
 
 #if defined(RTEMS_MULTIPROCESSING)
   index = id - information->minimum_id + 1;
@@ -59,7 +59,7 @@ Objects_Control *_Objects_Get_no_protection(
   /* index = _Objects_Get_index( id ); */
   index = id & 0x0000ffff;
   /* This should work but doesn't always :( */
-  /* index = (unsigned16) id; */
+  /* index = (uint16_t  ) id; */
 #endif
 
    if ( information->maximum >= index ) { 
diff --git a/cpukit/score/src/objectidtoname.c b/cpukit/score/src/objectidtoname.c
index 1677dac4b2..094b39a8bf 100644
--- a/cpukit/score/src/objectidtoname.c
+++ b/cpukit/score/src/objectidtoname.c
@@ -36,8 +36,8 @@ Objects_Name_or_id_lookup_errors _Objects_Id_to_name (
   Objects_Name   *name
 )
 {
-  unsigned32           the_api;
-  unsigned32           the_class;
+  uint32_t             the_api;
+  uint32_t             the_class;
   Objects_Information *information;
   Objects_Control     *the_object = (Objects_Control *) 0;
   Objects_Locations    ignored_location;
diff --git a/cpukit/score/src/objectinitializeinformation.c b/cpukit/score/src/objectinitializeinformation.c
index 23c971d5b7..366f4382db 100644
--- a/cpukit/score/src/objectinitializeinformation.c
+++ b/cpukit/score/src/objectinitializeinformation.c
@@ -46,11 +46,11 @@
 void _Objects_Initialize_information(
   Objects_Information *information,
   Objects_APIs         the_api,
-  unsigned32           the_class,
-  unsigned32           maximum,
-  unsigned32           size,
+  uint32_t             the_class,
+  uint32_t             maximum,
+  uint32_t             size,
   boolean              is_string,
-  unsigned32           maximum_name_length
+  uint32_t             maximum_name_length
 #if defined(RTEMS_MULTIPROCESSING)
   ,
   boolean              supports_global,
@@ -59,10 +59,10 @@ void _Objects_Initialize_information(
 )
 {
   static Objects_Control *null_local_table = NULL;
-  unsigned32       minimum_index;
-  unsigned32       name_length;
+  uint32_t         minimum_index;
+  uint32_t         name_length;
 #if defined(RTEMS_MULTIPROCESSING)
-  unsigned32       index;
+  uint32_t         index;
 #endif
 
   information->the_api            = the_api;
diff --git a/cpukit/score/src/objectmp.c b/cpukit/score/src/objectmp.c
index ba4b0d6870..fb663543aa 100644
--- a/cpukit/score/src/objectmp.c
+++ b/cpukit/score/src/objectmp.c
@@ -25,9 +25,9 @@
  */
 
 void _Objects_MP_Handler_initialization (
-  unsigned32 node,
-  unsigned32 maximum_nodes,
-  unsigned32 maximum_global_objects
+  uint32_t   node,
+  uint32_t   maximum_nodes,
+  uint32_t   maximum_global_objects
 )
 {
   _Objects_MP_Maximum_global_objects = maximum_global_objects;
@@ -57,7 +57,7 @@ void _Objects_MP_Handler_initialization (
 void _Objects_MP_Open (
   Objects_Information *information,
   Objects_MP_Control  *the_global_object,
-  unsigned32           the_name,      /* XXX -- wrong for variable */
+  uint32_t             the_name,      /* XXX -- wrong for variable */
   Objects_Id           the_id
 )
 {
@@ -79,7 +79,7 @@ void _Objects_MP_Open (
 
 boolean _Objects_MP_Allocate_and_open (
   Objects_Information *information,
-  unsigned32           the_name,      /* XXX -- wrong for variable */
+  uint32_t             the_name,      /* XXX -- wrong for variable */
   Objects_Id           the_id,
   boolean              is_fatal_error
 )
@@ -153,19 +153,19 @@ void _Objects_MP_Close (
 Objects_Name_or_id_lookup_errors _Objects_MP_Global_name_search (
   Objects_Information *information,
   Objects_Name         the_name,
-  unsigned32           nodes_to_search,
+  uint32_t             nodes_to_search,
   Objects_Id          *the_id
 )
 {
-  unsigned32          low_node;
-  unsigned32          high_node;
-  unsigned32          node_index;
+  uint32_t            low_node;
+  uint32_t            high_node;
+  uint32_t            node_index;
   Chain_Control      *the_chain;
   Chain_Node         *the_node;
   Objects_MP_Control *the_object;
-  unsigned32          name_to_use;
+  uint32_t            name_to_use;
 
-  name_to_use = *(unsigned32 *)the_name;  /* XXX only fixed length names */
+  name_to_use = *(uint32_t   *)the_name;  /* XXX only fixed length names */
 
   if ( nodes_to_search > _Objects_Maximum_nodes )
     return OBJECTS_INVALID_NODE;
@@ -226,7 +226,7 @@ void _Objects_MP_Is_remote (
   Objects_Control     **the_object
 )
 {
-  unsigned32          node;
+  uint32_t            node;
   Chain_Control      *the_chain;
   Chain_Node         *the_node;
   Objects_MP_Control *the_global_object;
diff --git a/cpukit/score/src/objectnametoid.c b/cpukit/score/src/objectnametoid.c
index ae4d415750..a72a8b6c58 100644
--- a/cpukit/score/src/objectnametoid.c
+++ b/cpukit/score/src/objectnametoid.c
@@ -46,14 +46,14 @@
 Objects_Name_or_id_lookup_errors _Objects_Name_to_id(
   Objects_Information *information,
   Objects_Name         name,
-  unsigned32           node,
+  uint32_t             node,
   Objects_Id          *id
 )
 {
   boolean                    search_local_node;
   Objects_Control           *the_object;
-  unsigned32                 index;
-  unsigned32                 name_length;
+  uint32_t                   index;
+  uint32_t                   name_length;
   Objects_Name_comparators   compare_them;
 
   if ( name == 0 )
diff --git a/cpukit/score/src/objectshrinkinformation.c b/cpukit/score/src/objectshrinkinformation.c
index 1184ceafe2..6b95719ca2 100644
--- a/cpukit/score/src/objectshrinkinformation.c
+++ b/cpukit/score/src/objectshrinkinformation.c
@@ -45,10 +45,10 @@ void _Objects_Shrink_information(
 {
   Objects_Control  *the_object;
   Objects_Control  *extract_me;
-  unsigned32        block_count;
-  unsigned32        block;
-  unsigned32        index_base;
-  unsigned32        index;
+  uint32_t          block_count;
+  uint32_t          block;
+  uint32_t          index_base;
+  uint32_t          index;
 
   /*
    * Search the list to find block or chunnk with all objects inactive.
diff --git a/cpukit/score/src/thread.c b/cpukit/score/src/thread.c
index c71be3a2f6..9ad8960b26 100644
--- a/cpukit/score/src/thread.c
+++ b/cpukit/score/src/thread.c
@@ -40,12 +40,12 @@
  */
 
 void _Thread_Handler_initialization(
-  unsigned32   ticks_per_timeslice,
-  unsigned32   maximum_extensions,
-  unsigned32   maximum_proxies
+  uint32_t     ticks_per_timeslice,
+  uint32_t     maximum_extensions,
+  uint32_t     maximum_proxies
 )
 {
-  unsigned32      index;
+  uint32_t        index;
 
   /*
    * BOTH stacks hooks must be set or both must be NULL.
diff --git a/cpukit/score/src/threadcreateidle.c b/cpukit/score/src/threadcreateidle.c
index a83f16620a..da6dde602d 100644
--- a/cpukit/score/src/threadcreateidle.c
+++ b/cpukit/score/src/threadcreateidle.c
@@ -36,7 +36,7 @@ const char *_Thread_Idle_name = "IDLE";
 void _Thread_Create_idle( void )
 {
   void       *idle;
-  unsigned32  idle_task_stack_size;
+  uint32_t    idle_task_stack_size;
 
   /*
    *  The entire workspace is zeroed during its initialization.  Thus, all
diff --git a/cpukit/score/src/threadget.c b/cpukit/score/src/threadget.c
index 97b31afdde..2fde125f05 100644
--- a/cpukit/score/src/threadget.c
+++ b/cpukit/score/src/threadget.c
@@ -43,8 +43,8 @@ Thread_Control *_Thread_Get (
   Objects_Locations   *location
 )
 {
-  unsigned32           the_api;
-  unsigned32           the_class;
+  uint32_t             the_api;
+  uint32_t             the_class;
   Objects_Information *information;
   Thread_Control      *tp = (Thread_Control *) 0;
  
diff --git a/cpukit/score/src/threadidlebody.c b/cpukit/score/src/threadidlebody.c
index c1528856a5..d6812dc496 100644
--- a/cpukit/score/src/threadidlebody.c
+++ b/cpukit/score/src/threadidlebody.c
@@ -42,7 +42,7 @@
  
 #if (CPU_PROVIDES_IDLE_THREAD_BODY == FALSE)
 Thread _Thread_Idle_body(
-  unsigned32 ignored
+  uint32_t   ignored
 )
 {
   for( ; ; ) ;
diff --git a/cpukit/score/src/threadinitialize.c b/cpukit/score/src/threadinitialize.c
index ebad61c92d..172f3cad1b 100644
--- a/cpukit/score/src/threadinitialize.c
+++ b/cpukit/score/src/threadinitialize.c
@@ -40,17 +40,17 @@ boolean _Thread_Initialize(
   Objects_Information                  *information,
   Thread_Control                       *the_thread,
   void                                 *stack_area,
-  unsigned32                            stack_size,
+  uint32_t                              stack_size,
   boolean                               is_fp,
   Priority_Control                      priority,
   boolean                               is_preemptible,
   Thread_CPU_budget_algorithms          budget_algorithm,
   Thread_CPU_budget_algorithm_callout   budget_callout,
-  unsigned32                            isr_level,
+  uint32_t                              isr_level,
   Objects_Name                          name
 )
 {
-  unsigned32           actual_stack_size = 0;
+  uint32_t             actual_stack_size = 0;
   void                *stack = NULL;
 #if ( CPU_HARDWARE_FP == TRUE ) || ( CPU_SOFTWARE_FP == TRUE )
   void                *fp_area;
diff --git a/cpukit/score/src/threadmp.c b/cpukit/score/src/threadmp.c
index c0e8522e30..f399e6d896 100644
--- a/cpukit/score/src/threadmp.c
+++ b/cpukit/score/src/threadmp.c
@@ -25,7 +25,7 @@
  */
 
 void _Thread_MP_Handler_initialization (
-  unsigned32  maximum_proxies
+  uint32_t    maximum_proxies
 )
 {
 
@@ -112,7 +112,7 @@ Thread_Control *_Thread_MP_Allocate_proxy (
  */
 
 #define _Thread_MP_Proxy_Active_offset \
-     ((unsigned32)&(((Thread_Proxy_control *)0))->Active)
+     ((uint32_t  )&(((Thread_Proxy_control *)0))->Active)
 
 Thread_Control *_Thread_MP_Find_proxy (
   Objects_Id  the_id
diff --git a/cpukit/score/src/threadq.c b/cpukit/score/src/threadq.c
index bb4c30a514..7177de7280 100644
--- a/cpukit/score/src/threadq.c
+++ b/cpukit/score/src/threadq.c
@@ -40,10 +40,10 @@ void _Thread_queue_Initialize(
   Thread_queue_Control         *the_thread_queue,
   Thread_queue_Disciplines      the_discipline,
   States_Control                state,
-  unsigned32                    timeout_status
+  uint32_t                      timeout_status
 )
 {
-  unsigned32 index;
+  uint32_t   index;
 
   the_thread_queue->state          = state;
   the_thread_queue->discipline     = the_discipline;
diff --git a/cpukit/score/src/threadqdequeuepriority.c b/cpukit/score/src/threadqdequeuepriority.c
index dde9996ceb..4567a76fd3 100644
--- a/cpukit/score/src/threadqdequeuepriority.c
+++ b/cpukit/score/src/threadqdequeuepriority.c
@@ -42,7 +42,7 @@ Thread_Control *_Thread_queue_Dequeue_priority(
   Thread_queue_Control *the_thread_queue
 )
 {
-  unsigned32      index;
+  uint32_t        index;
   ISR_Level       level;
   Thread_Control *the_thread = NULL;  /* just to remove warnings */
   Thread_Control *new_first_thread;
diff --git a/cpukit/score/src/threadqenqueuepriority.c b/cpukit/score/src/threadqenqueuepriority.c
index 7ac6ad4d6f..2d00d89187 100644
--- a/cpukit/score/src/threadqenqueuepriority.c
+++ b/cpukit/score/src/threadqenqueuepriority.c
@@ -50,7 +50,7 @@ void _Thread_queue_Enqueue_priority(
   Thread_Control      *search_thread;
   ISR_Level            level;
   Chain_Control       *header;
-  unsigned32           header_index;
+  uint32_t             header_index;
   Chain_Node          *the_node;
   Chain_Node          *next_node;
   Chain_Node          *previous_node;
diff --git a/cpukit/score/src/threadqfirstpriority.c b/cpukit/score/src/threadqfirstpriority.c
index e4b23a6e68..474b27c630 100644
--- a/cpukit/score/src/threadqfirstpriority.c
+++ b/cpukit/score/src/threadqfirstpriority.c
@@ -39,7 +39,7 @@ Thread_Control *_Thread_queue_First_priority (
   Thread_queue_Control *the_thread_queue
 )
 {
-  unsigned32 index;
+  uint32_t   index;
 
   for( index=0 ;
        index < TASK_QUEUE_DATA_NUMBER_OF_PRIORITY_HEADERS ;
diff --git a/cpukit/score/src/threadqflush.c b/cpukit/score/src/threadqflush.c
index ca0c320320..e069bd89b9 100644
--- a/cpukit/score/src/threadqflush.c
+++ b/cpukit/score/src/threadqflush.c
@@ -38,7 +38,7 @@
 void _Thread_queue_Flush(
   Thread_queue_Control       *the_thread_queue,
   Thread_queue_Flush_callout  remote_extract_callout,
-  unsigned32                  status
+  uint32_t                    status
 )
 {
   Thread_Control *the_thread;
diff --git a/cpukit/score/src/threadreset.c b/cpukit/score/src/threadreset.c
index 38b4b868a8..85c07c318c 100644
--- a/cpukit/score/src/threadreset.c
+++ b/cpukit/score/src/threadreset.c
@@ -39,7 +39,7 @@
 void _Thread_Reset(
   Thread_Control      *the_thread,
   void                *pointer_argument,
-  unsigned32           numeric_argument
+  uint32_t             numeric_argument
 )
 {
   the_thread->resource_count   = 0;
diff --git a/cpukit/score/src/threadrestart.c b/cpukit/score/src/threadrestart.c
index 904633b389..167fa78563 100644
--- a/cpukit/score/src/threadrestart.c
+++ b/cpukit/score/src/threadrestart.c
@@ -39,7 +39,7 @@
 boolean _Thread_Restart(
   Thread_Control      *the_thread,
   void                *pointer_argument,
-  unsigned32           numeric_argument
+  uint32_t             numeric_argument
 )
 {
   if ( !_States_Is_dormant( the_thread->current_state ) ) {
diff --git a/cpukit/score/src/threadsettransient.c b/cpukit/score/src/threadsettransient.c
index d13e8c3a12..0147c3f578 100644
--- a/cpukit/score/src/threadsettransient.c
+++ b/cpukit/score/src/threadsettransient.c
@@ -49,7 +49,7 @@ void _Thread_Set_transient(
 )
 {
   ISR_Level             level;
-  unsigned32            old_state;
+  uint32_t              old_state;
   Chain_Control *ready;
 
   ready = the_thread->ready;
diff --git a/cpukit/score/src/threadstackallocate.c b/cpukit/score/src/threadstackallocate.c
index 05d4e91763..9df0bb0469 100644
--- a/cpukit/score/src/threadstackallocate.c
+++ b/cpukit/score/src/threadstackallocate.c
@@ -36,9 +36,9 @@
  *  Set the Start.stack field to the address of the stack
  */
 
-unsigned32 _Thread_Stack_Allocate(
+uint32_t   _Thread_Stack_Allocate(
   Thread_Control *the_thread,
-  unsigned32 stack_size
+  uint32_t   stack_size
 )
 {
   void *stack_addr = 0;
diff --git a/cpukit/score/src/threadstart.c b/cpukit/score/src/threadstart.c
index b54ca25d92..9f8c9edc63 100644
--- a/cpukit/score/src/threadstart.c
+++ b/cpukit/score/src/threadstart.c
@@ -41,7 +41,7 @@ boolean _Thread_Start(
   Thread_Start_types    the_prototype,
   void                 *entry_point,
   void                 *pointer_argument,
-  unsigned32            numeric_argument
+  uint32_t              numeric_argument
 )
 {
   if ( _States_Is_dormant( the_thread->current_state ) ) {
diff --git a/cpukit/score/src/userext.c b/cpukit/score/src/userext.c
index be69cf2774..c2cc79fd07 100644
--- a/cpukit/score/src/userext.c
+++ b/cpukit/score/src/userext.c
@@ -183,7 +183,7 @@ void _User_extensions_Thread_exitted (
 void _User_extensions_Fatal (
   Internal_errors_Source  the_source,
   boolean                 is_internal,
-  unsigned32              the_error
+  uint32_t                the_error
 )
 {
   Chain_Node              *the_node;
diff --git a/cpukit/score/src/watchdoginsert.c b/cpukit/score/src/watchdoginsert.c
index 4e921e28c8..4c01603235 100644
--- a/cpukit/score/src/watchdoginsert.c
+++ b/cpukit/score/src/watchdoginsert.c
@@ -31,7 +31,7 @@ void _Watchdog_Insert(
 {
   ISR_Level          level;
   Watchdog_Control  *after;
-  unsigned32         insert_isr_nest_level;
+  uint32_t           insert_isr_nest_level;
   Watchdog_Interval  delta_interval;
   
 
diff --git a/cpukit/score/src/wkspace.c b/cpukit/score/src/wkspace.c
index 1b13008b1c..b7a2f9a2fd 100644
--- a/cpukit/score/src/wkspace.c
+++ b/cpukit/score/src/wkspace.c
@@ -26,12 +26,12 @@
  
 void _Workspace_Handler_initialization(
   void       *starting_address,
-  unsigned32  size
+  uint32_t    size
 )
 {
-  unsigned32 *zero_out_array;
-  unsigned32  index;
-  unsigned32  memory_available;
+  uint32_t   *zero_out_array;
+  uint32_t    index;
+  uint32_t    memory_available;
  
   if ( !starting_address || !_Addresses_Is_aligned( starting_address ) )
     _Internal_error_Occurred(
@@ -41,8 +41,8 @@ void _Workspace_Handler_initialization(
     );
  
   if ( _CPU_Table.do_zero_of_workspace ) {
-    for( zero_out_array  = (unsigned32 *) starting_address, index = 0 ;
-         index < size / sizeof( unsigned32 ) ;
+    for( zero_out_array  = (uint32_t   *) starting_address, index = 0 ;
+         index < size / sizeof( uint32_t   ) ;
          index++ )
       zero_out_array[ index ] = 0;
   }
@@ -69,7 +69,7 @@ void _Workspace_Handler_initialization(
  */
 
 void *_Workspace_Allocate_or_fatal_error(
-  unsigned32   size
+  uint32_t     size
 )
 {
   void        *memory;