From d85c279e7ea918a583805d37f39fa6e214b9c8e2 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 31 Mar 2004 04:16:57 +0000 Subject: 2004-03-31 Ralf Corsepius * clock/clock.c, include/bsp.h, startup/bspstart.c, timer/timer.c: Convert to using c99 fixed size types. --- c/src/lib/libbsp/c4x/c4xsim/ChangeLog | 5 +++++ c/src/lib/libbsp/c4x/c4xsim/clock/clock.c | 8 ++++---- c/src/lib/libbsp/c4x/c4xsim/include/bsp.h | 2 +- c/src/lib/libbsp/c4x/c4xsim/startup/bspstart.c | 6 +++--- c/src/lib/libbsp/c4x/c4xsim/timer/timer.c | 8 ++++---- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog index 449b79c9b9..0ef9aaab3a 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/ChangeLog +++ b/c/src/lib/libbsp/c4x/c4xsim/ChangeLog @@ -1,3 +1,8 @@ +2004-03-31 Ralf Corsepius + + * clock/clock.c, include/bsp.h, startup/bspstart.c, timer/timer.c: + Convert to using c99 fixed size types. + 2004-02-19 Ralf Corsepius * Makefile.am: Reflect changes to bsp.am. diff --git a/c/src/lib/libbsp/c4x/c4xsim/clock/clock.c b/c/src/lib/libbsp/c4x/c4xsim/clock/clock.c index 377a20f3ac..794f766d0d 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/clock/clock.c +++ b/c/src/lib/libbsp/c4x/c4xsim/clock/clock.c @@ -22,7 +22,7 @@ void Clock_exit( void ); rtems_isr Clock_isr( rtems_vector_number vector ); -rtems_unsigned32 Clock_counter_register_value; +uint32_t Clock_counter_register_value; /* * The interrupt vector number associated with the clock tick device @@ -36,7 +36,7 @@ rtems_unsigned32 Clock_counter_register_value; * number of clock ticks since the driver was initialized. */ -volatile rtems_unsigned32 Clock_driver_ticks; +volatile uint32_t Clock_driver_ticks; /* * These are set by clock driver during its init @@ -128,7 +128,7 @@ void Install_clock( Clock_counter_register_value = (unsigned int) tmp; #if 0 Clock_counter_register_value = - (unsigned32) ((float) BSP_Configuration.microseconds_per_tick / + (uint32_t) ((float) BSP_Configuration.microseconds_per_tick / ((float)_ClockFrequency / 2.0))); #endif c4x_timer_stop( C4X_TIMER_0 ); @@ -202,7 +202,7 @@ rtems_device_driver Clock_control( void *pargp ) { - rtems_unsigned32 isrlevel; + uint32_t isrlevel; rtems_libio_ioctl_args_t *args = pargp; if (args == 0) diff --git a/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h b/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h index 12eb855921..12a4fe684c 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h +++ b/c/src/lib/libbsp/c4x/c4xsim/include/bsp.h @@ -108,7 +108,7 @@ extern rtems_configuration_table BSP_Configuration; /* owned by BSP */ extern rtems_cpu_table Cpu_table; /* owned by BSP */ -extern rtems_unsigned32 bsp_isr_level; +extern uint32_t bsp_isr_level; #endif /* ASM */ diff --git a/c/src/lib/libbsp/c4x/c4xsim/startup/bspstart.c b/c/src/lib/libbsp/c4x/c4xsim/startup/bspstart.c index 57185dbdc1..c38664cdce 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/startup/bspstart.c +++ b/c/src/lib/libbsp/c4x/c4xsim/startup/bspstart.c @@ -35,7 +35,7 @@ rtems_cpu_table Cpu_table; */ void bsp_postdriver_hook(void); -void bsp_libc_init( void *, unsigned32, int ); +void bsp_libc_init( void *, uint32_t, int ); extern void bsp_spurious_initialize(); /* @@ -48,7 +48,7 @@ extern void bsp_spurious_initialize(); void bsp_pretasking_hook(void) { extern void *_HeapStart; - extern rtems_unsigned32 _HeapSize; + extern uint32_t _HeapSize; bsp_libc_init(&_HeapStart, (unsigned int) &_HeapSize, 0); @@ -74,7 +74,7 @@ extern void C4X_BSP_output_char(char c); void bsp_start( void ) { extern void *_WorkspaceBase; - extern rtems_unsigned32 _WorkspaceMax; + extern uint32_t _WorkspaceMax; /* * Set up our hooks * Make sure libc_init is done before drivers initialized so that diff --git a/c/src/lib/libbsp/c4x/c4xsim/timer/timer.c b/c/src/lib/libbsp/c4x/c4xsim/timer/timer.c index 60d3de12e1..5a4963ac3b 100644 --- a/c/src/lib/libbsp/c4x/c4xsim/timer/timer.c +++ b/c/src/lib/libbsp/c4x/c4xsim/timer/timer.c @@ -22,10 +22,10 @@ #include #include -rtems_unsigned32 Timer_interrupts; +uint32_t Timer_interrupts; rtems_boolean Timer_driver_Find_average_overhead; -static unsigned32 start; +static uint32_t start; void Timer_initialize( void ) { @@ -65,8 +65,8 @@ void Timer_initialize( void ) int Read_timer( void ) { - rtems_unsigned32 clicks; - rtems_unsigned32 total; + uint32_t clicks; + uint32_t total; int tmp; /* -- cgit v1.2.3