From f0cbd19e59d46a48251e2cb85a6a5ec9bf4a2b4d Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 31 Mar 2004 05:08:27 +0000 Subject: 2004-03-31 Ralf Corsepius * clock/ckinit.c, include/bsp.h, startup/bspstart.c, timer/timer.c: Convert to using c99 fixed size types. --- c/src/lib/libbsp/i386/i386ex/ChangeLog | 5 +++++ c/src/lib/libbsp/i386/i386ex/clock/ckinit.c | 6 +++--- c/src/lib/libbsp/i386/i386ex/include/bsp.h | 2 +- c/src/lib/libbsp/i386/i386ex/startup/bspstart.c | 10 +++++----- c/src/lib/libbsp/i386/i386ex/timer/timer.c | 4 ++-- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog index 170dd854db..beaef940f5 100644 --- a/c/src/lib/libbsp/i386/i386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog @@ -1,3 +1,8 @@ +2004-03-31 Ralf Corsepius + + * clock/ckinit.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/i386/i386ex/clock/ckinit.c b/c/src/lib/libbsp/i386/i386ex/clock/ckinit.c index db3e3a8b59..0bece0732a 100644 --- a/c/src/lib/libbsp/i386/i386ex/clock/ckinit.c +++ b/c/src/lib/libbsp/i386/i386ex/clock/ckinit.c @@ -31,10 +31,10 @@ #include -rtems_unsigned32 Clock_isrs; /* ISRs until next tick */ -static rtems_unsigned32 Clock_initial_isr_value; +uint32_t Clock_isrs; /* ISRs until next tick */ +static uint32_t Clock_initial_isr_value; -volatile rtems_unsigned32 Clock_driver_ticks; +volatile uint32_t Clock_driver_ticks; void Clock_exit( void ); diff --git a/c/src/lib/libbsp/i386/i386ex/include/bsp.h b/c/src/lib/libbsp/i386/i386ex/include/bsp.h index 457ac39080..4d3a728cb2 100644 --- a/c/src/lib/libbsp/i386/i386ex/include/bsp.h +++ b/c/src/lib/libbsp/i386/i386ex/include/bsp.h @@ -75,7 +75,7 @@ extern "C" { #define rtems_bsp_delay( _microseconds ) \ { \ - rtems_unsigned32 _counter; \ + uint32_t _counter; \ \ _counter = (_microseconds); \ \ diff --git a/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c b/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c index 63bc1aba3f..088796bdc5 100644 --- a/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c +++ b/c/src/lib/libbsp/i386/i386ex/startup/bspstart.c @@ -41,14 +41,14 @@ rtems_cpu_table Cpu_table; * Tells us where to put the workspace in case remote debugger is present. */ -extern rtems_unsigned32 rdb_start; +extern uint32_t rdb_start; /* * Use the shared implementations of the following routines */ void bsp_postdriver_hook(void); -void bsp_libc_init( void *, unsigned32, int ); +void bsp_libc_init( void *, uint32_t, int ); /* * Function: bsp_pretasking_hook @@ -67,10 +67,10 @@ void bsp_libc_init( void *, unsigned32, int ); void bsp_pretasking_hook(void) { extern int heap_bottom; - rtems_unsigned32 heap_start; - rtems_unsigned32 heap_size; + uint32_t heap_start; + uint32_t heap_size; - heap_start = (rtems_unsigned32) &heap_bottom; + heap_start = (uint32_t) &heap_bottom; if (heap_start & (CPU_ALIGNMENT-1)) heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1); diff --git a/c/src/lib/libbsp/i386/i386ex/timer/timer.c b/c/src/lib/libbsp/i386/i386ex/timer/timer.c index 1640c49770..555676e5e1 100644 --- a/c/src/lib/libbsp/i386/i386ex/timer/timer.c +++ b/c/src/lib/libbsp/i386/i386ex/timer/timer.c @@ -110,8 +110,8 @@ void Timer_initialize() int Read_timer() { - register rtems_unsigned32 clicks; - register rtems_unsigned32 total; + register uint32_t clicks; + register uint32_t total; /* outport_byte( TBCR, 0x00 ); stop the timer -- not needed on intel */ -- cgit v1.2.3