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

	* score/include/rtems/debug.h, score/include/rtems/score/bitfield.h,
	score/include/rtems/score/chain.h,
	score/include/rtems/score/coremsg.h,
	score/include/rtems/score/coremutex.h,
	score/include/rtems/score/coresem.h,
	score/include/rtems/score/heap.h,
	score/include/rtems/score/interr.h, score/include/rtems/score/isr.h,
	score/include/rtems/score/mpci.h, score/include/rtems/score/mppkt.h,
	score/include/rtems/score/object.h,
	score/include/rtems/score/objectmp.h,
	score/include/rtems/score/priority.h,
	score/include/rtems/score/stack.h,
	score/include/rtems/score/states.h,
	score/include/rtems/score/thread.h,
	score/include/rtems/score/threadmp.h,
	score/include/rtems/score/threadq.h,
	score/include/rtems/score/tod.h, score/include/rtems/score/tqdata.h,
	score/include/rtems/score/userext.h,
	score/include/rtems/score/watchdog.h,
	score/include/rtems/score/wkspace.h,
	score/inline/rtems/score/address.inl,
	score/inline/rtems/score/coremsg.inl,
	score/inline/rtems/score/coresem.inl,
	score/inline/rtems/score/heap.inl, score/inline/rtems/score/isr.inl,
	score/inline/rtems/score/object.inl,
	score/inline/rtems/score/priority.inl,
	score/inline/rtems/score/stack.inl,
	score/inline/rtems/score/thread.inl,
	score/inline/rtems/score/tqdata.inl,
	score/inline/rtems/score/userext.inl,
	score/inline/rtems/score/wkspace.inl,
	score/macros/rtems/score/address.inl,
	score/macros/rtems/score/heap.inl,
	score/macros/rtems/score/object.inl,
	score/macros/rtems/score/priority.inl,
	score/macros/rtems/score/userext.inl: Convert to using c99 fixed
	size types.

12 files changed, 50 insertions, 50 deletions

