RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source 
* bsplibc.c, clockdrv_shell.c, ide_ctrl.c, tod.c,
	gdbstub/rtems-stub-glue.c: Convert to using c99 fixed size types.
This commit is contained in:
Ralf Corsepius
2004-03-31 05:21:47 +00:00
parent 6505d3facc
commit a2ac7e100a
6 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/shared/ChangeLog
View File

@@ -1,3 +1,8 @@
2004-03-31 Ralf Corsepius <ralf_corsepius@rtems.org>
* 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 <corsepiu@faw.uni-ulm.de> 2004-01-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* ChangeLog: Merge-in gdbstub/ChangeLog. * ChangeLog: Merge-in gdbstub/ChangeLog.

2
c/src/lib/libbsp/shared/bsplibc.c
View File

@@ -13,7 +13,7 @@ extern rtems_configuration_table BSP_Configuration;
void bsp_libc_init( void bsp_libc_init(
void *heap_start, void *heap_start,
unsigned32 heap_size, uint32_t heap_size,
int use_sbrk int use_sbrk
) )
{ {

6
c/src/lib/libbsp/shared/clockdrv_shell.c
View File

@@ -25,14 +25,14 @@
*/ */
#ifdef CLOCK_DRIVER_ISRS_PER_TICK #ifdef CLOCK_DRIVER_ISRS_PER_TICK
volatile rtems_unsigned32 Clock_driver_isrs; volatile uint32_t Clock_driver_isrs;
#endif #endif
/* /*
* Clock ticks since initialization * Clock ticks since initialization
*/ */
volatile rtems_unsigned32 Clock_driver_ticks; volatile uint32_t Clock_driver_ticks;
/* /*
* ISR formerly installed. * ISR formerly installed.
@@ -234,7 +234,7 @@ rtems_device_driver Clock_control(
void *pargp void *pargp
) )
{ {
rtems_unsigned32 isrlevel; uint32_t isrlevel;
rtems_libio_ioctl_args_t *args = pargp; rtems_libio_ioctl_args_t *args = pargp;
rtems_isr_entry ignored_ticker; rtems_isr_entry ignored_ticker;

50
c/src/lib/libbsp/shared/gdbstub/rtems-stub-glue.c
View File

@@ -319,7 +319,7 @@ int rtems_gdb_stub_get_thread_info(
int first_posix_id, first_rtems_id; int first_posix_id, first_rtems_id;
Objects_Information *obj_info; Objects_Information *obj_info;
Thread_Control *th; Thread_Control *th;
unsigned32 name; uint32_t name;
char tmp_buf[20]; char tmp_buf[20];
ASSERT(info != NULL); ASSERT(info != NULL);
@@ -372,9 +372,9 @@ int rtems_gdb_stub_get_thread_info(
strcat(info->display, tmp_buf); strcat(info->display, tmp_buf);
#if 0 #if 0
name = *(unsigned32 *)(obj_info->local_table[thread]->name); name = *(uint32_t*)(obj_info->local_table[thread]->name);
#else #else
name = *(unsigned32 *)(obj_info->local_table[thread - name = *(uint32_t*)(obj_info->local_table[thread -
first_rtems_id + 1]->name); first_rtems_id + 1]->name);
#endif #endif
info->name[0] = (name >> 24) & 0xff; info->name[0] = (name >> 24) & 0xff;
@@ -416,7 +416,7 @@ int rtems_gdb_stub_get_thread_info(
strcat(info->display, tmp_buf); 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); first_posix_id + 1]->name);
info->name[0] = (name >> 24) & 0xff; info->name[0] = (name >> 24) & 0xff;
@@ -1395,9 +1395,9 @@ int rtems_gdb_stub_get_offsets(
) )
{ {
/* /*
extern unsigned32 _ftext; extern uint32_t _ftext;
extern unsigned32 _fdata; extern uint32_t _fdata;
extern unsigned32 _bss_start; extern uint32_t _bss_start;
*text_addr = &_ftext; *text_addr = &_ftext;
*data_addr = &_fdata; *data_addr = &_fdata;
@@ -1424,27 +1424,27 @@ void rtems_gdb_stub_get_registers_from_context(
*/ */
registers[D0] = 0; registers[D0] = 0;
registers[D1] = 0; registers[D1] = 0;
registers[D2] = (unsigned32)th->Registers.d2; registers[D2] = (uint32_t)th->Registers.d2;
registers[D3] = (unsigned32)th->Registers.d3; registers[D3] = (uint32_t)th->Registers.d3;
registers[D4] = (unsigned32)th->Registers.d4; registers[D4] = (uint32_t)th->Registers.d4;
registers[D5] = (unsigned32)th->Registers.d5; registers[D5] = (uint32_t)th->Registers.d5;
registers[D6] = (unsigned32)th->Registers.d6; registers[D6] = (uint32_t)th->Registers.d6;
registers[D7] = (unsigned32)th->Registers.d7; registers[D7] = (uint32_t)th->Registers.d7;
registers[A0] = 0; registers[A0] = 0;
registers[A1] = 0; registers[A1] = 0;
registers[A2] = (unsigned32)th->Registers.a2; registers[A2] = (uint32_t)th->Registers.a2;
registers[A3] = (unsigned32)th->Registers.a3; registers[A3] = (uint32_t)th->Registers.a3;
registers[A4] = (unsigned32)th->Registers.a4; registers[A4] = (uint32_t)th->Registers.a4;
registers[A5] = (unsigned32)th->Registers.a5; registers[A5] = (uint32_t)th->Registers.a5;
registers[A6] = (unsigned32)th->Registers.a6; registers[A6] = (uint32_t)th->Registers.a6;
registers[A7] = (unsigned32)th->Registers.a7_msp; registers[A7] = (uint32_t)th->Registers.a7_msp;
registers[PS] = (unsigned32)th->Registers.sr; registers[PS] = (uint32_t)th->Registers.sr;
#if 0 #if 0
registers[PC] = *(unsigned32 *)th->Registers.a7_msp; /* *SP = ret adr */ registers[PC] = *(uint32_t*)th->Registers.a7_msp; /* *SP = ret adr */
#else #else
registers[PC] = (unsigned32)_CPU_Context_switch; registers[PC] = (uint32_t)_CPU_Context_switch;
#endif #endif
} }
@@ -1456,9 +1456,9 @@ int rtems_gdb_stub_get_offsets(
) )
{ {
/* /*
extern unsigned32 _ftext; extern uint32_t _ftext;
extern unsigned32 _fdata; extern uint32_t _fdata;
extern unsigned32 _bss_start; extern uint32_t _bss_start;
*text_addr = &_ftext; *text_addr = &_ftext;
*data_addr = &_fdata; *data_addr = &_fdata;

18
c/src/lib/libbsp/shared/ide_ctrl.c
View File

@@ -84,10 +84,10 @@ ide_controller_initialize(rtems_device_major_number major,
*/ */
void void
ide_controller_read_data_block(rtems_device_minor_number minor, ide_controller_read_data_block(rtems_device_minor_number minor,
unsigned16 block_size, uint16_t block_size,
blkdev_sg_buffer *bufs, blkdev_sg_buffer *bufs,
rtems_unsigned32 *cbuf, uint32_t *cbuf,
rtems_unsigned32 *pos) uint32_t *pos)
{ {
IDE_Controller_Table[minor].fns->ctrl_read_block(minor, block_size, bufs, IDE_Controller_Table[minor].fns->ctrl_read_block(minor, block_size, bufs,
cbuf, pos); cbuf, pos);
@@ -109,10 +109,10 @@ ide_controller_read_data_block(rtems_device_minor_number minor,
*/ */
void void
ide_controller_write_data_block(rtems_device_minor_number minor, ide_controller_write_data_block(rtems_device_minor_number minor,
unsigned16 block_size, uint16_t block_size,
blkdev_sg_buffer *bufs, blkdev_sg_buffer *bufs,
rtems_unsigned32 *cbuf, uint32_t *cbuf,
rtems_unsigned32 *pos) uint32_t *pos)
{ {
IDE_Controller_Table[minor].fns->ctrl_write_block(minor, block_size, bufs, 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 void
ide_controller_read_register(rtems_device_minor_number minor, ide_controller_read_register(rtems_device_minor_number minor,
int reg, int reg,
unsigned16 *value) uint16_t *value)
{ {
IDE_Controller_Table[minor].fns->ctrl_reg_read(minor, reg, 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 void
ide_controller_write_register(rtems_device_minor_number minor, int reg, 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); 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 * error occured
*/ */
rtems_status_code 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( return IDE_Controller_Table[minor].fns->ctrl_config_io_speed(
minor, minor,

6
c/src/lib/libbsp/shared/tod.c
View File

@@ -220,14 +220,14 @@ int setRealTime(
*/ */
/* XXX this routine should be part of the public RTEMS interface */ /* 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() int checkRealTime()
{ {
rtems_time_of_day rtems_tod; rtems_time_of_day rtems_tod;
rtems_time_of_day rtc_tod; rtems_time_of_day rtc_tod;
unsigned32 rtems_time; uint32_t rtems_time;
unsigned32 rtc_time; uint32_t rtc_time;
if (!RTC_Present) if (!RTC_Present)
return -1; return -1;