From 83c5fc1bb9b45c22e428e1f7642b5a67cbf44b98 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 23 Mar 2004 06:07:53 +0000 Subject: 2004-03-23 Ralf Corsepius * libcsupport/include/chain.h, libcsupport/include/clockdrv.h, libcsupport/include/ringbuf.h, libcsupport/include/spurious.h, libcsupport/include/timerdrv.h, libcsupport/include/vmeintr.h, libcsupport/include/motorola/mc68230.h, libcsupport/include/rtems/assoc.h, libcsupport/include/rtems/libio.h, libcsupport/include/rtems/libio_.h, libcsupport/include/rtems/termiostypes.h, libcsupport/include/zilog/z8036.h, libcsupport/include/zilog/z8530.h, libcsupport/include/zilog/z8536.h, libcsupport/src/__gettod.c, libcsupport/src/assoc.c, libcsupport/src/assocnamebad.c, libcsupport/src/error.c, libcsupport/src/libio.c, libcsupport/src/libio_sockets.c, libcsupport/src/malloc.c, libcsupport/src/no_libc.c, libcsupport/src/termios.c, libcsupport/src/termiosreserveresources.c: Convert to using c99 fixed-size types. --- cpukit/libcsupport/include/chain.h | 4 +- cpukit/libcsupport/include/clockdrv.h | 2 +- cpukit/libcsupport/include/motorola/mc68230.h | 2 +- cpukit/libcsupport/include/ringbuf.h | 4 +- cpukit/libcsupport/include/rtems/assoc.h | 32 ++++---- cpukit/libcsupport/include/rtems/libio.h | 42 +++++------ cpukit/libcsupport/include/rtems/libio_.h | 14 ++-- cpukit/libcsupport/include/rtems/termiostypes.h | 2 +- cpukit/libcsupport/include/spurious.h | 2 +- cpukit/libcsupport/include/timerdrv.h | 2 +- cpukit/libcsupport/include/vmeintr.h | 2 +- cpukit/libcsupport/include/zilog/z8036.h | 96 ++++++++++++------------ cpukit/libcsupport/include/zilog/z8530.h | 2 +- cpukit/libcsupport/include/zilog/z8536.h | 2 +- cpukit/libcsupport/src/__gettod.c | 4 +- cpukit/libcsupport/src/assoc.c | 46 ++++++------ cpukit/libcsupport/src/assocnamebad.c | 2 +- cpukit/libcsupport/src/error.c | 2 +- cpukit/libcsupport/src/libio.c | 16 ++-- cpukit/libcsupport/src/libio_sockets.c | 2 +- cpukit/libcsupport/src/malloc.c | 44 +++++------ cpukit/libcsupport/src/no_libc.c | 2 +- cpukit/libcsupport/src/termios.c | 8 +- cpukit/libcsupport/src/termiosreserveresources.c | 2 +- 24 files changed, 168 insertions(+), 168 deletions(-) (limited to 'cpukit/libcsupport') diff --git a/cpukit/libcsupport/include/chain.h b/cpukit/libcsupport/include/chain.h index e22bc9f11d..25cdca98aa 100644 --- a/cpukit/libcsupport/include/chain.h +++ b/cpukit/libcsupport/include/chain.h @@ -28,8 +28,8 @@ * * Chain_Control *the_chain, * IN * * void *starting_address, * IN * - * rtems_unsigned32 number_nodes, * IN * - * rtems_unsigned32 node_size * IN * + * uint32_t number_nodes, * IN * + * uint32_t node_size * IN * */ #define Chain_Initialize( the_chain, starting_address, \ diff --git a/cpukit/libcsupport/include/clockdrv.h b/cpukit/libcsupport/include/clockdrv.h index c0064e919e..ed7e83cf51 100644 --- a/cpukit/libcsupport/include/clockdrv.h +++ b/cpukit/libcsupport/include/clockdrv.h @@ -21,7 +21,7 @@ extern "C" { /* variables */ -extern volatile rtems_unsigned32 Clock_driver_ticks; +extern volatile uint32_t Clock_driver_ticks; extern rtems_device_major_number rtems_clock_major; extern rtems_device_minor_number rtems_clock_minor; diff --git a/cpukit/libcsupport/include/motorola/mc68230.h b/cpukit/libcsupport/include/motorola/mc68230.h index ff09a0d6c3..952c1cdb3c 100644 --- a/cpukit/libcsupport/include/motorola/mc68230.h +++ b/cpukit/libcsupport/include/motorola/mc68230.h @@ -58,7 +58,7 @@ /* Some RTEMS style defines: */ #ifndef VOL8 -#define VOL8( ptr ) ((volatile rtems_unsigned8 *)(ptr)) +#define VOL8( ptr ) ((volatile uint8_t *)(ptr)) #endif #define MC68230_WRITE( reg, data ) \ diff --git a/cpukit/libcsupport/include/ringbuf.h b/cpukit/libcsupport/include/ringbuf.h index 8c80aaf9c8..8639ff4fb8 100644 --- a/cpukit/libcsupport/include/ringbuf.h +++ b/cpukit/libcsupport/include/ringbuf.h @@ -32,7 +32,7 @@ typedef struct { #define Ring_buffer_Add_character( _buffer, _ch ) \ do { \ - rtems_unsigned32 isrlevel; \ + uint32_t isrlevel; \ \ rtems_interrupt_disable( isrlevel ); \ (_buffer)->tail = ((_buffer)->tail+1) % RINGBUF_QUEUE_LENGTH; \ @@ -42,7 +42,7 @@ typedef struct { #define Ring_buffer_Remove_character( _buffer, _ch ) \ do { \ - rtems_unsigned32 isrlevel; \ + uint32_t isrlevel; \ \ rtems_interrupt_disable( isrlevel ); \ (_buffer)->head = ((_buffer)->head+1) % RINGBUF_QUEUE_LENGTH; \ diff --git a/cpukit/libcsupport/include/rtems/assoc.h b/cpukit/libcsupport/include/rtems/assoc.h index 1982d654ac..7c5ebe7f6a 100644 --- a/cpukit/libcsupport/include/rtems/assoc.h +++ b/cpukit/libcsupport/include/rtems/assoc.h @@ -12,8 +12,8 @@ typedef struct { const char *name; - unsigned32 local_value; - unsigned32 remote_value; + uint32_t local_value; + uint32_t remote_value; } rtems_assoc_t; /* @@ -23,20 +23,20 @@ typedef struct { #define RTEMS_ASSOC_DEFAULT_NAME "(default)" const rtems_assoc_t *rtems_assoc_ptr_by_name(const rtems_assoc_t *, const char *); -const rtems_assoc_t *rtems_assoc_ptr_by_value(const rtems_assoc_t *, unsigned32); -const rtems_assoc_t *rtems_assoc_ptr_by_remote(const rtems_assoc_t *, unsigned32); - -unsigned32 rtems_assoc_remote_by_local(const rtems_assoc_t *, unsigned32); -unsigned32 rtems_assoc_local_by_remote(const rtems_assoc_t *, unsigned32); -unsigned32 rtems_assoc_remote_by_name(const rtems_assoc_t *, const char *); -unsigned32 rtems_assoc_local_by_name(const rtems_assoc_t *, const char *); -const char *rtems_assoc_name_by_local(const rtems_assoc_t *, unsigned32); -const char *rtems_assoc_name_by_remote(const rtems_assoc_t *, unsigned32); - -unsigned32 rtems_assoc_remote_by_local_bitfield(const rtems_assoc_t *, unsigned32); -char *rtems_assoc_name_by_local_bitfield(const rtems_assoc_t *, unsigned32, char *); -char *rtems_assoc_name_by_remote_bitfield(const rtems_assoc_t *, unsigned32, char *); -unsigned32 rtems_assoc_local_by_remote_bitfield(const rtems_assoc_t *, unsigned32); +const rtems_assoc_t *rtems_assoc_ptr_by_value(const rtems_assoc_t *, uint32_t ); +const rtems_assoc_t *rtems_assoc_ptr_by_remote(const rtems_assoc_t *, uint32_t ); + +uint32_t rtems_assoc_remote_by_local(const rtems_assoc_t *, uint32_t ); +uint32_t rtems_assoc_local_by_remote(const rtems_assoc_t *, uint32_t ); +uint32_t rtems_assoc_remote_by_name(const rtems_assoc_t *, const char *); +uint32_t rtems_assoc_local_by_name(const rtems_assoc_t *, const char *); +const char *rtems_assoc_name_by_local(const rtems_assoc_t *, uint32_t ); +const char *rtems_assoc_name_by_remote(const rtems_assoc_t *, uint32_t ); + +uint32_t rtems_assoc_remote_by_local_bitfield(const rtems_assoc_t *, uint32_t ); +char *rtems_assoc_name_by_local_bitfield(const rtems_assoc_t *, uint32_t , char *); +char *rtems_assoc_name_by_remote_bitfield(const rtems_assoc_t *, uint32_t , char *); +uint32_t rtems_assoc_local_by_remote_bitfield(const rtems_assoc_t *, uint32_t ); #endif /* ! _INCLUDE_ASSOC_H */ diff --git a/cpukit/libcsupport/include/rtems/libio.h b/cpukit/libcsupport/include/rtems/libio.h index a70787d9ca..498ecd1f59 100644 --- a/cpukit/libcsupport/include/rtems/libio.h +++ b/cpukit/libcsupport/include/rtems/libio.h @@ -48,8 +48,8 @@ typedef int rtems_filesystem_node_types_t; typedef int (*rtems_filesystem_open_t)( rtems_libio_t *iop, const char *pathname, - unsigned32 flag, - unsigned32 mode + uint32_t flag, + uint32_t mode ); typedef int (*rtems_filesystem_close_t)( @@ -59,18 +59,18 @@ typedef int (*rtems_filesystem_close_t)( typedef ssize_t (*rtems_filesystem_read_t)( rtems_libio_t *iop, void *buffer, - unsigned32 count + uint32_t count ); typedef ssize_t (*rtems_filesystem_write_t)( rtems_libio_t *iop, const void *buffer, - unsigned32 count + uint32_t count ); typedef int (*rtems_filesystem_ioctl_t)( rtems_libio_t *iop, - unsigned32 command, + uint32_t command, void *buffer ); @@ -340,10 +340,10 @@ struct rtems_libio_tt { rtems_driver_name_t *driver; off_t size; /* size of file */ off_t offset; /* current offset into file */ - unsigned32 flags; + uint32_t flags; rtems_filesystem_location_info_t pathinfo; Objects_Id sem; - unsigned32 data0; /* private to "driver" */ + uint32_t data0; /* private to "driver" */ void *data1; /* ... */ void *file_info; /* used by file handlers */ rtems_filesystem_file_handlers_r *handlers; /* type specific handlers */ @@ -358,10 +358,10 @@ struct rtems_libio_tt { typedef struct { rtems_libio_t *iop; off_t offset; - unsigned8 *buffer; - unsigned32 count; - unsigned32 flags; - unsigned32 bytes_moved; + uint8_t *buffer; + uint32_t count; + uint32_t flags; + uint32_t bytes_moved; } rtems_libio_rw_args_t; /* @@ -370,8 +370,8 @@ typedef struct { typedef struct { rtems_libio_t *iop; - unsigned32 flags; - unsigned32 mode; + uint32_t flags; + uint32_t mode; } rtems_libio_open_close_args_t; /* @@ -380,9 +380,9 @@ typedef struct { typedef struct { rtems_libio_t *iop; - unsigned32 command; + uint32_t command; void *buffer; - unsigned32 ioctl_return; + uint32_t ioctl_return; } rtems_libio_ioctl_args_t; /* @@ -406,8 +406,8 @@ void rtems_libio_init(void); typedef int (*rtems_libio_open_t)( const char *pathname, - unsigned32 flag, - unsigned32 mode + uint32_t flag, + uint32_t mode ); typedef int (*rtems_libio_close_t)( @@ -417,18 +417,18 @@ typedef int (*rtems_libio_close_t)( typedef int (*rtems_libio_read_t)( int fd, void *buffer, - unsigned32 count + uint32_t count ); typedef int (*rtems_libio_write_t)( int fd, const void *buffer, - unsigned32 count + uint32_t count ); typedef int (*rtems_libio_ioctl_t)( int fd, - unsigned32 command, + uint32_t command, void *buffer ); @@ -601,7 +601,7 @@ int rtems_termios_dequeue_characters( void rtems_termios_reserve_resources( rtems_configuration_table *configuration, - rtems_unsigned32 number_of_devices + uint32_t number_of_devices ); int unmount( diff --git a/cpukit/libcsupport/include/rtems/libio_.h b/cpukit/libcsupport/include/rtems/libio_.h index 841c3e38a8..cc5b4ff7bc 100644 --- a/cpukit/libcsupport/include/rtems/libio_.h +++ b/cpukit/libcsupport/include/rtems/libio_.h @@ -39,7 +39,7 @@ extern rtems_filesystem_file_handlers_r rtems_filesystem_null_handlers; * File descriptor Table Information */ -extern unsigned32 rtems_libio_number_iops; +extern uint32_t rtems_libio_number_iops; extern rtems_libio_t *rtems_libio_iops; extern rtems_libio_t *rtems_libio_last_iop; extern rtems_libio_t *rtems_libio_iop_freelist; @@ -51,7 +51,7 @@ extern rtems_libio_t *rtems_libio_iop_freelist; */ #define rtems_libio_iop(_fd) \ - ((((unsigned32)(_fd)) < rtems_libio_number_iops) ? \ + ((((uint32_t )(_fd)) < rtems_libio_number_iops) ? \ &rtems_libio_iops[_fd] : 0) /* @@ -86,7 +86,7 @@ extern rtems_libio_t *rtems_libio_iop_freelist; #define rtems_libio_check_fd(_fd) \ do { \ - if ((unsigned32) (_fd) >= rtems_libio_number_iops) { \ + if ((uint32_t ) (_fd) >= rtems_libio_number_iops) { \ errno = EBADF; \ return -1; \ } \ @@ -206,12 +206,12 @@ rtems_status_code rtems_libio_share_private_env(rtems_id task_id) ; rtems_libio_t *rtems_libio_allocate(void); -unsigned32 rtems_libio_fcntl_flags( - unsigned32 fcntl_flags +uint32_t rtems_libio_fcntl_flags( + uint32_t fcntl_flags ); -unsigned32 rtems_libio_to_fcntl_flags( - unsigned32 flags +uint32_t rtems_libio_to_fcntl_flags( + uint32_t flags ); void rtems_libio_free( diff --git a/cpukit/libcsupport/include/rtems/termiostypes.h b/cpukit/libcsupport/include/rtems/termiostypes.h index 6a4852cd08..ab5968d0a2 100644 --- a/cpukit/libcsupport/include/rtems/termiostypes.h +++ b/cpukit/libcsupport/include/rtems/termiostypes.h @@ -90,7 +90,7 @@ struct rtems_termios_tty { * Raw input character buffer */ struct rtems_termios_rawbuf rawInBuf; - rtems_unsigned32 rawInBufSemaphoreOptions; + uint32_t rawInBufSemaphoreOptions; rtems_interval rawInBufSemaphoreTimeout; rtems_interval rawInBufSemaphoreFirstTimeout; unsigned int rawInBufDropped; /* Statistics */ diff --git a/cpukit/libcsupport/include/spurious.h b/cpukit/libcsupport/include/spurious.h index e839eab5cf..729245fb95 100644 --- a/cpukit/libcsupport/include/spurious.h +++ b/cpukit/libcsupport/include/spurious.h @@ -27,7 +27,7 @@ rtems_device_driver Spurious_Initialize( rtems_device_minor_number, void *, rtems_id, - rtems_unsigned32 * + uint32_t * ); #ifdef __cplusplus diff --git a/cpukit/libcsupport/include/timerdrv.h b/cpukit/libcsupport/include/timerdrv.h index 7adb4833e6..9b1772201e 100644 --- a/cpukit/libcsupport/include/timerdrv.h +++ b/cpukit/libcsupport/include/timerdrv.h @@ -23,7 +23,7 @@ extern "C" { void Timer_initialize( void ); -rtems_unsigned32 Read_timer( void ); +uint32_t Read_timer( void ); rtems_status_code Empty_function( void ); diff --git a/cpukit/libcsupport/include/vmeintr.h b/cpukit/libcsupport/include/vmeintr.h index 081acc8883..95d53db263 100644 --- a/cpukit/libcsupport/include/vmeintr.h +++ b/cpukit/libcsupport/include/vmeintr.h @@ -30,7 +30,7 @@ extern "C" { * */ -typedef rtems_unsigned8 VME_interrupt_Mask; +typedef uint8_t VME_interrupt_Mask; /* * VME_interrupt_Disable diff --git a/cpukit/libcsupport/include/zilog/z8036.h b/cpukit/libcsupport/include/zilog/z8036.h index f2f4ec5a21..748736884e 100644 --- a/cpukit/libcsupport/include/zilog/z8036.h +++ b/cpukit/libcsupport/include/zilog/z8036.h @@ -46,58 +46,58 @@ extern "C" { struct z8036_map { /* MAIN CONTROL REGISTERS (0x00-0x07) */ - rtems_unsigned8 MASTER_INTR; /* Master Interrupt Ctl Reg */ - rtems_unsigned8 MASTER_CFG; /* Master Configuration Ctl Reg */ - rtems_unsigned8 PORTA_VECTOR; /* Port A - Interrupt Vector */ - rtems_unsigned8 PORTB_VECTOR; /* Port B - Interrupt Vector */ - rtems_unsigned8 CNT_TMR_VECTOR; /* Counter/Timer Interrupt Vector */ - rtems_unsigned8 PORTC_DATA_POLARITY; /* Port C - Data Path Polarity */ - rtems_unsigned8 PORTC_DIRECTION; /* Port C - Data Direction */ - rtems_unsigned8 PORTC_SPECIAL_IO_CTL; /* Port C - Special IO Control */ + uint8_t MASTER_INTR; /* Master Interrupt Ctl Reg */ + uint8_t MASTER_CFG; /* Master Configuration Ctl Reg */ + uint8_t PORTA_VECTOR; /* Port A - Interrupt Vector */ + uint8_t PORTB_VECTOR; /* Port B - Interrupt Vector */ + uint8_t CNT_TMR_VECTOR; /* Counter/Timer Interrupt Vector */ + uint8_t PORTC_DATA_POLARITY; /* Port C - Data Path Polarity */ + uint8_t PORTC_DIRECTION; /* Port C - Data Direction */ + uint8_t PORTC_SPECIAL_IO_CTL; /* Port C - Special IO Control */ /* MOST OFTEN ACCESSED REGISTERS (0x08 - 0x0f) */ - rtems_unsigned8 PORTA_CMD_STATUS; /* Port A - Command Status Reg */ - rtems_unsigned8 PORTB_CMD_STATUS; /* Port B - Command Status Reg */ - rtems_unsigned8 CT1_CMD_STATUS; /* Ctr/Timer 1 - Command Status Reg */ - rtems_unsigned8 CT2_CMD_STATUS; /* Ctr/Timer 2 - Command Status Reg */ - rtems_unsigned8 CT3_CMD_STATUS; /* Ctr/Timer 3 - Command Status Reg */ - rtems_unsigned8 PORTA_DATA; /* Port A - Data */ - rtems_unsigned8 PORTB_DATA; /* Port B - Data */ - rtems_unsigned8 PORTC_DATA; /* Port C - Data */ + uint8_t PORTA_CMD_STATUS; /* Port A - Command Status Reg */ + uint8_t PORTB_CMD_STATUS; /* Port B - Command Status Reg */ + uint8_t CT1_CMD_STATUS; /* Ctr/Timer 1 - Command Status Reg */ + uint8_t CT2_CMD_STATUS; /* Ctr/Timer 2 - Command Status Reg */ + uint8_t CT3_CMD_STATUS; /* Ctr/Timer 3 - Command Status Reg */ + uint8_t PORTA_DATA; /* Port A - Data */ + uint8_t PORTB_DATA; /* Port B - Data */ + uint8_t PORTC_DATA; /* Port C - Data */ /* COUNTER/TIMER RELATED REGISTERS (0x10-0x1f) */ - rtems_unsigned8 CT1_CUR_CNT_MSB; /* Ctr/Timer 1 - Current Count (MSB) */ - rtems_unsigned8 CT1_CUR_CNT_LSB; /* Ctr/Timer 1 - Current Count (LSB) */ - rtems_unsigned8 CT2_CUR_CNT_MSB; /* Ctr/Timer 2 - Current Count (MSB) */ - rtems_unsigned8 CT2_CUR_CNT_LSB; /* Ctr/Timer 2 - Current Count (LSB) */ - rtems_unsigned8 CT3_CUR_CNT_MSB; /* Ctr/Timer 3 - Current Count (MSB) */ - rtems_unsigned8 CT3_CUR_CNT_LSB; /* Ctr/Timer 3 - Current Count (LSB) */ - rtems_unsigned8 CT1_TIME_CONST_MSB; /* Ctr/Timer 1 - Time Constant (MSB) */ - rtems_unsigned8 CT1_TIME_CONST_LSB; /* Ctr/Timer 1 - Time Constant (LSB) */ - rtems_unsigned8 CT2_TIME_CONST_MSB; /* Ctr/Timer 2 - Time Constant (MSB) */ - rtems_unsigned8 CT2_TIME_CONST_LSB; /* Ctr/Timer 2 - Time Constant (LSB) */ - rtems_unsigned8 CT3_TIME_CONST_MSB; /* Ctr/Timer 3 - Time Constant (MSB) */ - rtems_unsigned8 CT3_TIME_CONST_LSB; /* Ctr/Timer 3 - Time Constant (LSB) */ - rtems_unsigned8 CT1_MODE_SPEC; /* Ctr/Timer 1 - Mode Specification */ - rtems_unsigned8 CT2_MODE_SPEC; /* Ctr/Timer 2 - Mode Specification */ - rtems_unsigned8 CT3_MODE_SPEC; /* Ctr/Timer 3 - Mode Specification */ - rtems_unsigned8 CURRENT_VECTOR; /* Current Vector */ + uint8_t CT1_CUR_CNT_MSB; /* Ctr/Timer 1 - Current Count (MSB) */ + uint8_t CT1_CUR_CNT_LSB; /* Ctr/Timer 1 - Current Count (LSB) */ + uint8_t CT2_CUR_CNT_MSB; /* Ctr/Timer 2 - Current Count (MSB) */ + uint8_t CT2_CUR_CNT_LSB; /* Ctr/Timer 2 - Current Count (LSB) */ + uint8_t CT3_CUR_CNT_MSB; /* Ctr/Timer 3 - Current Count (MSB) */ + uint8_t CT3_CUR_CNT_LSB; /* Ctr/Timer 3 - Current Count (LSB) */ + uint8_t CT1_TIME_CONST_MSB; /* Ctr/Timer 1 - Time Constant (MSB) */ + uint8_t CT1_TIME_CONST_LSB; /* Ctr/Timer 1 - Time Constant (LSB) */ + uint8_t CT2_TIME_CONST_MSB; /* Ctr/Timer 2 - Time Constant (MSB) */ + uint8_t CT2_TIME_CONST_LSB; /* Ctr/Timer 2 - Time Constant (LSB) */ + uint8_t CT3_TIME_CONST_MSB; /* Ctr/Timer 3 - Time Constant (MSB) */ + uint8_t CT3_TIME_CONST_LSB; /* Ctr/Timer 3 - Time Constant (LSB) */ + uint8_t CT1_MODE_SPEC; /* Ctr/Timer 1 - Mode Specification */ + uint8_t CT2_MODE_SPEC; /* Ctr/Timer 2 - Mode Specification */ + uint8_t CT3_MODE_SPEC; /* Ctr/Timer 3 - Mode Specification */ + uint8_t CURRENT_VECTOR; /* Current Vector */ /* PORT A SPECIFICATION REGISTERS (0x20 -0x27) */ - rtems_unsigned8 PORTA_MODE; /* Port A - Mode Specification */ - rtems_unsigned8 PORTA_HANDSHAKE; /* Port A - Handshake Specification */ - rtems_unsigned8 PORTA_DATA_POLARITY; /* Port A - Data Path Polarity */ - rtems_unsigned8 PORTA_DIRECTION; /* Port A - Data Direction */ - rtems_unsigned8 PORTA_SPECIAL_IO_CTL; /* Port A - Special IO Control */ - rtems_unsigned8 PORTA_PATT_POLARITY; /* Port A - Pattern Polarity */ - rtems_unsigned8 PORTA_PATT_TRANS; /* Port A - Pattern Transition */ - rtems_unsigned8 PORTA_PATT_MASK; /* Port A - Pattern Mask */ + uint8_t PORTA_MODE; /* Port A - Mode Specification */ + uint8_t PORTA_HANDSHAKE; /* Port A - Handshake Specification */ + uint8_t PORTA_DATA_POLARITY; /* Port A - Data Path Polarity */ + uint8_t PORTA_DIRECTION; /* Port A - Data Direction */ + uint8_t PORTA_SPECIAL_IO_CTL; /* Port A - Special IO Control */ + uint8_t PORTA_PATT_POLARITY; /* Port A - Pattern Polarity */ + uint8_t PORTA_PATT_TRANS; /* Port A - Pattern Transition */ + uint8_t PORTA_PATT_MASK; /* Port A - Pattern Mask */ /* PORT B SPECIFICATION REGISTERS (0x28-0x2f) */ - rtems_unsigned8 PORTB_MODE; /* Port B - Mode Specification */ - rtems_unsigned8 PORTB_HANDSHAKE; /* Port B - Handshake Specification */ - rtems_unsigned8 PORTB_DATA_POLARITY; /* Port B - Data Path Polarity */ - rtems_unsigned8 PORTB_DIRECTION; /* Port B - Data Direction */ - rtems_unsigned8 PORTB_SPECIAL_IO_CTL; /* Port B - Special IO Control */ - rtems_unsigned8 PORTB_PATT_POLARITY; /* Port B - Pattern Polarity */ - rtems_unsigned8 PORTB_PATT_TRANS; /* Port B - Pattern Transition */ - rtems_unsigned8 PORTB_PATT_MASK; /* Port B - Pattern Mask */ + uint8_t PORTB_MODE; /* Port B - Mode Specification */ + uint8_t PORTB_HANDSHAKE; /* Port B - Handshake Specification */ + uint8_t PORTB_DATA_POLARITY; /* Port B - Data Path Polarity */ + uint8_t PORTB_DIRECTION; /* Port B - Data Direction */ + uint8_t PORTB_SPECIAL_IO_CTL; /* Port B - Special IO Control */ + uint8_t PORTB_PATT_POLARITY; /* Port B - Pattern Polarity */ + uint8_t PORTB_PATT_TRANS; /* Port B - Pattern Transition */ + uint8_t PORTB_PATT_MASK; /* Port B - Pattern Mask */ }; #ifdef __cplusplus diff --git a/cpukit/libcsupport/include/zilog/z8530.h b/cpukit/libcsupport/include/zilog/z8530.h index c097e1b6b6..f77178f8ef 100644 --- a/cpukit/libcsupport/include/zilog/z8530.h +++ b/cpukit/libcsupport/include/zilog/z8530.h @@ -26,7 +26,7 @@ extern "C" { /* macros */ -#define VOL8( ptr ) ((volatile rtems_unsigned8 *)(ptr)) +#define VOL8( ptr ) ((volatile uint8_t *)(ptr)) #define Z8x30_STATE0 ( z8530 ) \ { char *garbage; \ diff --git a/cpukit/libcsupport/include/zilog/z8536.h b/cpukit/libcsupport/include/zilog/z8536.h index ea540ce63d..22457c8bca 100644 --- a/cpukit/libcsupport/include/zilog/z8536.h +++ b/cpukit/libcsupport/include/zilog/z8536.h @@ -29,7 +29,7 @@ extern "C" { /* macros */ -#define VOL8( ptr ) ((volatile rtems_unsigned8 *)(ptr)) +#define VOL8( ptr ) ((volatile uint8_t *)(ptr)) #define Z8x36_STATE0 ( z8536 ) \ { char *garbage; \ diff --git a/cpukit/libcsupport/src/__gettod.c b/cpukit/libcsupport/src/__gettod.c index 5989a8e25f..918c2d3109 100644 --- a/cpukit/libcsupport/src/__gettod.c +++ b/cpukit/libcsupport/src/__gettod.c @@ -49,8 +49,8 @@ int gettimeofday( ) { rtems_interrupt_level level; - rtems_unsigned32 seconds; - rtems_unsigned32 microseconds; + uint32_t seconds; + uint32_t microseconds; if ( !tp ) { errno = EFAULT; diff --git a/cpukit/libcsupport/src/assoc.c b/cpukit/libcsupport/src/assoc.c index 3e4fb21211..a7cd03b162 100644 --- a/cpukit/libcsupport/src/assoc.c +++ b/cpukit/libcsupport/src/assoc.c @@ -38,7 +38,7 @@ rtems_assoc_ptr_by_name( const rtems_assoc_t * rtems_assoc_ptr_by_local( const rtems_assoc_t *ap, - unsigned32 local_value + uint32_t local_value ) { const rtems_assoc_t *default_ap = 0; @@ -57,7 +57,7 @@ rtems_assoc_ptr_by_local( const rtems_assoc_t * rtems_assoc_ptr_by_remote( const rtems_assoc_t *ap, - unsigned32 remote_value + uint32_t remote_value ) { const rtems_assoc_t *default_ap = 0; @@ -77,10 +77,10 @@ rtems_assoc_ptr_by_remote( * Get values */ -unsigned32 +uint32_t rtems_assoc_remote_by_local( const rtems_assoc_t *ap, - unsigned32 local_value + uint32_t local_value ) { const rtems_assoc_t *nap; @@ -91,10 +91,10 @@ rtems_assoc_remote_by_local( return 0; } -unsigned32 +uint32_t rtems_assoc_local_by_remote( const rtems_assoc_t *ap, - unsigned32 remote_value + uint32_t remote_value ) { const rtems_assoc_t *nap; @@ -105,7 +105,7 @@ rtems_assoc_local_by_remote( return 0; } -unsigned32 +uint32_t rtems_assoc_remote_by_name( const rtems_assoc_t *ap, const char *name @@ -119,7 +119,7 @@ rtems_assoc_remote_by_name( return 0; } -unsigned32 +uint32_t rtems_assoc_local_by_name( const rtems_assoc_t *ap, const char *name @@ -139,7 +139,7 @@ rtems_assoc_local_by_name( */ const char *rtems_assoc_name_bad( - unsigned32 bad_value + uint32_t bad_value ); /* body in separate file to reduce dependency on printf */ @@ -148,7 +148,7 @@ const char *rtems_assoc_name_bad( const char * rtems_assoc_name_by_local( const rtems_assoc_t *ap, - unsigned32 local_value + uint32_t local_value ) { const rtems_assoc_t *nap; @@ -162,7 +162,7 @@ rtems_assoc_name_by_local( const char * rtems_assoc_name_by_remote( const rtems_assoc_t *ap, - unsigned32 remote_value + uint32_t remote_value ) { const rtems_assoc_t *nap; @@ -178,13 +178,13 @@ rtems_assoc_name_by_remote( * entries; they do not check for this. */ -unsigned32 rtems_assoc_remote_by_local_bitfield( +uint32_t rtems_assoc_remote_by_local_bitfield( const rtems_assoc_t *ap, - unsigned32 local_value + uint32_t local_value ) { - unsigned32 b; - unsigned32 remote_value = 0; + uint32_t b; + uint32_t remote_value = 0; for (b = 1; b; b <<= 1) if (b & local_value) @@ -194,13 +194,13 @@ unsigned32 rtems_assoc_remote_by_local_bitfield( } -unsigned32 rtems_assoc_local_by_remote_bitfield( +uint32_t rtems_assoc_local_by_remote_bitfield( const rtems_assoc_t *ap, - unsigned32 remote_value + uint32_t remote_value ) { - unsigned32 b; - unsigned32 local_value = 0; + uint32_t b; + uint32_t local_value = 0; for (b = 1; b; b <<= 1) if (b & remote_value) @@ -212,11 +212,11 @@ unsigned32 rtems_assoc_local_by_remote_bitfield( char * rtems_assoc_name_by_remote_bitfield( const rtems_assoc_t *ap, - unsigned32 value, + uint32_t value, char *buffer ) { - unsigned32 b; + uint32_t b; *buffer = 0; @@ -234,11 +234,11 @@ rtems_assoc_name_by_remote_bitfield( char * rtems_assoc_name_by_local_bitfield( const rtems_assoc_t *ap, - unsigned32 value, + uint32_t value, char *buffer ) { - unsigned32 b; + uint32_t b; *buffer = 0; diff --git a/cpukit/libcsupport/src/assocnamebad.c b/cpukit/libcsupport/src/assocnamebad.c index 4a6a52d6c6..7ca0b628f5 100644 --- a/cpukit/libcsupport/src/assocnamebad.c +++ b/cpukit/libcsupport/src/assocnamebad.c @@ -25,7 +25,7 @@ const char * rtems_assoc_name_bad( - unsigned32 bad_value + uint32_t bad_value ) { #ifdef RTEMS_DEBUG diff --git a/cpukit/libcsupport/src/error.c b/cpukit/libcsupport/src/error.c index fff95ce80c..af3f8b0482 100644 --- a/cpukit/libcsupport/src/error.c +++ b/cpukit/libcsupport/src/error.c @@ -108,7 +108,7 @@ rtems_status_text( static int rtems_verror( - unsigned32 error_flag, + uint32_t error_flag, const char *printf_format, va_list arglist ) diff --git a/cpukit/libcsupport/src/libio.c b/cpukit/libcsupport/src/libio.c index bc868dd51a..fc46e45f8e 100644 --- a/cpukit/libcsupport/src/libio.c +++ b/cpukit/libcsupport/src/libio.c @@ -48,7 +48,7 @@ * File descriptor Table Information */ -extern unsigned32 rtems_libio_number_iops; +extern uint32_t rtems_libio_number_iops; rtems_id rtems_libio_semaphore; rtems_libio_t *rtems_libio_iops; rtems_libio_t *rtems_libio_iop_freelist; @@ -121,12 +121,12 @@ rtems_assoc_t status_flags_assoc[] = { { 0, 0, 0 }, }; -unsigned32 rtems_libio_fcntl_flags( - unsigned32 fcntl_flags +uint32_t rtems_libio_fcntl_flags( + uint32_t fcntl_flags ) { - unsigned32 flags = 0; - unsigned32 access_modes; + uint32_t flags = 0; + uint32_t access_modes; /* * Access mode is a small integer @@ -151,11 +151,11 @@ unsigned32 rtems_libio_fcntl_flags( * Convert RTEMS internal flags to UNIX fnctl(2) flags */ -unsigned32 rtems_libio_to_fcntl_flags( - unsigned32 flags +uint32_t rtems_libio_to_fcntl_flags( + uint32_t flags ) { - unsigned32 fcntl_flags = 0; + uint32_t fcntl_flags = 0; if ( (flags & LIBIO_FLAGS_READ_WRITE) == LIBIO_FLAGS_READ_WRITE ) { fcntl_flags |= O_RDWR; diff --git a/cpukit/libcsupport/src/libio_sockets.c b/cpukit/libcsupport/src/libio_sockets.c index dfff46bbea..88db941083 100644 --- a/cpukit/libcsupport/src/libio_sockets.c +++ b/cpukit/libcsupport/src/libio_sockets.c @@ -32,7 +32,7 @@ struct socket *rtems_bsdnet_fdToSocket( rtems_libio_t *iop; /* same as rtems_libio_check_fd(_fd) but different return */ - if ((unsigned32)fd >= rtems_libio_number_iops) { + if ((uint32_t )fd >= rtems_libio_number_iops) { errno = EBADF; return NULL; } diff --git a/cpukit/libcsupport/src/malloc.c b/cpukit/libcsupport/src/malloc.c index ebee514393..56b2f8cfc5 100644 --- a/cpukit/libcsupport/src/malloc.c +++ b/cpukit/libcsupport/src/malloc.c @@ -49,14 +49,14 @@ size_t RTEMS_Malloc_Sbrk_amount; #define MSBUMP(f,n) rtems_malloc_stats.f += (n) struct { - unsigned32 space_available; /* current size of malloc area */ - unsigned32 malloc_calls; /* # calls to malloc */ - unsigned32 free_calls; - unsigned32 realloc_calls; - unsigned32 calloc_calls; - unsigned32 max_depth; /* most ever malloc'd at 1 time */ - unsigned64 lifetime_allocated; - unsigned64 lifetime_freed; + uint32_t space_available; /* current size of malloc area */ + uint32_t malloc_calls; /* # calls to malloc */ + uint32_t free_calls; + uint32_t realloc_calls; + uint32_t calloc_calls; + uint32_t max_depth; /* most ever malloc'd at 1 time */ + uint64_t lifetime_allocated; + uint64_t lifetime_freed; } rtems_malloc_stats; #else /* No rtems_malloc_stats */ @@ -71,8 +71,8 @@ void RTEMS_Malloc_Initialize( { rtems_status_code status; void *starting_address; - rtems_unsigned32 old_address; - rtems_unsigned32 u32_address; + uint32_t old_address; + uint32_t u32_address; /* * Initialize the garbage collection list to start with nothing on it. @@ -91,7 +91,7 @@ void RTEMS_Malloc_Initialize( if (!starting_address) { u32_address = (unsigned int)sbrk(length); - if (u32_address == (rtems_unsigned32) -1) { + if (u32_address == (uint32_t ) -1) { rtems_fatal_error_occurred( RTEMS_NO_MEMORY ); /* DOES NOT RETURN!!! */ } @@ -156,8 +156,8 @@ void *malloc( { void *return_this; void *starting_address; - rtems_unsigned32 the_size; - rtems_unsigned32 sbrk_amount; + uint32_t the_size; + uint32_t sbrk_amount; rtems_status_code status; Chain_Node *to_be_freed; @@ -212,8 +212,8 @@ void *malloc( the_size = ((size + sbrk_amount) / sbrk_amount * sbrk_amount); - if (((rtems_unsigned32)starting_address = (void *)sbrk(the_size)) - == (rtems_unsigned32) -1) + if (((uint32_t )starting_address = (void *)sbrk(the_size)) + == (uint32_t ) -1) return (void *) 0; status = rtems_region_extend( @@ -245,8 +245,8 @@ void *malloc( #ifdef MALLOC_STATS if (return_this) { - unsigned32 actual_size; - unsigned32 current_depth; + uint32_t actual_size; + uint32_t current_depth; status = rtems_region_get_segment_size( RTEMS_Malloc_Heap, return_this, &actual_size); MSBUMP(lifetime_allocated, actual_size); @@ -289,7 +289,7 @@ void *realloc( size_t size ) { - rtems_unsigned32 old_size; + uint32_t old_size; rtems_status_code status; char *new_area; @@ -369,7 +369,7 @@ void free( #ifdef MALLOC_STATS { - unsigned32 size; + uint32_t size; status = rtems_region_get_segment_size( RTEMS_Malloc_Heap, ptr, &size ); if ( status == RTEMS_SUCCESSFUL ) { MSBUMP(lifetime_freed, size); @@ -395,7 +395,7 @@ void free( void malloc_dump(void) { - unsigned32 allocated = rtems_malloc_stats.lifetime_allocated - + uint32_t allocated = rtems_malloc_stats.lifetime_allocated - rtems_malloc_stats.lifetime_freed; printf("Malloc stats\n"); @@ -407,8 +407,8 @@ void malloc_dump(void) (allocated * 100) / rtems_malloc_stats.space_available, (unsigned int) rtems_malloc_stats.max_depth / 1024, (rtems_malloc_stats.max_depth * 100) / rtems_malloc_stats.space_available, - (unsigned64) rtems_malloc_stats.lifetime_allocated / 1024, - (unsigned64) rtems_malloc_stats.lifetime_freed / 1024); + (uint64_t ) rtems_malloc_stats.lifetime_allocated / 1024, + (uint64_t ) rtems_malloc_stats.lifetime_freed / 1024); printf(" Call counts: malloc:%d free:%d realloc:%d calloc:%d\n", rtems_malloc_stats.malloc_calls, rtems_malloc_stats.free_calls, diff --git a/cpukit/libcsupport/src/no_libc.c b/cpukit/libcsupport/src/no_libc.c index 3fea65cd03..afcc30b49c 100644 --- a/cpukit/libcsupport/src/no_libc.c +++ b/cpukit/libcsupport/src/no_libc.c @@ -35,7 +35,7 @@ void libc_suspend_main(void) void libc_global_exit( - rtems_unsigned32 code + uint32_t code ) { } diff --git a/cpukit/libcsupport/src/termios.c b/cpukit/libcsupport/src/termios.c index a6040e24b8..8e053b9c4c 100644 --- a/cpukit/libcsupport/src/termios.c +++ b/cpukit/libcsupport/src/termios.c @@ -787,8 +787,8 @@ rtems_termios_write (void *arg) return sc; } if (tty->termios.c_oflag & OPOST) { - unsigned32 count = args->count; - unsigned8 *buffer = args->buffer; + uint32_t count = args->count; + uint8_t *buffer = args->buffer; while (count--) oproc (*buffer++, tty); args->bytes_moved = args->count; @@ -1109,8 +1109,8 @@ rtems_termios_read (void *arg) { rtems_libio_rw_args_t *args = arg; struct rtems_termios_tty *tty = args->iop->data1; - unsigned32 count = args->count; - unsigned8 *buffer = args->buffer; + uint32_t count = args->count; + uint8_t *buffer = args->buffer; rtems_status_code sc; sc = rtems_semaphore_obtain (tty->isem, RTEMS_WAIT, RTEMS_NO_TIMEOUT); diff --git a/cpukit/libcsupport/src/termiosreserveresources.c b/cpukit/libcsupport/src/termiosreserveresources.c index 86bacc3d53..766763494f 100644 --- a/cpukit/libcsupport/src/termiosreserveresources.c +++ b/cpukit/libcsupport/src/termiosreserveresources.c @@ -16,7 +16,7 @@ static int first_time; /* assumed to be zeroed by BSS initialization */ void rtems_termios_reserve_resources ( rtems_configuration_table *configuration, - rtems_unsigned32 number_of_devices + uint32_t number_of_devices ) { #if 0 -- cgit v1.2.3