From d1c60fbf695735711e9f259a0c0ad095823787c2 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 31 Mar 2004 04:12:24 +0000 Subject: 2004-03-31 Ralf Corsepius * clock/clockdrv.c, include/bsp.h, startup/bspstart.c, timer/timer.c: Convert to using c99 fixed size types. --- c/src/lib/libbsp/mips/jmr3904/ChangeLog | 5 +++++ c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c | 4 ++-- c/src/lib/libbsp/mips/jmr3904/include/bsp.h | 4 ++-- c/src/lib/libbsp/mips/jmr3904/startup/bspstart.c | 4 ++-- c/src/lib/libbsp/mips/jmr3904/timer/timer.c | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) (limited to 'c/src/lib/libbsp/mips') diff --git a/c/src/lib/libbsp/mips/jmr3904/ChangeLog b/c/src/lib/libbsp/mips/jmr3904/ChangeLog index 8c47ba4ca7..05ce2d9cdf 100644 --- a/c/src/lib/libbsp/mips/jmr3904/ChangeLog +++ b/c/src/lib/libbsp/mips/jmr3904/ChangeLog @@ -1,3 +1,8 @@ +2004-03-31 Ralf Corsepius + + * clock/clockdrv.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/mips/jmr3904/clock/clockdrv.c b/c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c index 6bef17496d..0c176366dc 100644 --- a/c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c +++ b/c/src/lib/libbsp/mips/jmr3904/clock/clockdrv.c @@ -23,14 +23,14 @@ #define CLICKS 5000 #define Clock_driver_support_install_isr( _new, _old ) \ do { \ - unsigned32 _clicks = CLICKS; \ + uint32_t _clicks = CLICKS; \ _old = set_vector( _new, CLOCK_VECTOR, 1 ); \ TX3904_TIMER_WRITE( TX3904_TIMER0_BASE, TX3904_TIMER_CCDR, 0x3 ); \ TX3904_TIMER_WRITE( TX3904_TIMER0_BASE, TX3904_TIMER_CPRA, _clicks ); \ TX3904_TIMER_WRITE( TX3904_TIMER0_BASE, TX3904_TIMER_TISR, 0x00 ); \ TX3904_TIMER_WRITE( TX3904_TIMER0_BASE, TX3904_TIMER_ITMR, 0x8001 ); \ TX3904_TIMER_WRITE( TX3904_TIMER0_BASE, TX3904_TIMER_TCR, 0xC0 ); \ - *((volatile unsigned32 *) 0xFFFFC01C) = 0x00000700; \ + *((volatile uint32_t*) 0xFFFFC01C) = 0x00000700; \ } while(0) diff --git a/c/src/lib/libbsp/mips/jmr3904/include/bsp.h b/c/src/lib/libbsp/mips/jmr3904/include/bsp.h index 022d574af4..addf55e223 100644 --- a/c/src/lib/libbsp/mips/jmr3904/include/bsp.h +++ b/c/src/lib/libbsp/mips/jmr3904/include/bsp.h @@ -66,13 +66,13 @@ extern "C" { #define Cause_tm27_intr() \ do { \ - unsigned32 _clicks = 20; \ + uint32_t _clicks = 20; \ TX3904_TIMER_WRITE( TX3904_TIMER0_BASE, TX3904_TIMER_CCDR, 0x3 ); \ TX3904_TIMER_WRITE( TX3904_TIMER0_BASE, TX3904_TIMER_CPRA, _clicks ); \ TX3904_TIMER_WRITE( TX3904_TIMER0_BASE, TX3904_TIMER_TISR, 0x00 ); \ TX3904_TIMER_WRITE( TX3904_TIMER0_BASE, TX3904_TIMER_ITMR, 0x8001 ); \ TX3904_TIMER_WRITE( TX3904_TIMER0_BASE, TX3904_TIMER_TCR, 0xC0 ); \ - *((volatile unsigned32 *) 0xFFFFC01C) = 0x00000700; \ + *((volatile uint32_t*) 0xFFFFC01C) = 0x00000700; \ } while(0) #define Clear_tm27_intr() \ diff --git a/c/src/lib/libbsp/mips/jmr3904/startup/bspstart.c b/c/src/lib/libbsp/mips/jmr3904/startup/bspstart.c index e50582d38e..425808c59d 100644 --- a/c/src/lib/libbsp/mips/jmr3904/startup/bspstart.c +++ b/c/src/lib/libbsp/mips/jmr3904/startup/bspstart.c @@ -38,7 +38,7 @@ char *rtems_progname; */ void bsp_postdriver_hook(void); -void bsp_libc_init( void *, unsigned32, int ); +void bsp_libc_init( void *, uint32_t, int ); /* * Function: bsp_pretasking_hook @@ -61,7 +61,7 @@ void bsp_pretasking_hook(void) void *heapStart = &HeapBase; unsigned long heapSize = (unsigned long)&HeapSize; - bsp_libc_init(heapStart, (unsigned32) heapSize, 0); + bsp_libc_init(heapStart, (uint32_t) heapSize, 0); #ifdef RTEMS_DEBUG rtems_debug_enable( RTEMS_DEBUG_ALL_MASK ); diff --git a/c/src/lib/libbsp/mips/jmr3904/timer/timer.c b/c/src/lib/libbsp/mips/jmr3904/timer/timer.c index f26f8cec89..101f6e4aa8 100644 --- a/c/src/lib/libbsp/mips/jmr3904/timer/timer.c +++ b/c/src/lib/libbsp/mips/jmr3904/timer/timer.c @@ -47,7 +47,7 @@ void Timer_initialize() int Read_timer() { - rtems_unsigned32 total; + uint32_t total; total = TX3904_TIMER_READ( TX3904_TIMER1_BASE, TX3904_TIMER_TRR ); -- cgit v1.2.3