From d6154c70dc048e21aae907fd053a1e7a1d155408 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 29 Mar 2004 16:41:13 +0000 Subject: 2004-03-29 Ralf Corsepius * 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. --- cpukit/ChangeLog | 40 ++++++++++++++++++ cpukit/score/include/rtems/debug.h | 2 +- cpukit/score/include/rtems/score/bitfield.h | 2 +- cpukit/score/include/rtems/score/chain.h | 4 +- cpukit/score/include/rtems/score/coremsg.h | 30 +++++++------- cpukit/score/include/rtems/score/coremutex.h | 10 ++--- cpukit/score/include/rtems/score/coresem.h | 8 ++-- cpukit/score/include/rtems/score/heap.h | 32 +++++++------- cpukit/score/include/rtems/score/interr.h | 4 +- cpukit/score/include/rtems/score/isr.h | 6 +-- cpukit/score/include/rtems/score/mpci.h | 22 +++++----- cpukit/score/include/rtems/score/mppkt.h | 12 +++--- cpukit/score/include/rtems/score/object.h | 52 +++++++++++------------ cpukit/score/include/rtems/score/objectmp.h | 16 +++---- cpukit/score/include/rtems/score/priority.h | 2 +- cpukit/score/include/rtems/score/stack.h | 2 +- cpukit/score/include/rtems/score/states.h | 2 +- cpukit/score/include/rtems/score/thread.h | 62 ++++++++++++++-------------- cpukit/score/include/rtems/score/threadmp.h | 2 +- cpukit/score/include/rtems/score/threadq.h | 4 +- cpukit/score/include/rtems/score/tod.h | 52 +++++++++++------------ cpukit/score/include/rtems/score/tqdata.h | 2 +- cpukit/score/include/rtems/score/userext.h | 4 +- cpukit/score/include/rtems/score/watchdog.h | 6 +-- cpukit/score/include/rtems/score/wkspace.h | 4 +- cpukit/score/inline/rtems/score/address.inl | 10 ++--- cpukit/score/inline/rtems/score/coremsg.inl | 6 +-- cpukit/score/inline/rtems/score/coresem.inl | 2 +- cpukit/score/inline/rtems/score/heap.inl | 16 +++---- cpukit/score/inline/rtems/score/isr.inl | 2 +- cpukit/score/inline/rtems/score/object.inl | 28 ++++++------- cpukit/score/inline/rtems/score/priority.inl | 14 +++---- cpukit/score/inline/rtems/score/stack.inl | 8 ++-- cpukit/score/inline/rtems/score/thread.inl | 6 +-- cpukit/score/inline/rtems/score/tqdata.inl | 2 +- cpukit/score/inline/rtems/score/userext.inl | 4 +- cpukit/score/inline/rtems/score/wkspace.inl | 2 +- cpukit/score/macros/rtems/score/address.inl | 4 +- cpukit/score/macros/rtems/score/heap.inl | 2 +- cpukit/score/macros/rtems/score/object.inl | 6 +-- cpukit/score/macros/rtems/score/priority.inl | 2 +- cpukit/score/macros/rtems/score/userext.inl | 2 +- 42 files changed, 269 insertions(+), 229 deletions(-) (limited to 'cpukit') diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index f5e85183be..d6564a14f5 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,43 @@ +2004-03-29 Ralf Corsepius + + * 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. + 2004-03-29 Ralf Corsepius * sapi/include/confdefs.h, sapi/include/rtems/config.h, diff --git a/cpukit/score/include/rtems/debug.h b/cpukit/score/include/rtems/debug.h index 1229c05a2a..4a4def3d8b 100644 --- a/cpukit/score/include/rtems/debug.h +++ b/cpukit/score/include/rtems/debug.h @@ -26,7 +26,7 @@ extern "C" { * The following type is used to manage the debug mask. */ -typedef unsigned32 rtems_debug_control; +typedef uint32_t rtems_debug_control; /* * These constants represent various classes of debugging. diff --git a/cpukit/score/include/rtems/score/bitfield.h b/cpukit/score/include/rtems/score/bitfield.h index 32a4e85e80..a30e691a74 100644 --- a/cpukit/score/include/rtems/score/bitfield.h +++ b/cpukit/score/include/rtems/score/bitfield.h @@ -78,7 +78,7 @@ const unsigned char __log2table[256] = { #define _Bitfield_Find_first_bit( _value, _bit_number ) \ { \ - register unsigned32 __value = (unsigned32) (_value); \ + register uint32_t __value = (uint32_t ) (_value); \ register const unsigned char *__p = __log2table; \ \ if ( __value < 0x100 ) \ diff --git a/cpukit/score/include/rtems/score/chain.h b/cpukit/score/include/rtems/score/chain.h index 7f74a692ee..28d4f4f474 100644 --- a/cpukit/score/include/rtems/score/chain.h +++ b/cpukit/score/include/rtems/score/chain.h @@ -78,8 +78,8 @@ typedef struct { void _Chain_Initialize( Chain_Control *the_chain, void *starting_address, - unsigned32 number_nodes, - unsigned32 node_size + uint32_t number_nodes, + uint32_t node_size ); /* diff --git a/cpukit/score/include/rtems/score/coremsg.h b/cpukit/score/include/rtems/score/coremsg.h index 9b1d3025d2..b1a65ba7b1 100644 --- a/cpukit/score/include/rtems/score/coremsg.h +++ b/cpukit/score/include/rtems/score/coremsg.h @@ -40,13 +40,13 @@ typedef void ( *CORE_message_queue_API_mp_support_callout )( * The following defines the data types needed to manipulate * the contents of message buffers. * - * NOTE: The buffer field is normally longer than a single unsigned32. + * NOTE: The buffer field is normally longer than a single uint32_t . * but since messages are variable length we just make a ptr to 1. */ typedef struct { - unsigned32 size; - unsigned32 buffer[1]; + uint32_t size; + uint32_t buffer[1]; } CORE_message_queue_Buffer; /* @@ -124,9 +124,9 @@ typedef void (*CORE_message_queue_Notify_Handler)( void * ); typedef struct { Thread_queue_Control Wait_queue; CORE_message_queue_Attributes Attributes; - unsigned32 maximum_pending_messages; - unsigned32 number_of_pending_messages; - unsigned32 maximum_message_size; + uint32_t maximum_pending_messages; + uint32_t number_of_pending_messages; + uint32_t maximum_message_size; Chain_Control Pending_messages; CORE_message_queue_Buffer *message_buffers; CORE_message_queue_Notify_Handler notify_handler; @@ -145,8 +145,8 @@ typedef struct { 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 ); /* @@ -161,7 +161,7 @@ boolean _CORE_message_queue_Initialize( void _CORE_message_queue_Close( CORE_message_queue_Control *the_message_queue, Thread_queue_Flush_callout remote_extract_callout, - unsigned32 status + uint32_t status ); /* @@ -174,7 +174,7 @@ void _CORE_message_queue_Close( * */ -unsigned32 _CORE_message_queue_Flush( +uint32_t _CORE_message_queue_Flush( CORE_message_queue_Control *the_message_queue ); @@ -187,7 +187,7 @@ unsigned32 _CORE_message_queue_Flush( * them to the inactive message chain. */ -unsigned32 _CORE_message_queue_Flush_support( +uint32_t _CORE_message_queue_Flush_support( CORE_message_queue_Control *the_message_queue ); @@ -218,10 +218,10 @@ void _CORE_message_queue_Flush_waiting_threads( 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 ); /* @@ -241,7 +241,7 @@ CORE_message_queue_Status _CORE_message_queue_Broadcast( 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, @@ -266,7 +266,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 ); diff --git a/cpukit/score/include/rtems/score/coremutex.h b/cpukit/score/include/rtems/score/coremutex.h index 1b3a570aca..db82a4218e 100644 --- a/cpukit/score/include/rtems/score/coremutex.h +++ b/cpukit/score/include/rtems/score/coremutex.h @@ -119,9 +119,9 @@ typedef struct { typedef struct { Thread_queue_Control Wait_queue; CORE_mutex_Attributes Attributes; - unsigned32 lock; - unsigned32 nest_count; - unsigned32 blocked_count; + uint32_t lock; + uint32_t nest_count; + uint32_t blocked_count; Thread_Control *holder; Objects_Id holder_id; } CORE_mutex_Control; @@ -137,7 +137,7 @@ typedef struct { void _CORE_mutex_Initialize( CORE_mutex_Control *the_mutex, CORE_mutex_Attributes *the_mutex_attributes, - unsigned32 initial_lock + uint32_t initial_lock ); /* @@ -222,7 +222,7 @@ CORE_mutex_Status _CORE_mutex_Surrender( void _CORE_mutex_Flush( CORE_mutex_Control *the_mutex, Thread_queue_Flush_callout remote_extract_callout, - unsigned32 status + uint32_t status ); #include diff --git a/cpukit/score/include/rtems/score/coresem.h b/cpukit/score/include/rtems/score/coresem.h index 74fc2ceb5e..59cb7b148c 100644 --- a/cpukit/score/include/rtems/score/coresem.h +++ b/cpukit/score/include/rtems/score/coresem.h @@ -64,7 +64,7 @@ typedef enum { */ typedef struct { - unsigned32 maximum_count; + uint32_t maximum_count; CORE_semaphore_Disciplines discipline; } CORE_semaphore_Attributes; @@ -76,7 +76,7 @@ typedef struct { typedef struct { Thread_queue_Control Wait_queue; CORE_semaphore_Attributes Attributes; - unsigned32 count; + uint32_t count; } CORE_semaphore_Control; /* @@ -90,7 +90,7 @@ typedef struct { void _CORE_semaphore_Initialize( CORE_semaphore_Control *the_semaphore, CORE_semaphore_Attributes *the_semaphore_attributes, - unsigned32 initial_value + uint32_t initial_value ); /* @@ -139,7 +139,7 @@ CORE_semaphore_Status _CORE_semaphore_Surrender( void _CORE_semaphore_Flush( CORE_semaphore_Control *the_semaphore, Thread_queue_Flush_callout remote_extract_callout, - unsigned32 status + uint32_t status ); #ifndef __RTEMS_APPLICATION__ diff --git a/cpukit/score/include/rtems/score/heap.h b/cpukit/score/include/rtems/score/heap.h index a0d477ed25..20231b31ad 100644 --- a/cpukit/score/include/rtems/score/heap.h +++ b/cpukit/score/include/rtems/score/heap.h @@ -50,10 +50,10 @@ typedef enum { */ typedef struct { - unsigned32 free_blocks; - unsigned32 free_size; - unsigned32 used_blocks; - unsigned32 used_size; + uint32_t free_blocks; + uint32_t free_size; + uint32_t used_blocks; + uint32_t used_size; } Heap_Information_block; /* @@ -82,7 +82,7 @@ typedef struct { */ #define HEAP_OVERHEAD \ - (sizeof( unsigned32 ) * 2) /* size dummy first and last blocks */ + (sizeof( uint32_t ) * 2) /* size dummy first and last blocks */ #define HEAP_BLOCK_USED_OVERHEAD \ (sizeof( void * ) * 2) /* num bytes overhead in used block */ #define HEAP_MINIMUM_SIZE \ @@ -107,8 +107,8 @@ typedef struct { typedef struct Heap_Block_struct Heap_Block; struct Heap_Block_struct { - unsigned32 back_flag; /* size and status of prev block */ - unsigned32 front_flag; /* size and status of block */ + uint32_t back_flag; /* size and status of prev block */ + uint32_t front_flag; /* size and status of block */ Heap_Block *next; /* pointer to next block */ Heap_Block *previous; /* pointer to previous block */ }; @@ -134,8 +134,8 @@ typedef struct { Heap_Block *first; /* pointer to first block in heap */ Heap_Block *permanent_null; /* always NULL pointer */ Heap_Block *last; /* pointer to last block in heap */ - unsigned32 page_size; /* allocation unit */ - unsigned32 reserved; + uint32_t page_size; /* allocation unit */ + uint32_t reserved; } Heap_Control; /* @@ -149,11 +149,11 @@ typedef struct { * page_size byte units. */ -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 ); /* @@ -168,8 +168,8 @@ unsigned32 _Heap_Initialize( Heap_Extend_status _Heap_Extend( Heap_Control *the_heap, void *starting_address, - unsigned32 size, - unsigned32 *amount_extended + uint32_t size, + uint32_t *amount_extended ); /* @@ -186,7 +186,7 @@ Heap_Extend_status _Heap_Extend( void *_Heap_Allocate( Heap_Control *the_heap, - unsigned32 size + uint32_t size ); /* @@ -202,7 +202,7 @@ void *_Heap_Allocate( boolean _Heap_Size_of_user_area( Heap_Control *the_heap, void *starting_address, - unsigned32 *size + uint32_t *size ); /* diff --git a/cpukit/score/include/rtems/score/interr.h b/cpukit/score/include/rtems/score/interr.h index 71fa561d3b..63a0c02b4c 100644 --- a/cpukit/score/include/rtems/score/interr.h +++ b/cpukit/score/include/rtems/score/interr.h @@ -64,7 +64,7 @@ typedef enum { typedef struct { Internal_errors_Source the_source; boolean is_internal; - unsigned32 the_error; + uint32_t the_error; } Internal_errors_Information; /* @@ -85,7 +85,7 @@ SCORE_EXTERN Internal_errors_Information Internal_errors_What_happened; void volatile _Internal_error_Occurred( Internal_errors_Source the_source, boolean is_internal, - unsigned32 the_error + uint32_t the_error ); #ifdef __cplusplus diff --git a/cpukit/score/include/rtems/score/isr.h b/cpukit/score/include/rtems/score/isr.h index 2e46117294..14e0edd7f1 100644 --- a/cpukit/score/include/rtems/score/isr.h +++ b/cpukit/score/include/rtems/score/isr.h @@ -27,13 +27,13 @@ extern "C" { * the interrupt level portion of the status register. */ -typedef unsigned32 ISR_Level; +typedef uint32_t ISR_Level; /* * The following type defines the type used to manage the vectors. */ -typedef unsigned32 ISR_Vector_number; +typedef uint32_t ISR_Vector_number; /* * Return type for ISR Handler @@ -81,7 +81,7 @@ SCORE_EXTERN boolean _ISR_Signals_to_thread_executing; * When this variable is zero, a thread is executing. */ -SCORE_EXTERN volatile unsigned32 _ISR_Nest_level; +SCORE_EXTERN volatile uint32_t _ISR_Nest_level; /* * The following declares the Vector Table. Application diff --git a/cpukit/score/include/rtems/score/mpci.h b/cpukit/score/include/rtems/score/mpci.h index aae0faebad..dae9345076 100644 --- a/cpukit/score/include/rtems/score/mpci.h +++ b/cpukit/score/include/rtems/score/mpci.h @@ -76,7 +76,7 @@ typedef MPCI_Entry ( *MPCI_return_packet_entry )( ); typedef MPCI_Entry ( *MPCI_send_entry )( - unsigned32, + uint32_t , MP_packet_Prefix * ); @@ -85,8 +85,8 @@ typedef MPCI_Entry ( *MPCI_receive_entry )( ); typedef struct { - unsigned32 default_timeout; /* in ticks */ - unsigned32 maximum_packet_size; + uint32_t default_timeout; /* in ticks */ + uint32_t maximum_packet_size; MPCI_initialization_entry initialization; MPCI_get_packet_entry get_packet; MPCI_return_packet_entry return_packet; @@ -118,8 +118,8 @@ typedef enum { typedef struct { MP_packet_Prefix Prefix; MPCI_Internal_Remote_operations operation; - unsigned32 maximum_nodes; - unsigned32 maximum_global_objects; + uint32_t maximum_nodes; + uint32_t maximum_global_objects; } MPCI_Internal_packet; /* @@ -165,7 +165,7 @@ SCORE_EXTERN MPCI_Packet_processor void _MPCI_Handler_initialization( MPCI_Control *users_mpci_table, - unsigned32 timeout_status + uint32_t timeout_status ); /* @@ -238,7 +238,7 @@ void _MPCI_Return_packet ( */ void _MPCI_Send_process_packet ( - unsigned32 destination, + uint32_t destination, MP_packet_Prefix *the_packet ); @@ -251,8 +251,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 ); @@ -267,7 +267,7 @@ unsigned32 _MPCI_Send_request_packet ( */ void _MPCI_Send_response_packet ( - unsigned32 destination, + uint32_t destination, MP_packet_Prefix *the_packet ); @@ -302,7 +302,7 @@ Thread_Control *_MPCI_Process_response ( */ Thread _MPCI_Receive_server( - unsigned32 ignored + uint32_t ignored ); /*PAGE diff --git a/cpukit/score/include/rtems/score/mppkt.h b/cpukit/score/include/rtems/score/mppkt.h index 628406bf7f..b4cff19342 100644 --- a/cpukit/score/include/rtems/score/mppkt.h +++ b/cpukit/score/include/rtems/score/mppkt.h @@ -65,9 +65,9 @@ typedef struct { Objects_Id id; Objects_Id source_tid; Priority_Control source_priority; - unsigned32 return_code; - unsigned32 length; - unsigned32 to_convert; + uint32_t return_code; + uint32_t length; + uint32_t to_convert; Watchdog_Interval timeout; } MP_packet_Prefix; @@ -78,15 +78,15 @@ typedef struct { #define MP_PACKET_MINIMUM_PACKET_SIZE 64 /* - * 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. */ #define MP_PACKET_MINIMUN_HETERO_CONVERSION \ - ( sizeof( MP_packet_Prefix ) / sizeof( unsigned32 ) ) + ( sizeof( MP_packet_Prefix ) / sizeof( uint32_t ) ) #ifndef __RTEMS_APPLICATION__ #include diff --git a/cpukit/score/include/rtems/score/object.h b/cpukit/score/include/rtems/score/object.h index 4954651ec8..1ecd7ae9b9 100644 --- a/cpukit/score/include/rtems/score/object.h +++ b/cpukit/score/include/rtems/score/object.h @@ -45,7 +45,7 @@ typedef void * Objects_Name; * NOTE: Must be a power of 2. Matches the name manipulation routines. */ -#define OBJECTS_NAME_ALIGNMENT sizeof( unsigned32 ) +#define OBJECTS_NAME_ALIGNMENT sizeof( uint32_t ) /* * Functions which compare names are prototyped like this. @@ -54,7 +54,7 @@ typedef void * Objects_Name; typedef boolean (*Objects_Name_comparators)( void * /* name_1 */, void * /* name_2 */, - unsigned32 /* length */ + uint32_t /* length */ ); /* @@ -67,7 +67,7 @@ typedef boolean (*Objects_Name_comparators)( * Bits 27 .. 31 = class (up to 31 object types per API) */ -typedef unsigned32 Objects_Id; +typedef uint32_t Objects_Id; #define OBJECTS_INDEX_START_BIT 0 #define OBJECTS_NODE_START_BIT 16 @@ -190,21 +190,21 @@ typedef struct { typedef struct { Objects_APIs the_api; /* API of this object */ - unsigned32 the_class; /* class of this object */ + uint32_t the_class; /* class of this object */ Objects_Id minimum_id; /* minimum valid id of this type */ Objects_Id maximum_id; /* maximum valid id of this type */ - unsigned32 maximum; /* maximum number of objects */ + uint32_t maximum; /* maximum number of objects */ boolean auto_extend; /* TRUE if unlimited objects */ - unsigned32 allocation_size; /* number of objects in a block */ - unsigned32 size; /* size of the objects */ + uint32_t allocation_size; /* number of objects in a block */ + uint32_t size; /* size of the objects */ Objects_Control **local_table; Objects_Name *name_table; Chain_Control Inactive; /* chain of inactive ctl blocks */ - unsigned32 inactive; /* number of objects on the InActive list */ - unsigned32 *inactive_per_block; /* used to release a block */ + uint32_t inactive; /* number of objects on the InActive list */ + uint32_t *inactive_per_block; /* used to release a block */ void **object_blocks; /* the object memory to remove */ boolean is_string; /* TRUE if names are strings */ - unsigned32 name_length; /* maximum length of names */ + uint32_t name_length; /* maximum length of names */ Objects_Thread_queue_Extract_callout *extract; #if defined(RTEMS_MULTIPROCESSING) Chain_Control *global_table; /* pointer to global table */ @@ -216,8 +216,8 @@ typedef struct { * node number of the local node. */ -SCORE_EXTERN unsigned32 _Objects_Local_node; -SCORE_EXTERN unsigned32 _Objects_Maximum_nodes; +SCORE_EXTERN uint32_t _Objects_Local_node; +SCORE_EXTERN uint32_t _Objects_Maximum_nodes; /* * The following is the list of information blocks per API for each object @@ -267,9 +267,9 @@ SCORE_EXTERN Objects_Information */ 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 ); /* @@ -313,11 +313,11 @@ void _Objects_Shrink_information( 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, @@ -351,8 +351,8 @@ Objects_Control *_Objects_Allocate( Objects_Control *_Objects_Allocate_by_index( Objects_Information *information, - unsigned32 index, - unsigned32 sizeof_control + uint32_t index, + uint32_t sizeof_control ); /*PAGE @@ -380,7 +380,7 @@ void _Objects_Free( void _Objects_Clear_name( void *name, - unsigned32 length + uint32_t length ); /* @@ -407,7 +407,7 @@ void _Objects_Copy_name_string( void _Objects_Copy_name_raw( void *source, void *destination, - unsigned32 length + uint32_t length ); /* @@ -421,7 +421,7 @@ void _Objects_Copy_name_raw( boolean _Objects_Compare_name_string( void *name_1, void *name_2, - unsigned32 length + uint32_t length ); /* @@ -435,7 +435,7 @@ boolean _Objects_Compare_name_string( boolean _Objects_Compare_name_raw( void *name_1, void *name_2, - unsigned32 length + uint32_t length ); /* @@ -467,7 +467,7 @@ typedef enum { Objects_Name_or_id_lookup_errors _Objects_Name_to_id( Objects_Information *information, Objects_Name name, - unsigned32 node, + uint32_t node, Objects_Id *id ); diff --git a/cpukit/score/include/rtems/score/objectmp.h b/cpukit/score/include/rtems/score/objectmp.h index d40a109214..4d6cfdaaa6 100644 --- a/cpukit/score/include/rtems/score/objectmp.h +++ b/cpukit/score/include/rtems/score/objectmp.h @@ -27,7 +27,7 @@ extern "C" { typedef struct { Objects_Control Object; - unsigned32 name; /* XXX broken but works */ + uint32_t name; /* XXX broken but works */ /* XXX If any API is MP with variable length names .. BOOM!!!! */ } Objects_MP_Control; @@ -41,9 +41,9 @@ typedef struct { */ 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 ); /*PAGE @@ -59,7 +59,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 ); @@ -76,7 +76,7 @@ void _Objects_MP_Open ( boolean _Objects_MP_Allocate_and_open ( Objects_Information *information, - unsigned32 the_name, /* XXX -- wrong for variable length */ + uint32_t the_name, /* XXX -- wrong for variable length */ Objects_Id the_id, boolean is_fatal_error ); @@ -108,7 +108,7 @@ 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 ); @@ -136,7 +136,7 @@ void _Objects_MP_Is_remote ( * inactive global object control blocks. */ -SCORE_EXTERN unsigned32 _Objects_MP_Maximum_global_objects; +SCORE_EXTERN uint32_t _Objects_MP_Maximum_global_objects; SCORE_EXTERN Chain_Control _Objects_MP_Inactive_global_objects; #ifndef __RTEMS_APPLICATION__ diff --git a/cpukit/score/include/rtems/score/priority.h b/cpukit/score/include/rtems/score/priority.h index 489c291467..b321fe6d14 100644 --- a/cpukit/score/include/rtems/score/priority.h +++ b/cpukit/score/include/rtems/score/priority.h @@ -28,7 +28,7 @@ extern "C" { * NOTE: Priority 0 is reserved for internal threads only. */ -typedef unsigned32 Priority_Control; +typedef uint32_t Priority_Control; #define PRIORITY_MINIMUM 0 /* highest thread priority */ #define PRIORITY_MAXIMUM 255 /* lowest thread priority */ diff --git a/cpukit/score/include/rtems/score/stack.h b/cpukit/score/include/rtems/score/stack.h index 02da76394c..16c01f7ea3 100644 --- a/cpukit/score/include/rtems/score/stack.h +++ b/cpukit/score/include/rtems/score/stack.h @@ -33,7 +33,7 @@ extern "C" { */ typedef struct { - unsigned32 size; /* stack size */ + uint32_t size; /* stack size */ void *area; /* low memory addr of stack */ } Stack_Control; diff --git a/cpukit/score/include/rtems/score/states.h b/cpukit/score/include/rtems/score/states.h index b2fcb90588..9c073a5826 100644 --- a/cpukit/score/include/rtems/score/states.h +++ b/cpukit/score/include/rtems/score/states.h @@ -24,7 +24,7 @@ extern "C" { * thread's state. */ -typedef unsigned32 States_Control; +typedef uint32_t States_Control; /* * The following constants define the individual states which may be diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/score/include/rtems/score/thread.h index 56b01dc2aa..78e8b82864 100644 --- a/cpukit/score/include/rtems/score/thread.h +++ b/cpukit/score/include/rtems/score/thread.h @@ -39,7 +39,7 @@ extern "C" { * NOTE: This cannot always be right. Some APIs have void * tasks/threads, others return pointers, others may * return a numeric value. Hopefully a pointer is - * always at least as big as an unsigned32. :) + * always at least as big as an uint32_t . :) */ typedef void *Thread; @@ -47,7 +47,7 @@ typedef void *Thread; /* * The following defines the ways in which the entry point for a * thread can be invoked. Basically, it can be passed any - * combination/permutation of a pointer and an unsigned32 value. + * combination/permutation of a pointer and an uint32_t value. * * NOTE: For now, we are ignoring the return type. */ @@ -61,10 +61,10 @@ typedef enum { typedef Thread ( *Thread_Entry )(); /* basic type */ -typedef Thread ( *Thread_Entry_numeric )( unsigned32 ); +typedef Thread ( *Thread_Entry_numeric )( uint32_t ); typedef Thread ( *Thread_Entry_pointer )( void * ); -typedef Thread ( *Thread_Entry_both_pointer_first )( void *, unsigned32 ); -typedef Thread ( *Thread_Entry_both_numeric_first )( unsigned32, void * ); +typedef Thread ( *Thread_Entry_both_pointer_first )( void *, uint32_t ); +typedef Thread ( *Thread_Entry_both_numeric_first )( uint32_t , void * ); /* * The following lists the algorithms used to manage the thread cpu budget. @@ -110,12 +110,12 @@ typedef struct { Thread_Entry entry_point; /* starting thread address */ Thread_Start_types prototype; /* how task is invoked */ void *pointer_argument; /* pointer argument */ - unsigned32 numeric_argument; /* numeric argument */ + uint32_t numeric_argument; /* numeric argument */ /* initial execution modes */ boolean is_preemptible; Thread_CPU_budget_algorithms budget_algorithm; Thread_CPU_budget_algorithm_callout budget_callout; - unsigned32 isr_level; + uint32_t isr_level; Priority_Control initial_priority; /* initial priority */ boolean core_allocated_stack; Stack_Control Initial_stack; /* stack information */ @@ -134,16 +134,16 @@ typedef struct { typedef struct { Objects_Id id; /* waiting on this object */ - unsigned32 count; /* "generic" fields to be used */ + uint32_t count; /* "generic" fields to be used */ void *return_argument; /* when blocking */ void *return_argument_1; - unsigned32 option; + uint32_t option; /* * NOTE: The following assumes that all API return codes can be - * treated as an unsigned32. + * treated as an uint32_t . */ - unsigned32 return_code; /* status for thread awakened */ + uint32_t return_code; /* status for thread awakened */ Chain_Control Block2n; /* 2 - n priority blocked chain */ Thread_queue_Control *queue; /* pointer to thread queue */ @@ -162,7 +162,7 @@ typedef struct { States_Control current_state; Priority_Control current_priority; Priority_Control real_priority; - unsigned32 resource_count; + uint32_t resource_count; Thread_Wait_information Wait; Watchdog_Control Timer; #if defined(RTEMS_MULTIPROCESSING) @@ -195,24 +195,24 @@ struct Thread_Control_struct { States_Control current_state; Priority_Control current_priority; Priority_Control real_priority; - unsigned32 resource_count; + uint32_t resource_count; Thread_Wait_information Wait; Watchdog_Control Timer; #if defined(RTEMS_MULTIPROCESSING) MP_packet_Prefix *receive_packet; #endif /****************** end of common block ********************/ - unsigned32 suspend_count; + uint32_t suspend_count; boolean is_global; boolean do_post_task_switch_extension; boolean is_preemptible; void *rtems_ada_self; - unsigned32 cpu_time_budget; + uint32_t cpu_time_budget; Thread_CPU_budget_algorithms budget_algorithm; Thread_CPU_budget_algorithm_callout budget_callout; - unsigned32 ticks_executed; + uint32_t ticks_executed; Chain_Control *ready; Priority_Information Priority_map; Thread_Start_information Start; @@ -262,14 +262,14 @@ SCORE_EXTERN Context_Control _Thread_BSP_context; * moments. */ -SCORE_EXTERN volatile unsigned32 _Thread_Dispatch_disable_level; +SCORE_EXTERN volatile uint32_t _Thread_Dispatch_disable_level; /* * If this is non-zero, then the post-task switch extension * is run regardless of the state of the per thread flag. */ -SCORE_EXTERN unsigned32 _Thread_Do_post_task_switch_extension; +SCORE_EXTERN uint32_t _Thread_Do_post_task_switch_extension; /* * The following holds how many user extensions are in the system. This @@ -277,13 +277,13 @@ SCORE_EXTERN unsigned32 _Thread_Do_post_task_switch_extension; * per thread. */ -SCORE_EXTERN unsigned32 _Thread_Maximum_extensions; +SCORE_EXTERN uint32_t _Thread_Maximum_extensions; /* * The following is used to manage the length of a timeslice quantum. */ -SCORE_EXTERN unsigned32 _Thread_Ticks_per_timeslice; +SCORE_EXTERN uint32_t _Thread_Ticks_per_timeslice; /* * The following points to the array of FIFOs used to manage the @@ -334,9 +334,9 @@ SCORE_EXTERN struct _reent **_Thread_libc_reent; */ 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 ); /* @@ -393,9 +393,9 @@ void _Thread_Dispatch( void ); * */ -unsigned32 _Thread_Stack_Allocate( +uint32_t _Thread_Stack_Allocate( Thread_Control *the_thread, - unsigned32 stack_size + uint32_t stack_size ); /* @@ -434,13 +434,13 @@ 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 ); @@ -459,7 +459,7 @@ boolean _Thread_Start( Thread_Start_types the_prototype, void *entry_point, void *pointer_argument, - unsigned32 numeric_argument + uint32_t numeric_argument ); /* @@ -477,7 +477,7 @@ boolean _Thread_Start( boolean _Thread_Restart( Thread_Control *the_thread, void *pointer_argument, - unsigned32 numeric_argument + uint32_t numeric_argument ); /* @@ -492,7 +492,7 @@ boolean _Thread_Restart( void _Thread_Reset( Thread_Control *the_thread, void *pointer_argument, - unsigned32 numeric_argument + uint32_t numeric_argument ); /* @@ -758,7 +758,7 @@ Thread_Control *_Thread_Get ( #if (CPU_PROVIDES_IDLE_THREAD_BODY == FALSE) Thread _Thread_Idle_body( - unsigned32 ignored + uint32_t ignored ); #endif diff --git a/cpukit/score/include/rtems/score/threadmp.h b/cpukit/score/include/rtems/score/threadmp.h index b04826dafb..ad5efb7fb0 100644 --- a/cpukit/score/include/rtems/score/threadmp.h +++ b/cpukit/score/include/rtems/score/threadmp.h @@ -29,7 +29,7 @@ extern "C" { */ void _Thread_MP_Handler_initialization ( - unsigned32 maximum_proxies + uint32_t maximum_proxies ); /* diff --git a/cpukit/score/include/rtems/score/threadq.h b/cpukit/score/include/rtems/score/threadq.h index b66e894a3f..9b2b1a9b83 100644 --- a/cpukit/score/include/rtems/score/threadq.h +++ b/cpukit/score/include/rtems/score/threadq.h @@ -139,7 +139,7 @@ Thread_Control *_Thread_queue_First( void _Thread_queue_Flush( Thread_queue_Control *the_thread_queue, Thread_queue_Flush_callout remote_extract_callout, - unsigned32 status + uint32_t status ); /* @@ -156,7 +156,7 @@ 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 ); /* diff --git a/cpukit/score/include/rtems/score/tod.h b/cpukit/score/include/rtems/score/tod.h index 7b5ea94e12..8966c8b06c 100644 --- a/cpukit/score/include/rtems/score/tod.h +++ b/cpukit/score/include/rtems/score/tod.h @@ -27,21 +27,21 @@ extern "C" { * The following constants are related to the time of day. */ -#define TOD_SECONDS_PER_MINUTE (unsigned32)60 -#define TOD_MINUTES_PER_HOUR (unsigned32)60 -#define TOD_MONTHS_PER_YEAR (unsigned32)12 -#define TOD_DAYS_PER_YEAR (unsigned32)365 -#define TOD_HOURS_PER_DAY (unsigned32)24 -#define TOD_SECONDS_PER_DAY (unsigned32) (TOD_SECONDS_PER_MINUTE * \ +#define TOD_SECONDS_PER_MINUTE (uint32_t )60 +#define TOD_MINUTES_PER_HOUR (uint32_t )60 +#define TOD_MONTHS_PER_YEAR (uint32_t )12 +#define TOD_DAYS_PER_YEAR (uint32_t )365 +#define TOD_HOURS_PER_DAY (uint32_t )24 +#define TOD_SECONDS_PER_DAY (uint32_t ) (TOD_SECONDS_PER_MINUTE * \ TOD_MINUTES_PER_HOUR * \ TOD_HOURS_PER_DAY) #define TOD_SECONDS_PER_NON_LEAP_YEAR (365 * TOD_SECONDS_PER_DAY) -#define TOD_MILLISECONDS_PER_SECOND (unsigned32)1000 -#define TOD_MICROSECONDS_PER_SECOND (unsigned32)1000000 -#define TOD_NANOSECONDS_PER_SECOND (unsigned32)1000000000 -#define TOD_NANOSECONDS_PER_MICROSECOND (unsigned32)1000 +#define TOD_MILLISECONDS_PER_SECOND (uint32_t )1000 +#define TOD_MICROSECONDS_PER_SECOND (uint32_t )1000000 +#define TOD_NANOSECONDS_PER_SECOND (uint32_t )1000000000 +#define TOD_NANOSECONDS_PER_MICROSECOND (uint32_t )1000 /* * The following constant define the earliest year to which an @@ -57,13 +57,13 @@ extern "C" { */ typedef struct { /* RTEID style time/date */ - unsigned32 year; /* year, A.D. */ - unsigned32 month; /* month, 1 -> 12 */ - unsigned32 day; /* day, 1 -> 31 */ - unsigned32 hour; /* hour, 0 -> 23 */ - unsigned32 minute; /* minute, 0 -> 59 */ - unsigned32 second; /* second, 0 -> 59 */ - unsigned32 ticks; /* elapsed ticks between secs */ + uint32_t year; /* year, A.D. */ + uint32_t month; /* month, 1 -> 12 */ + uint32_t day; /* day, 1 -> 31 */ + uint32_t hour; /* hour, 0 -> 23 */ + uint32_t minute; /* minute, 0 -> 59 */ + uint32_t second; /* second, 0 -> 59 */ + uint32_t ticks; /* elapsed ticks between secs */ } TOD_Control; /* @@ -90,7 +90,7 @@ SCORE_EXTERN Watchdog_Interval _TOD_Seconds_since_epoch; * The following contains the number of microseconds per tick. */ -SCORE_EXTERN unsigned32 _TOD_Microseconds_per_tick; +SCORE_EXTERN uint32_t _TOD_Microseconds_per_tick; /* * The following contains the number of clock ticks per second. @@ -103,7 +103,7 @@ SCORE_EXTERN unsigned32 _TOD_Microseconds_per_tick; * can be a source of error in the current time of day. */ -SCORE_EXTERN unsigned32 _TOD_Ticks_per_second; +SCORE_EXTERN uint32_t _TOD_Ticks_per_second; /* * This is the control structure for the watchdog timer which @@ -121,7 +121,7 @@ SCORE_EXTERN Watchdog_Control _TOD_Seconds_watchdog; * February, respectively. */ -const unsigned32 _TOD_Days_per_month[ 2 ][ 13 ] = { +const uint32_t _TOD_Days_per_month[ 2 ][ 13 ] = { { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } }; @@ -132,7 +132,7 @@ const unsigned32 _TOD_Days_per_month[ 2 ][ 13 ] = { * The first dimension should be 1 for leap years, and 0 otherwise. */ -const unsigned16 _TOD_Days_to_date[2][13] = { +const uint16_t _TOD_Days_to_date[2][13] = { { 0, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 }, { 0, 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335 } }; @@ -144,13 +144,13 @@ const unsigned16 _TOD_Days_to_date[2][13] = { * year otherwise. */ -const unsigned16 _TOD_Days_since_last_leap_year[4] = { 0, 366, 731, 1096 }; +const uint16_t _TOD_Days_since_last_leap_year[4] = { 0, 366, 731, 1096 }; #else -extern const unsigned16 _TOD_Days_to_date[2][13]; /* Julian days */ -extern const unsigned16 _TOD_Days_since_last_leap_year[4]; -extern const unsigned32 _TOD_Days_per_month[2][13]; +extern const uint16_t _TOD_Days_to_date[2][13]; /* Julian days */ +extern const uint16_t _TOD_Days_since_last_leap_year[4]; +extern const uint32_t _TOD_Days_per_month[2][13]; #endif @@ -163,7 +163,7 @@ extern const unsigned32 _TOD_Days_per_month[2][13]; */ void _TOD_Handler_initialization( - unsigned32 microseconds_per_tick + uint32_t microseconds_per_tick ); /* diff --git a/cpukit/score/include/rtems/score/tqdata.h b/cpukit/score/include/rtems/score/tqdata.h index cfb805344c..d0984a1810 100644 --- a/cpukit/score/include/rtems/score/tqdata.h +++ b/cpukit/score/include/rtems/score/tqdata.h @@ -74,7 +74,7 @@ typedef struct { Thread_queue_States sync_state; /* alloc/dealloc critical section */ Thread_queue_Disciplines discipline; /* queue discipline */ States_Control state; /* state of threads on Thread_q */ - unsigned32 timeout_status; + uint32_t timeout_status; } Thread_queue_Control; #ifndef __RTEMS_APPLICATION__ diff --git a/cpukit/score/include/rtems/score/userext.h b/cpukit/score/include/rtems/score/userext.h index dc7a268948..ba7734e940 100644 --- a/cpukit/score/include/rtems/score/userext.h +++ b/cpukit/score/include/rtems/score/userext.h @@ -75,7 +75,7 @@ typedef User_extensions_routine ( *User_extensions_thread_exitted_extension )( typedef User_extensions_routine ( *User_extensions_fatal_extension )( Internal_errors_Source /* the_source */, boolean /* is_internal */, - unsigned32 /* the_error */ + uint32_t /* the_error */ ); @@ -215,7 +215,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 ); #ifndef __RTEMS_APPLICATION__ diff --git a/cpukit/score/include/rtems/score/watchdog.h b/cpukit/score/include/rtems/score/watchdog.h index eaf10357c1..cb70d13120 100644 --- a/cpukit/score/include/rtems/score/watchdog.h +++ b/cpukit/score/include/rtems/score/watchdog.h @@ -30,7 +30,7 @@ extern "C" { #define WATCHDOG_MAXIMUM_INTERVAL ((Watchdog_Interval) 0xffffffff) -typedef unsigned32 Watchdog_Interval; +typedef uint32_t Watchdog_Interval; /* * The following types define a pointer to a watchdog service routine. @@ -95,8 +95,8 @@ typedef struct { * during an insert on a watchdog delta chain. */ -SCORE_EXTERN volatile unsigned32 _Watchdog_Sync_level; -SCORE_EXTERN volatile unsigned32 _Watchdog_Sync_count; +SCORE_EXTERN volatile uint32_t _Watchdog_Sync_level; +SCORE_EXTERN volatile uint32_t _Watchdog_Sync_count; /* * The following contains the number of ticks since the diff --git a/cpukit/score/include/rtems/score/wkspace.h b/cpukit/score/include/rtems/score/wkspace.h index 58f09964f6..b6d6e73e59 100644 --- a/cpukit/score/include/rtems/score/wkspace.h +++ b/cpukit/score/include/rtems/score/wkspace.h @@ -41,7 +41,7 @@ SCORE_EXTERN Heap_Control _Workspace_Area; /* executive heap header */ void _Workspace_Handler_initialization( void *starting_address, - unsigned32 size + uint32_t size ); /* @@ -55,7 +55,7 @@ void _Workspace_Handler_initialization( */ void *_Workspace_Allocate_or_fatal_error( - unsigned32 size + uint32_t size ); #ifndef __RTEMS_APPLICATION__ 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 ); diff --git a/cpukit/score/macros/rtems/score/address.inl b/cpukit/score/macros/rtems/score/address.inl index f8a787b05d..77d2d576c2 100644 --- a/cpukit/score/macros/rtems/score/address.inl +++ b/cpukit/score/macros/rtems/score/address.inl @@ -38,7 +38,7 @@ * * _Addresses_Subtract * - * 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. */ @@ -59,7 +59,7 @@ ( ( (unsigned short)(_address) % CPU_ALIGNMENT ) == 0 ) #else #define _Addresses_Is_aligned( _address ) \ - ( ( (unsigned32)(_address) % CPU_ALIGNMENT ) == 0 ) + ( ( (uint32_t )(_address) % CPU_ALIGNMENT ) == 0 ) #endif /*PAGE diff --git a/cpukit/score/macros/rtems/score/heap.inl b/cpukit/score/macros/rtems/score/heap.inl index 6355bf8583..9c0b3cc77c 100644 --- a/cpukit/score/macros/rtems/score/heap.inl +++ b/cpukit/score/macros/rtems/score/heap.inl @@ -76,7 +76,7 @@ #define _Heap_User_block_at( _base ) \ _Heap_Block_at( \ (_base), \ - -*(((unsigned32 *) (_base)) - 1) + -HEAP_BLOCK_USED_OVERHEAD \ + -*(((uint32_t *) (_base)) - 1) + -HEAP_BLOCK_USED_OVERHEAD \ ) /*PAGE diff --git a/cpukit/score/macros/rtems/score/object.inl b/cpukit/score/macros/rtems/score/object.inl index 37ee26c4de..79702927f9 100644 --- a/cpukit/score/macros/rtems/score/object.inl +++ b/cpukit/score/macros/rtems/score/object.inl @@ -43,7 +43,7 @@ */ #define _Objects_Get_class( _id ) \ - (unsigned32) \ + (uint32_t ) \ (((_id) >> OBJECTS_CLASS_START_BIT) & OBJECTS_CLASS_VALID_BITS) /*PAGE @@ -145,7 +145,7 @@ #define _Objects_Open( _information, _the_object, _name ) \ do { \ - unsigned32 _index; \ + uint32_t _index; \ \ _index = _Objects_Get_index( (_the_object)->id ); \ (_information)->local_table[ _index ] = (_the_object); \ @@ -167,7 +167,7 @@ #define _Objects_Close( _information, _the_object ) \ do { \ - unsigned32 _index; \ + uint32_t _index; \ \ _index = _Objects_Get_index( (_the_object)->id ); \ (_information)->local_table[ _index ] = (Objects_Control *) NULL; \ diff --git a/cpukit/score/macros/rtems/score/priority.inl b/cpukit/score/macros/rtems/score/priority.inl index ee703931aa..057f36ea65 100644 --- a/cpukit/score/macros/rtems/score/priority.inl +++ b/cpukit/score/macros/rtems/score/priority.inl @@ -26,7 +26,7 @@ #define _Priority_Handler_initialization() \ { \ - unsigned32 index; \ + uint32_t index; \ \ _Priority_Major_bit_map = 0; \ for ( index=0 ; index <16 ; index++ ) \ diff --git a/cpukit/score/macros/rtems/score/userext.inl b/cpukit/score/macros/rtems/score/userext.inl index 4da8280748..cbb72b24f9 100644 --- a/cpukit/score/macros/rtems/score/userext.inl +++ b/cpukit/score/macros/rtems/score/userext.inl @@ -54,7 +54,7 @@ ) \ { \ User_extensions_Control *extension; \ - unsigned32 i; \ + uint32_t i; \ \ _Chain_Initialize_empty( &_User_extensions_List ); \ _Chain_Initialize_empty( &_User_extensions_Switches_list ); \ -- cgit v1.2.3