diff --git a/cpukit/score/inline/rtems/score/address.inl b/cpukit/score/inline/rtems/score/address.inl
index 40bc706ef3..28fa7f5c77 100644
--- a/cpukit/score/inline/rtems/score/address.inl
+++ b/cpukit/score/inline/rtems/score/address.inl
@@ -29,7 +29,7 @@
 
 RTEMS_INLINE_ROUTINE void *_Addresses_Add_offset (
   void       *base,
-  unsigned32  offset
+  uint32_t    offset
 )
 {
   return (void *)((char *)base + offset);
@@ -48,7 +48,7 @@ RTEMS_INLINE_ROUTINE void *_Addresses_Add_offset (
 
 RTEMS_INLINE_ROUTINE void *_Addresses_Subtract_offset (
   void       *base,
-  unsigned32  offset
+  uint32_t    offset
 )
 {
   return (void *)((char *)base - offset);
@@ -63,11 +63,11 @@ RTEMS_INLINE_ROUTINE void *_Addresses_Subtract_offset (
  *  This function is used to subtract two addresses.  It returns the
  *  resulting offset.
  *
- *  NOTE:  The cast of an address to an unsigned32 makes this code
+ *  NOTE:  The cast of an address to an uint32_t   makes this code
  *         dependent on an addresses being thirty two bits.
  */
 
-RTEMS_INLINE_ROUTINE unsigned32 _Addresses_Subtract (
+RTEMS_INLINE_ROUTINE uint32_t   _Addresses_Subtract (
   void *left,
   void *right
 )
@@ -95,7 +95,7 @@ RTEMS_INLINE_ROUTINE boolean _Addresses_Is_aligned (
 #elif defined(RTEMS_CPU_HAS_16_BIT_ADDRESSES)
     return ( ( (unsigned short)address % CPU_ALIGNMENT ) == 0 );
 #else
-    return ( ( (unsigned32)address % CPU_ALIGNMENT ) == 0 );
+    return ( ( (uint32_t  )address % CPU_ALIGNMENT ) == 0 );
 #endif
 }
 
diff --git a/cpukit/score/inline/rtems/score/coremsg.inl b/cpukit/score/inline/rtems/score/coremsg.inl
index 292ad2565d..7d152aec6b 100644
--- a/cpukit/score/inline/rtems/score/coremsg.inl
+++ b/cpukit/score/inline/rtems/score/coremsg.inl
@@ -30,7 +30,7 @@
 RTEMS_INLINE_ROUTINE CORE_message_queue_Status _CORE_message_queue_Send(
   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,
   boolean                                    wait,
@@ -65,7 +65,7 @@ RTEMS_INLINE_ROUTINE CORE_message_queue_Status _CORE_message_queue_Send(
 RTEMS_INLINE_ROUTINE CORE_message_queue_Status _CORE_message_queue_Urgent(
   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,
   boolean                                    wait,
@@ -101,7 +101,7 @@ RTEMS_INLINE_ROUTINE CORE_message_queue_Status _CORE_message_queue_Urgent(
 RTEMS_INLINE_ROUTINE void _CORE_message_queue_Copy_buffer (
   void      *source,
   void      *destination,
-  unsigned32 size
+  uint32_t   size
 )
 {
   memcpy(destination, source, size);
diff --git a/cpukit/score/inline/rtems/score/coresem.inl b/cpukit/score/inline/rtems/score/coresem.inl
index d5ae50f29b..4c39764e23 100644
--- a/cpukit/score/inline/rtems/score/coresem.inl
+++ b/cpukit/score/inline/rtems/score/coresem.inl
@@ -45,7 +45,7 @@ RTEMS_INLINE_ROUTINE boolean _CORE_semaphore_Is_priority(
  *  This routine returns the current count associated with the semaphore.
  */
  
-RTEMS_INLINE_ROUTINE unsigned32 _CORE_semaphore_Get_count(
+RTEMS_INLINE_ROUTINE uint32_t   _CORE_semaphore_Get_count(
   CORE_semaphore_Control  *the_semaphore
 )
 {
diff --git a/cpukit/score/inline/rtems/score/heap.inl b/cpukit/score/inline/rtems/score/heap.inl
index 9fafdbdea4..ae41cf6244 100644
--- a/cpukit/score/inline/rtems/score/heap.inl
+++ b/cpukit/score/inline/rtems/score/heap.inl
@@ -104,7 +104,7 @@ RTEMS_INLINE_ROUTINE Heap_Block *_Heap_Next_block (
 
 RTEMS_INLINE_ROUTINE Heap_Block *_Heap_Block_at(
   void       *base,
-  unsigned32  offset
+  uint32_t    offset
 )
 {
   return (Heap_Block *) _Addresses_Add_offset( (void *)base, offset );
@@ -123,9 +123,9 @@ RTEMS_INLINE_ROUTINE Heap_Block *_Heap_User_block_at(
   void       *base
 )
 {
-  unsigned32         offset;
+  uint32_t           offset;
  
-  offset = *(((unsigned32 *) base) - 1);
+  offset = *(((uint32_t   *) base) - 1);
   return _Heap_Block_at( base, -offset + -HEAP_BLOCK_USED_OVERHEAD);
 }
 
@@ -188,7 +188,7 @@ RTEMS_INLINE_ROUTINE boolean _Heap_Is_block_used (
  *  This function returns the size of the_block in bytes.
  */
 
-RTEMS_INLINE_ROUTINE unsigned32 _Heap_Block_size (
+RTEMS_INLINE_ROUTINE uint32_t   _Heap_Block_size (
   Heap_Block *the_block
 )
 {
@@ -243,7 +243,7 @@ RTEMS_INLINE_ROUTINE boolean _Heap_Is_block_in (
  */
 
 RTEMS_INLINE_ROUTINE boolean _Heap_Is_page_size_valid(
-  unsigned32 page_size
+  uint32_t   page_size
 )
 {
   return ((page_size != 0) &&
@@ -261,9 +261,9 @@ RTEMS_INLINE_ROUTINE boolean _Heap_Is_page_size_valid(
  *  heap block.
  */
 
-RTEMS_INLINE_ROUTINE unsigned32 _Heap_Build_flag (
-  unsigned32 size,
-  unsigned32 in_use_flag
+RTEMS_INLINE_ROUTINE uint32_t   _Heap_Build_flag (
+  uint32_t   size,
+  uint32_t   in_use_flag
 )
 {
   return  size | in_use_flag;
diff --git a/cpukit/score/inline/rtems/score/isr.inl b/cpukit/score/inline/rtems/score/isr.inl
index 48037a8244..637098b297 100644
--- a/cpukit/score/inline/rtems/score/isr.inl
+++ b/cpukit/score/inline/rtems/score/isr.inl
@@ -27,7 +27,7 @@
  */
 
 RTEMS_INLINE_ROUTINE boolean _ISR_Is_vector_number_valid (
-  unsigned32 vector
+  uint32_t   vector
 )
 {
   return ( vector <= CPU_INTERRUPT_MAXIMUM_VECTOR_NUMBER );
diff --git a/cpukit/score/inline/rtems/score/object.inl b/cpukit/score/inline/rtems/score/object.inl
index 0d86f70117..fa2c0478e5 100644
--- a/cpukit/score/inline/rtems/score/object.inl
+++ b/cpukit/score/inline/rtems/score/object.inl
@@ -28,9 +28,9 @@
 
 RTEMS_INLINE_ROUTINE Objects_Id _Objects_Build_id(
   Objects_APIs     the_api,
-  unsigned32       the_class,
-  unsigned32       node,
-  unsigned32       index
+  uint32_t         the_class,
+  uint32_t         node,
+  uint32_t         index
 )
 {
   return (( (Objects_Id) the_api )   << OBJECTS_API_START_BIT)   |
@@ -64,11 +64,11 @@ RTEMS_INLINE_ROUTINE Objects_APIs _Objects_Get_API(
  *  This function returns the class portion of the ID.
  */
  
-RTEMS_INLINE_ROUTINE unsigned32 _Objects_Get_class(
+RTEMS_INLINE_ROUTINE uint32_t   _Objects_Get_class(
   Objects_Id id
 )
 {
-  return (unsigned32) 
+  return (uint32_t  ) 
     ((id >> OBJECTS_CLASS_START_BIT) & OBJECTS_CLASS_VALID_BITS);
 }
  
@@ -81,7 +81,7 @@ RTEMS_INLINE_ROUTINE unsigned32 _Objects_Get_class(
  *  This function returns the node portion of the ID.
  */
 
-RTEMS_INLINE_ROUTINE unsigned32 _Objects_Get_node(
+RTEMS_INLINE_ROUTINE uint32_t   _Objects_Get_node(
   Objects_Id id
 )
 {
@@ -97,7 +97,7 @@ RTEMS_INLINE_ROUTINE unsigned32 _Objects_Get_node(
  *  This function returns the index portion of the ID.
  */
 
-RTEMS_INLINE_ROUTINE unsigned32 _Objects_Get_index(
+RTEMS_INLINE_ROUTINE uint32_t   _Objects_Get_index(
   Objects_Id id
 )
 {
@@ -114,7 +114,7 @@ RTEMS_INLINE_ROUTINE unsigned32 _Objects_Get_index(
  */
  
 RTEMS_INLINE_ROUTINE boolean _Objects_Is_class_valid(
-  unsigned32 the_class
+  uint32_t   the_class
 )
 {
   /* XXX how do we determine this now? */
@@ -132,7 +132,7 @@ RTEMS_INLINE_ROUTINE boolean _Objects_Is_class_valid(
  */
 
 RTEMS_INLINE_ROUTINE boolean _Objects_Is_local_node(
-  unsigned32 node
+  uint32_t   node
 )
 {
   return ( node == _Objects_Local_node );
@@ -185,7 +185,7 @@ RTEMS_INLINE_ROUTINE boolean _Objects_Are_ids_equal(
 
 RTEMS_INLINE_ROUTINE Objects_Control *_Objects_Get_local_object(
   Objects_Information *information,
-  unsigned32           index
+  uint32_t             index
 )
 {
   if ( index > information->maximum )
@@ -205,7 +205,7 @@ RTEMS_INLINE_ROUTINE Objects_Control *_Objects_Get_local_object(
 
 RTEMS_INLINE_ROUTINE void _Objects_Set_local_object(
   Objects_Information *information,
-  unsigned32           index,
+  uint32_t             index,
   Objects_Control     *the_object
 )
 {
@@ -229,7 +229,7 @@ RTEMS_INLINE_ROUTINE Objects_Information *_Objects_Get_information(
 )
 {
   Objects_APIs  the_api;
-  unsigned32    the_class;
+  uint32_t      the_class;
 
 
   the_class = _Objects_Get_class( id );
@@ -257,7 +257,7 @@ RTEMS_INLINE_ROUTINE void _Objects_Open(
   Objects_Name         name
 )
 {
-  unsigned32  index;
+  uint32_t    index;
 
   index = _Objects_Get_index( the_object->id );
   _Objects_Set_local_object( information, index, the_object );
@@ -285,7 +285,7 @@ RTEMS_INLINE_ROUTINE void _Objects_Close(
   Objects_Control      *the_object
 )
 {
-  unsigned32 index;
+  uint32_t   index;
 
   index = _Objects_Get_index( the_object->id );
   _Objects_Set_local_object( information, index, NULL );
diff --git a/cpukit/score/inline/rtems/score/priority.inl b/cpukit/score/inline/rtems/score/priority.inl
index 71673d8023..ef7e366213 100644
--- a/cpukit/score/inline/rtems/score/priority.inl
+++ b/cpukit/score/inline/rtems/score/priority.inl
@@ -29,7 +29,7 @@
 
 RTEMS_INLINE_ROUTINE void _Priority_Handler_initialization( void )
 {
-  unsigned32 index;
+  uint32_t   index;
 
   _Priority_Major_bit_map = 0;
   for ( index=0 ; index <16 ; index++ )
@@ -67,7 +67,7 @@ RTEMS_INLINE_ROUTINE boolean _Priority_Is_valid (
  *  This function returns the major portion of the_priority.
  */
 
-RTEMS_INLINE_ROUTINE unsigned32 _Priority_Major (
+RTEMS_INLINE_ROUTINE uint32_t   _Priority_Major (
   Priority_Control the_priority
 )
 {
@@ -83,7 +83,7 @@ RTEMS_INLINE_ROUTINE unsigned32 _Priority_Major (
  *  This function returns the minor portion of the_priority.
  */
 
-RTEMS_INLINE_ROUTINE unsigned32 _Priority_Minor (
+RTEMS_INLINE_ROUTINE uint32_t   _Priority_Minor (
   Priority_Control the_priority
 )
 {
@@ -102,8 +102,8 @@ RTEMS_INLINE_ROUTINE unsigned32 _Priority_Minor (
  *  number passed to it.
  */
  
-RTEMS_INLINE_ROUTINE unsigned32 _Priority_Mask (
-  unsigned32 bit_number
+RTEMS_INLINE_ROUTINE uint32_t   _Priority_Mask (
+  uint32_t   bit_number
 )
 {
   return (0x8000 >> bit_number);
@@ -121,8 +121,8 @@ RTEMS_INLINE_ROUTINE unsigned32 _Priority_Mask (
  *  a major or minor component of a priority.
  */
  
-RTEMS_INLINE_ROUTINE unsigned32 _Priority_Bits_index (
-  unsigned32 bit_number
+RTEMS_INLINE_ROUTINE uint32_t   _Priority_Bits_index (
+  uint32_t   bit_number
 )
 {
   return bit_number;
diff --git a/cpukit/score/inline/rtems/score/stack.inl b/cpukit/score/inline/rtems/score/stack.inl
index 1a2f659f77..5bfd3c1622 100644
--- a/cpukit/score/inline/rtems/score/stack.inl
+++ b/cpukit/score/inline/rtems/score/stack.inl
@@ -30,7 +30,7 @@
 RTEMS_INLINE_ROUTINE void _Stack_Initialize (
   Stack_Control *the_stack,
   void          *starting_address,
-  unsigned32     size
+  uint32_t       size
 )
 {
   the_stack->area = starting_address;
@@ -48,7 +48,7 @@ RTEMS_INLINE_ROUTINE void _Stack_Initialize (
  */
 
 RTEMS_INLINE_ROUTINE boolean _Stack_Is_enough (
-  unsigned32 size
+  uint32_t   size
 )
 {
   return ( size >= STACK_MINIMUM_SIZE );
@@ -69,8 +69,8 @@ RTEMS_INLINE_ROUTINE boolean _Stack_Is_enough (
  *  The amount of adjustment for alignment is CPU dependent.
  */
 
-RTEMS_INLINE_ROUTINE unsigned32 _Stack_Adjust_size (
-  unsigned32 size
+RTEMS_INLINE_ROUTINE uint32_t   _Stack_Adjust_size (
+  uint32_t   size
 )
 {
   return size + CPU_STACK_ALIGNMENT;
diff --git a/cpukit/score/inline/rtems/score/thread.inl b/cpukit/score/inline/rtems/score/thread.inl
index 1154c061d2..e4f113f70c 100644
--- a/cpukit/score/inline/rtems/score/thread.inl
+++ b/cpukit/score/inline/rtems/score/thread.inl
@@ -309,8 +309,8 @@ RTEMS_INLINE_ROUTINE 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;
  
@@ -357,7 +357,7 @@ done:
  */
 
 RTEMS_INLINE_ROUTINE boolean _Thread_Is_proxy_blocking (
-  unsigned32 code
+  uint32_t   code
 )
 {
   return (code == THREAD_STATUS_PROXY_BLOCKING);
diff --git a/cpukit/score/inline/rtems/score/tqdata.inl b/cpukit/score/inline/rtems/score/tqdata.inl
index 236a20b139..aff81708b8 100644
--- a/cpukit/score/inline/rtems/score/tqdata.inl
+++ b/cpukit/score/inline/rtems/score/tqdata.inl
@@ -26,7 +26,7 @@
  *  a thread of the_priority should be placed.
  */
 
-RTEMS_INLINE_ROUTINE unsigned32 _Thread_queue_Header_number (
+RTEMS_INLINE_ROUTINE uint32_t   _Thread_queue_Header_number (
   Priority_Control the_priority
 )
 {
diff --git a/cpukit/score/inline/rtems/score/userext.inl b/cpukit/score/inline/rtems/score/userext.inl
index d18a890f13..2aef8001ff 100644
--- a/cpukit/score/inline/rtems/score/userext.inl
+++ b/cpukit/score/inline/rtems/score/userext.inl
@@ -59,12 +59,12 @@ RTEMS_INLINE_ROUTINE void _User_extensions_Add_set (
  */
 
 RTEMS_INLINE_ROUTINE void _User_extensions_Handler_initialization (
-    unsigned32              number_of_extensions,
+    uint32_t                number_of_extensions,
     User_extensions_Table  *initial_extensions
 )
 {
   User_extensions_Control *extension;
-  unsigned32               i;
+  uint32_t                 i;
 
   _Chain_Initialize_empty( &_User_extensions_List );
   _Chain_Initialize_empty( &_User_extensions_Switches_list );
diff --git a/cpukit/score/inline/rtems/score/wkspace.inl b/cpukit/score/inline/rtems/score/wkspace.inl
index fb9fddfc65..baa6297220 100644
--- a/cpukit/score/inline/rtems/score/wkspace.inl
+++ b/cpukit/score/inline/rtems/score/wkspace.inl
@@ -28,7 +28,7 @@
  */
 
 RTEMS_INLINE_ROUTINE void *_Workspace_Allocate(
-  unsigned32 size
+  uint32_t   size
 )
 {
    return _Heap_Allocate( &_Workspace_Area, size );