From 20f78a33ff1fddc847a0db3fe80c6323021d5c7a Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 23 Mar 2004 13:13:17 +0000 Subject: 2004-03-23 Ralf Corsepius * itron/include/itronsys/mbox.h, itron/include/itronsys/types.h, itron/include/rtems/itron/eventflags.h, itron/include/rtems/itron/fmempool.h, itron/include/rtems/itron/mbox.h, itron/include/rtems/itron/msgbuffer.h, itron/include/rtems/itron/port.h, itron/include/rtems/itron/semaphore.h, itron/include/rtems/itron/task.h, itron/include/rtems/itron/vmempool.h, itron/inline/rtems/itron/semaphore.inl, itron/macros/rtems/itron/semaphore.inl, itron/src/eventflags.c, itron/src/fmempool.c, itron/src/itronsem.c, itron/src/mbox.c, itron/src/msgbuffer.c, itron/src/port.c, itron/src/snd_mbx.c, itron/src/task.c, itron/src/trcv_mbx.c, itron/src/vmempool.c: Convert to using c99 fixed size types. --- cpukit/ChangeLog | 18 ++++++++++++ cpukit/itron/include/itronsys/mbox.h | 2 +- cpukit/itron/include/itronsys/types.h | 40 +++++++++++++-------------- cpukit/itron/include/rtems/itron/eventflags.h | 4 +-- cpukit/itron/include/rtems/itron/fmempool.h | 4 +-- cpukit/itron/include/rtems/itron/mbox.h | 4 +-- cpukit/itron/include/rtems/itron/msgbuffer.h | 2 +- cpukit/itron/include/rtems/itron/port.h | 4 +-- cpukit/itron/include/rtems/itron/semaphore.h | 2 +- cpukit/itron/include/rtems/itron/task.h | 8 +++--- cpukit/itron/include/rtems/itron/vmempool.h | 4 +-- cpukit/itron/inline/rtems/itron/semaphore.inl | 2 +- cpukit/itron/macros/rtems/itron/semaphore.inl | 2 +- cpukit/itron/src/eventflags.c | 2 +- cpukit/itron/src/fmempool.c | 2 +- cpukit/itron/src/itronsem.c | 2 +- cpukit/itron/src/mbox.c | 2 +- cpukit/itron/src/msgbuffer.c | 2 +- cpukit/itron/src/port.c | 2 +- cpukit/itron/src/snd_mbx.c | 2 +- cpukit/itron/src/task.c | 8 +++--- cpukit/itron/src/trcv_mbx.c | 2 +- cpukit/itron/src/vmempool.c | 2 +- 23 files changed, 70 insertions(+), 52 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 8c6159351a..70333b2ecb 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,21 @@ +2004-03-23 Ralf Corsepius + + * itron/include/itronsys/mbox.h, itron/include/itronsys/types.h, + itron/include/rtems/itron/eventflags.h, + itron/include/rtems/itron/fmempool.h, + itron/include/rtems/itron/mbox.h, + itron/include/rtems/itron/msgbuffer.h, + itron/include/rtems/itron/port.h, + itron/include/rtems/itron/semaphore.h, + itron/include/rtems/itron/task.h, + itron/include/rtems/itron/vmempool.h, + itron/inline/rtems/itron/semaphore.inl, + itron/macros/rtems/itron/semaphore.inl, itron/src/eventflags.c, + itron/src/fmempool.c, itron/src/itronsem.c, itron/src/mbox.c, + itron/src/msgbuffer.c, itron/src/port.c, itron/src/snd_mbx.c, + itron/src/task.c, itron/src/trcv_mbx.c, itron/src/vmempool.c: + Convert to using c99 fixed size types. + 2004-03-23 Ralf Corsepius * posix/include/rtems/posix/cond.h, diff --git a/cpukit/itron/include/itronsys/mbox.h b/cpukit/itron/include/itronsys/mbox.h index bcaa7a8a65..9d50c6f3ed 100644 --- a/cpukit/itron/include/itronsys/mbox.h +++ b/cpukit/itron/include/itronsys/mbox.h @@ -47,7 +47,7 @@ typedef struct t_msg { INT msgpri; /* priority of each message */ /* VB msgcont[]; XXX */ - unsigned8 msgcont[1]; + uint8_t msgcont[1]; } T_MSG; /* diff --git a/cpukit/itron/include/itronsys/types.h b/cpukit/itron/include/itronsys/types.h index 03fe51947a..160c00ea88 100644 --- a/cpukit/itron/include/itronsys/types.h +++ b/cpukit/itron/include/itronsys/types.h @@ -22,16 +22,16 @@ extern "C" { * off the shell programs including paranoia. */ -typedef signed8 B; /* signed 8-bit integer */ -typedef signed16 H; /* signed 16-bit integer */ -typedef signed32 W; /* signed 32-bit integer */ -typedef unsigned8 UB; /* unsigned 8-bit integer */ -typedef unsigned16 UH; /* unsigned 16-bit integer */ -typedef unsigned32 UW; /* unsigned 32-bit integer */ +typedef int8_t B; /* signed 8-bit integer */ +typedef int16_t H; /* signed 16-bit integer */ +typedef int32_t W; /* signed 32-bit integer */ +typedef uint8_t UB; /* unsigned 8-bit integer */ +typedef uint16_t UH; /* unsigned 16-bit integer */ +typedef uint32_t UW; /* unsigned 32-bit integer */ -typedef unsigned32 VW; /* unpredictable data type (32-bit size) */ -typedef unsigned16 VH; /* unpredictable data type (16-bit size) */ -typedef unsigned8 VB; /* unpredictable data type (8-bit size) */ +typedef uint32_t VW; /* unpredictable data type (32-bit size) */ +typedef uint16_t VH; /* unpredictable data type (16-bit size) */ +typedef uint8_t VB; /* unpredictable data type (8-bit size) */ typedef void *VP; /* pointer to an unpredictable data type */ @@ -53,26 +53,26 @@ typedef void (*FP)(); /* program start address */ * and/or have special meanings. */ -typedef signed32 INT; /* Signed integer (bit width of processor) */ -typedef unsigned32 UINT; /* Unsigned integer (bit width of processor) */ +typedef int32_t INT; /* Signed integer (bit width of processor) */ +typedef uint32_t UINT; /* Unsigned integer (bit width of processor) */ typedef boolean BOOL; /* Boolean value. TRUE (1) or FALSE (0). */ -typedef signed16 FN; /* Function code. Signed integer. Maximum 2 bytes. */ +typedef int16_t FN; /* Function code. Signed integer. Maximum 2 bytes. */ typedef int ID; /* Object ID number (???id) */ /* Value range depends on the system. Usually */ /* a signed integer. Certain ID values may */ /* represent objects on other nodes when the */ /* connection function is supported. */ -typedef unsigned32 BOOL_ID;/* Boolean value or ID number */ +typedef uint32_t BOOL_ID;/* Boolean value or ID number */ -typedef signed32 HNO; /* Handler number */ -typedef signed32 RNO; /* Rendezvous number */ -typedef signed32 NODE; /* Node Number. Usually a signed integer. */ -typedef signed32 ATR; /* Object or handler attribute. */ +typedef int32_t HNO; /* Handler number */ +typedef int32_t RNO; /* Rendezvous number */ +typedef int32_t NODE; /* Node Number. Usually a signed integer. */ +typedef int32_t ATR; /* Object or handler attribute. */ /* An unsigned integer. */ -typedef signed32 ER; /* Error code. A signed integer. */ -typedef unsigned32 PRI; /* Task priority. A signed integer. */ -typedef signed32 TMO; /* Timeout value. A signed integer. */ +typedef int32_t ER; /* Error code. A signed integer. */ +typedef uint32_t PRI; /* Task priority. A signed integer. */ +typedef int32_t TMO; /* Timeout value. A signed integer. */ /* TMO_POL = 0 indicates polling, */ /* while TMO_FEVR = -1 indicates wait forever. */ diff --git a/cpukit/itron/include/rtems/itron/eventflags.h b/cpukit/itron/include/rtems/itron/eventflags.h index c6036d904b..88fdb6c1fa 100644 --- a/cpukit/itron/include/rtems/itron/eventflags.h +++ b/cpukit/itron/include/rtems/itron/eventflags.h @@ -24,7 +24,7 @@ extern "C" { typedef struct { ITRON_Objects_Control Object; - unsigned32 XXX_more_stuff_goes_here; + uint32_t XXX_more_stuff_goes_here; } ITRON_Eventflags_Control; /* @@ -43,7 +43,7 @@ ITRON_EXTERN Objects_Information _ITRON_Eventflags_Information; */ void _ITRON_Eventflags_Manager_initialization( - unsigned32 maximum_eventflags + uint32_t maximum_eventflags ); /* diff --git a/cpukit/itron/include/rtems/itron/fmempool.h b/cpukit/itron/include/rtems/itron/fmempool.h index c4221d103e..0262d79927 100644 --- a/cpukit/itron/include/rtems/itron/fmempool.h +++ b/cpukit/itron/include/rtems/itron/fmempool.h @@ -25,7 +25,7 @@ extern "C" { typedef struct { ITRON_Objects_Control Object; - unsigned32 XXX_more_stuff_goes_here; + uint32_t XXX_more_stuff_goes_here; } ITRON_Fixed_memory_pool_Control; /* @@ -44,7 +44,7 @@ ITRON_EXTERN Objects_Information _ITRON_Fixed_memory_pool_Information; */ void _ITRON_Fixed_memory_pool_Manager_initialization( - unsigned32 maximum_fixed_memory_pools + uint32_t maximum_fixed_memory_pools ); /* diff --git a/cpukit/itron/include/rtems/itron/mbox.h b/cpukit/itron/include/rtems/itron/mbox.h index bbd614cced..2378bc8fb3 100644 --- a/cpukit/itron/include/rtems/itron/mbox.h +++ b/cpukit/itron/include/rtems/itron/mbox.h @@ -25,7 +25,7 @@ extern "C" { typedef struct { ITRON_Objects_Control Object; - unsigned32 count; + uint32_t count; boolean do_message_priority; CORE_message_queue_Control message_queue; } ITRON_Mailbox_Control; @@ -46,7 +46,7 @@ ITRON_EXTERN Objects_Information _ITRON_Mailbox_Information; */ void _ITRON_Mailbox_Manager_initialization( - unsigned32 maximum_mailboxes + uint32_t maximum_mailboxes ); /* diff --git a/cpukit/itron/include/rtems/itron/msgbuffer.h b/cpukit/itron/include/rtems/itron/msgbuffer.h index 8daa17daaf..5e249b58e5 100644 --- a/cpukit/itron/include/rtems/itron/msgbuffer.h +++ b/cpukit/itron/include/rtems/itron/msgbuffer.h @@ -46,7 +46,7 @@ ITRON_EXTERN Objects_Information _ITRON_Message_buffer_Information; */ void _ITRON_Message_buffer_Manager_initialization( - unsigned32 maximum_message_buffers + uint32_t maximum_message_buffers ); /* diff --git a/cpukit/itron/include/rtems/itron/port.h b/cpukit/itron/include/rtems/itron/port.h index 8ff5753c6b..1cacf32ba6 100644 --- a/cpukit/itron/include/rtems/itron/port.h +++ b/cpukit/itron/include/rtems/itron/port.h @@ -24,7 +24,7 @@ extern "C" { typedef struct { ITRON_Objects_Control Object; - unsigned32 XXX_more_stuff_goes_here; + uint32_t XXX_more_stuff_goes_here; } ITRON_Port_Control; /* @@ -43,7 +43,7 @@ ITRON_EXTERN Objects_Information _ITRON_Port_Information; */ void _ITRON_Port_Manager_initialization( - unsigned32 maximum_ports + uint32_t maximum_ports ); /* diff --git a/cpukit/itron/include/rtems/itron/semaphore.h b/cpukit/itron/include/rtems/itron/semaphore.h index 4964c67480..acedce3c80 100644 --- a/cpukit/itron/include/rtems/itron/semaphore.h +++ b/cpukit/itron/include/rtems/itron/semaphore.h @@ -45,7 +45,7 @@ ITRON_EXTERN Objects_Information _ITRON_Semaphore_Information; */ void _ITRON_Semaphore_Manager_initialization( - unsigned32 maximum_semaphores + uint32_t maximum_semaphores ); #include diff --git a/cpukit/itron/include/rtems/itron/task.h b/cpukit/itron/include/rtems/itron/task.h index c89d9f47f4..72a26f4f45 100644 --- a/cpukit/itron/include/rtems/itron/task.h +++ b/cpukit/itron/include/rtems/itron/task.h @@ -39,7 +39,7 @@ extern "C" { typedef struct { - unsigned32 unused; /* no use for the API extension */ + uint32_t unused; /* no use for the API extension */ /* structure for ITRON identified yet */ } ITRON_API_Control; @@ -56,7 +56,7 @@ ITRON_EXTERN Objects_Information _ITRON_Task_Information; ITRON_EXTERN itron_initialization_tasks_table *_ITRON_Task_User_initialization_tasks; -ITRON_EXTERN unsigned32 _ITRON_Task_Number_of_initialization_tasks; +ITRON_EXTERN uint32_t _ITRON_Task_Number_of_initialization_tasks; /* @@ -66,8 +66,8 @@ ITRON_EXTERN unsigned32 _ITRON_Task_Number_of_initialization_tasks; */ void _ITRON_Task_Manager_initialization( - unsigned32 maximum_tasks, - unsigned32 number_of_initialization_tasks, + uint32_t maximum_tasks, + uint32_t number_of_initialization_tasks, itron_initialization_tasks_table *user_tasks ); diff --git a/cpukit/itron/include/rtems/itron/vmempool.h b/cpukit/itron/include/rtems/itron/vmempool.h index 9ea4527c6e..999aa450e9 100644 --- a/cpukit/itron/include/rtems/itron/vmempool.h +++ b/cpukit/itron/include/rtems/itron/vmempool.h @@ -25,7 +25,7 @@ extern "C" { typedef struct { ITRON_Objects_Control Object; - unsigned32 XXX_more_stuff_goes_here; + uint32_t XXX_more_stuff_goes_here; } ITRON_Variable_memory_pool_Control; /* @@ -44,7 +44,7 @@ ITRON_EXTERN Objects_Information _ITRON_Variable_memory_pool_Information; */ void _ITRON_Variable_memory_pool_Manager_initialization( - unsigned32 maximum_variable_memory_pools + uint32_t maximum_variable_memory_pools ); /* diff --git a/cpukit/itron/inline/rtems/itron/semaphore.inl b/cpukit/itron/inline/rtems/itron/semaphore.inl index b038cd5425..97c58e48a4 100644 --- a/cpukit/itron/inline/rtems/itron/semaphore.inl +++ b/cpukit/itron/inline/rtems/itron/semaphore.inl @@ -153,7 +153,7 @@ RTEMS_INLINE_ROUTINE boolean _ITRON_Semaphore_Is_null ( */ RTEMS_INLINE_ROUTINE ER _ITRON_Semaphore_Translate_core_semaphore_return_code ( - unsigned32 the_semaphore_status + uint32_t the_semaphore_status ) { /* XXX need to be able to return "E_RLWAI" */ diff --git a/cpukit/itron/macros/rtems/itron/semaphore.inl b/cpukit/itron/macros/rtems/itron/semaphore.inl index b9b2e3266b..05c4c9840e 100644 --- a/cpukit/itron/macros/rtems/itron/semaphore.inl +++ b/cpukit/itron/macros/rtems/itron/semaphore.inl @@ -72,7 +72,7 @@ extern "C" { /* XXX fix me */ static ER _ITRON_Semaphore_Translate_core_semaphore_return_code ( - unsigned32 the_semaphore_status + uint32_t the_semaphore_status ) { /* XXX need to be able to return "E_RLWAI" */ diff --git a/cpukit/itron/src/eventflags.c b/cpukit/itron/src/eventflags.c index d3ce3354c1..0c502a94b1 100644 --- a/cpukit/itron/src/eventflags.c +++ b/cpukit/itron/src/eventflags.c @@ -29,7 +29,7 @@ */ void _ITRON_Eventflags_Manager_initialization( - unsigned32 maximum_eventflags + uint32_t maximum_eventflags ) { _Objects_Initialize_information( diff --git a/cpukit/itron/src/fmempool.c b/cpukit/itron/src/fmempool.c index 91234cbb5a..1b568709d4 100644 --- a/cpukit/itron/src/fmempool.c +++ b/cpukit/itron/src/fmempool.c @@ -30,7 +30,7 @@ */ void _ITRON_Fixed_memory_pool_Manager_initialization( - unsigned32 maximum_fixed_memory_pools + uint32_t maximum_fixed_memory_pools ) { _Objects_Initialize_information( diff --git a/cpukit/itron/src/itronsem.c b/cpukit/itron/src/itronsem.c index 3ae1b13418..38b3ad2d60 100644 --- a/cpukit/itron/src/itronsem.c +++ b/cpukit/itron/src/itronsem.c @@ -33,7 +33,7 @@ */ void _ITRON_Semaphore_Manager_initialization( - unsigned32 maximum_semaphores + uint32_t maximum_semaphores ) { _Objects_Initialize_information( diff --git a/cpukit/itron/src/mbox.c b/cpukit/itron/src/mbox.c index 1eac8469de..793b782d36 100644 --- a/cpukit/itron/src/mbox.c +++ b/cpukit/itron/src/mbox.c @@ -32,7 +32,7 @@ */ void _ITRON_Mailbox_Manager_initialization( - unsigned32 maximum_mailboxes + uint32_t maximum_mailboxes ) { _Objects_Initialize_information( diff --git a/cpukit/itron/src/msgbuffer.c b/cpukit/itron/src/msgbuffer.c index 29a586f497..d6739f719c 100644 --- a/cpukit/itron/src/msgbuffer.c +++ b/cpukit/itron/src/msgbuffer.c @@ -33,7 +33,7 @@ */ void _ITRON_Message_buffer_Manager_initialization( - unsigned32 maximum_message_buffers + uint32_t maximum_message_buffers ) { _Objects_Initialize_information( diff --git a/cpukit/itron/src/port.c b/cpukit/itron/src/port.c index ca9c78faf9..e4d91bdf3d 100644 --- a/cpukit/itron/src/port.c +++ b/cpukit/itron/src/port.c @@ -29,7 +29,7 @@ */ void _ITRON_Port_Manager_initialization( - unsigned32 maximum_ports + uint32_t maximum_ports ) { _Objects_Initialize_information( diff --git a/cpukit/itron/src/snd_mbx.c b/cpukit/itron/src/snd_mbx.c index 31cc35ab83..936d532906 100644 --- a/cpukit/itron/src/snd_mbx.c +++ b/cpukit/itron/src/snd_mbx.c @@ -31,7 +31,7 @@ ER snd_msg( { register ITRON_Mailbox_Control *the_mailbox; Objects_Locations location; - unsigned32 message_priority; + uint32_t message_priority; void *message_contents; CORE_message_queue_Status msg_status; diff --git a/cpukit/itron/src/task.c b/cpukit/itron/src/task.c index 59267dfa06..734fffb85a 100644 --- a/cpukit/itron/src/task.c +++ b/cpukit/itron/src/task.c @@ -79,8 +79,8 @@ User_extensions_routine _ITRON_Task_Delete_extension( void _ITRON_Task_Initialize_user_tasks( void ) { - unsigned32 index; - unsigned32 maximum; + uint32_t index; + uint32_t maximum; ER return_value; itron_initialization_tasks_table *user_tasks; @@ -178,8 +178,8 @@ User_extensions_Control _ITRON_Task_User_extensions = { */ void _ITRON_Task_Manager_initialization( - unsigned32 maximum_tasks, - unsigned32 number_of_initialization_tasks, + uint32_t maximum_tasks, + uint32_t number_of_initialization_tasks, itron_initialization_tasks_table *user_tasks ) { diff --git a/cpukit/itron/src/trcv_mbx.c b/cpukit/itron/src/trcv_mbx.c index 3cb7c27426..46a4894825 100644 --- a/cpukit/itron/src/trcv_mbx.c +++ b/cpukit/itron/src/trcv_mbx.c @@ -34,7 +34,7 @@ ER trcv_msg( Watchdog_Interval interval; boolean wait; Objects_Locations location; - unsigned32 size; + uint32_t size; if (!ppk_msg) return E_PAR; diff --git a/cpukit/itron/src/vmempool.c b/cpukit/itron/src/vmempool.c index 380ef244c0..8238d94514 100644 --- a/cpukit/itron/src/vmempool.c +++ b/cpukit/itron/src/vmempool.c @@ -30,7 +30,7 @@ */ void _ITRON_Variable_memory_pool_Manager_initialization( - unsigned32 maximum_variable_memory_pools + uint32_t maximum_variable_memory_pools ) { _Objects_Initialize_information( -- cgit v1.2.3