From a2ac7e100a2a3b061e8afe0d15d8867ce4abe63e Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 31 Mar 2004 05:21:47 +0000 Subject: 2004-03-31 Ralf Corsepius * bsplibc.c, clockdrv_shell.c, ide_ctrl.c, tod.c, gdbstub/rtems-stub-glue.c: Convert to using c99 fixed size types. --- c/src/lib/libbsp/shared/ChangeLog | 5 +++ c/src/lib/libbsp/shared/bsplibc.c | 2 +- c/src/lib/libbsp/shared/clockdrv_shell.c | 6 +-- c/src/lib/libbsp/shared/gdbstub/rtems-stub-glue.c | 50 +++++++++++------------ c/src/lib/libbsp/shared/ide_ctrl.c | 18 ++++---- c/src/lib/libbsp/shared/tod.c | 6 +-- 6 files changed, 46 insertions(+), 41 deletions(-) (limited to 'c/src/lib/libbsp/shared') diff --git a/c/src/lib/libbsp/shared/ChangeLog b/c/src/lib/libbsp/shared/ChangeLog index fe4302db4a..af51acce65 100644 --- a/c/src/lib/libbsp/shared/ChangeLog +++ b/c/src/lib/libbsp/shared/ChangeLog @@ -1,3 +1,8 @@ +2004-03-31 Ralf Corsepius + + * bsplibc.c, clockdrv_shell.c, ide_ctrl.c, tod.c, + gdbstub/rtems-stub-glue.c: Convert to using c99 fixed size types. + 2004-01-23 Ralf Corsepius * ChangeLog: Merge-in gdbstub/ChangeLog. diff --git a/c/src/lib/libbsp/shared/bsplibc.c b/c/src/lib/libbsp/shared/bsplibc.c index eee38aa87c..f5b4f3e68a 100644 --- a/c/src/lib/libbsp/shared/bsplibc.c +++ b/c/src/lib/libbsp/shared/bsplibc.c @@ -13,7 +13,7 @@ extern rtems_configuration_table BSP_Configuration; void bsp_libc_init( void *heap_start, - unsigned32 heap_size, + uint32_t heap_size, int use_sbrk ) { diff --git a/c/src/lib/libbsp/shared/clockdrv_shell.c b/c/src/lib/libbsp/shared/clockdrv_shell.c index f42d9c18a6..c36fbebc83 100644 --- a/c/src/lib/libbsp/shared/clockdrv_shell.c +++ b/c/src/lib/libbsp/shared/clockdrv_shell.c @@ -25,14 +25,14 @@ */ #ifdef CLOCK_DRIVER_ISRS_PER_TICK -volatile rtems_unsigned32 Clock_driver_isrs; +volatile uint32_t Clock_driver_isrs; #endif /* * Clock ticks since initialization */ -volatile rtems_unsigned32 Clock_driver_ticks; +volatile uint32_t Clock_driver_ticks; /* * ISR formerly installed. @@ -234,7 +234,7 @@ rtems_device_driver Clock_control( void *pargp ) { - rtems_unsigned32 isrlevel; + uint32_t isrlevel; rtems_libio_ioctl_args_t *args = pargp; rtems_isr_entry ignored_ticker; diff --git a/c/src/lib/libbsp/shared/gdbstub/rtems-stub-glue.c b/c/src/lib/libbsp/shared/gdbstub/rtems-stub-glue.c index 3e05cd85e4..54288eaa21 100644 --- a/c/src/lib/libbsp/shared/gdbstub/rtems-stub-glue.c +++ b/c/src/lib/libbsp/shared/gdbstub/rtems-stub-glue.c @@ -319,7 +319,7 @@ int rtems_gdb_stub_get_thread_info( int first_posix_id, first_rtems_id; Objects_Information *obj_info; Thread_Control *th; - unsigned32 name; + uint32_t name; char tmp_buf[20]; ASSERT(info != NULL); @@ -372,9 +372,9 @@ int rtems_gdb_stub_get_thread_info( strcat(info->display, tmp_buf); #if 0 - name = *(unsigned32 *)(obj_info->local_table[thread]->name); + name = *(uint32_t*)(obj_info->local_table[thread]->name); #else - name = *(unsigned32 *)(obj_info->local_table[thread - + name = *(uint32_t*)(obj_info->local_table[thread - first_rtems_id + 1]->name); #endif info->name[0] = (name >> 24) & 0xff; @@ -416,7 +416,7 @@ int rtems_gdb_stub_get_thread_info( strcat(info->display, tmp_buf); - name = *(unsigned32 *)(obj_info->local_table[thread - + name = *(uint32_t*)(obj_info->local_table[thread - first_posix_id + 1]->name); info->name[0] = (name >> 24) & 0xff; @@ -1395,9 +1395,9 @@ int rtems_gdb_stub_get_offsets( ) { /* - extern unsigned32 _ftext; - extern unsigned32 _fdata; - extern unsigned32 _bss_start; + extern uint32_t _ftext; + extern uint32_t _fdata; + extern uint32_t _bss_start; *text_addr = &_ftext; *data_addr = &_fdata; @@ -1424,27 +1424,27 @@ void rtems_gdb_stub_get_registers_from_context( */ registers[D0] = 0; registers[D1] = 0; - registers[D2] = (unsigned32)th->Registers.d2; - registers[D3] = (unsigned32)th->Registers.d3; - registers[D4] = (unsigned32)th->Registers.d4; - registers[D5] = (unsigned32)th->Registers.d5; - registers[D6] = (unsigned32)th->Registers.d6; - registers[D7] = (unsigned32)th->Registers.d7; + registers[D2] = (uint32_t)th->Registers.d2; + registers[D3] = (uint32_t)th->Registers.d3; + registers[D4] = (uint32_t)th->Registers.d4; + registers[D5] = (uint32_t)th->Registers.d5; + registers[D6] = (uint32_t)th->Registers.d6; + registers[D7] = (uint32_t)th->Registers.d7; registers[A0] = 0; registers[A1] = 0; - registers[A2] = (unsigned32)th->Registers.a2; - registers[A3] = (unsigned32)th->Registers.a3; - registers[A4] = (unsigned32)th->Registers.a4; - registers[A5] = (unsigned32)th->Registers.a5; - registers[A6] = (unsigned32)th->Registers.a6; - registers[A7] = (unsigned32)th->Registers.a7_msp; + registers[A2] = (uint32_t)th->Registers.a2; + registers[A3] = (uint32_t)th->Registers.a3; + registers[A4] = (uint32_t)th->Registers.a4; + registers[A5] = (uint32_t)th->Registers.a5; + registers[A6] = (uint32_t)th->Registers.a6; + registers[A7] = (uint32_t)th->Registers.a7_msp; - registers[PS] = (unsigned32)th->Registers.sr; + registers[PS] = (uint32_t)th->Registers.sr; #if 0 - registers[PC] = *(unsigned32 *)th->Registers.a7_msp; /* *SP = ret adr */ + registers[PC] = *(uint32_t*)th->Registers.a7_msp; /* *SP = ret adr */ #else - registers[PC] = (unsigned32)_CPU_Context_switch; + registers[PC] = (uint32_t)_CPU_Context_switch; #endif } @@ -1456,9 +1456,9 @@ int rtems_gdb_stub_get_offsets( ) { /* - extern unsigned32 _ftext; - extern unsigned32 _fdata; - extern unsigned32 _bss_start; + extern uint32_t _ftext; + extern uint32_t _fdata; + extern uint32_t _bss_start; *text_addr = &_ftext; *data_addr = &_fdata; diff --git a/c/src/lib/libbsp/shared/ide_ctrl.c b/c/src/lib/libbsp/shared/ide_ctrl.c index 3de7f312cc..407a599473 100644 --- a/c/src/lib/libbsp/shared/ide_ctrl.c +++ b/c/src/lib/libbsp/shared/ide_ctrl.c @@ -84,10 +84,10 @@ ide_controller_initialize(rtems_device_major_number major, */ void ide_controller_read_data_block(rtems_device_minor_number minor, - unsigned16 block_size, + uint16_t block_size, blkdev_sg_buffer *bufs, - rtems_unsigned32 *cbuf, - rtems_unsigned32 *pos) + uint32_t *cbuf, + uint32_t *pos) { IDE_Controller_Table[minor].fns->ctrl_read_block(minor, block_size, bufs, cbuf, pos); @@ -109,10 +109,10 @@ ide_controller_read_data_block(rtems_device_minor_number minor, */ void ide_controller_write_data_block(rtems_device_minor_number minor, - unsigned16 block_size, + uint16_t block_size, blkdev_sg_buffer *bufs, - rtems_unsigned32 *cbuf, - rtems_unsigned32 *pos) + uint32_t *cbuf, + uint32_t *pos) { IDE_Controller_Table[minor].fns->ctrl_write_block(minor, block_size, bufs, @@ -134,7 +134,7 @@ ide_controller_write_data_block(rtems_device_minor_number minor, void ide_controller_read_register(rtems_device_minor_number minor, int reg, - unsigned16 *value) + uint16_t *value) { IDE_Controller_Table[minor].fns->ctrl_reg_read(minor, reg, value); } @@ -153,7 +153,7 @@ ide_controller_read_register(rtems_device_minor_number minor, */ void ide_controller_write_register(rtems_device_minor_number minor, int reg, - unsigned16 value) + uint16_t value) { IDE_Controller_Table[minor].fns->ctrl_reg_write(minor, reg, value); } @@ -171,7 +171,7 @@ ide_controller_write_register(rtems_device_minor_number minor, int reg, * error occured */ rtems_status_code -ide_controller_config_io_speed(int minor, unsigned8 modes_avaible) +ide_controller_config_io_speed(int minor, uint8_t modes_avaible) { return IDE_Controller_Table[minor].fns->ctrl_config_io_speed( minor, diff --git a/c/src/lib/libbsp/shared/tod.c b/c/src/lib/libbsp/shared/tod.c index c09bd592ba..8e1a1c390c 100644 --- a/c/src/lib/libbsp/shared/tod.c +++ b/c/src/lib/libbsp/shared/tod.c @@ -220,14 +220,14 @@ int setRealTime( */ /* XXX this routine should be part of the public RTEMS interface */ -unsigned32 _TOD_To_seconds( rtems_time_of_day *tod ); +uint32_t _TOD_To_seconds( rtems_time_of_day *tod ); int checkRealTime() { rtems_time_of_day rtems_tod; rtems_time_of_day rtc_tod; - unsigned32 rtems_time; - unsigned32 rtc_time; + uint32_t rtems_time; + uint32_t rtc_time; if (!RTC_Present) return -1; -- cgit v1.2.3