From 1d5c9757d724075bf9f4592a400ac3edba38b8d0 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 31 Mar 2004 04:21:06 +0000 Subject: 2004-03-31 Ralf Corsepius * clock/ckinit.c, console/concntl.h, console/console.c, include/bsp.h, startup/bspstart.c, timer/timer.c: Convert to using c99 fixed size types. --- c/src/lib/libbsp/i960/rxgen960/ChangeLog | 6 ++++++ c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c | 8 ++++---- c/src/lib/libbsp/i960/rxgen960/console/concntl.h | 2 +- c/src/lib/libbsp/i960/rxgen960/console/console.c | 10 +++++----- c/src/lib/libbsp/i960/rxgen960/include/bsp.h | 4 ++-- c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c | 8 ++++---- c/src/lib/libbsp/i960/rxgen960/timer/timer.c | 2 +- 7 files changed, 23 insertions(+), 17 deletions(-) (limited to 'c/src/lib/libbsp/i960') diff --git a/c/src/lib/libbsp/i960/rxgen960/ChangeLog b/c/src/lib/libbsp/i960/rxgen960/ChangeLog index 4b2f58c749..e413869ceb 100644 --- a/c/src/lib/libbsp/i960/rxgen960/ChangeLog +++ b/c/src/lib/libbsp/i960/rxgen960/ChangeLog @@ -1,3 +1,9 @@ +2004-03-31 Ralf Corsepius + + * clock/ckinit.c, console/concntl.h, console/console.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/i960/rxgen960/clock/ckinit.c b/c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c index 9ccf2f3367..5da3df2c7f 100644 --- a/c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c +++ b/c/src/lib/libbsp/i960/rxgen960/clock/ckinit.c @@ -25,11 +25,11 @@ #define CLOCK_VECTOR 0x92 -rtems_unsigned32 Clock_isrs; /* ISRs until next tick */ -rtems_unsigned32 Reload_Clock_isrs; +uint32_t Clock_isrs; /* ISRs until next tick */ +uint32_t Reload_Clock_isrs; i960_isr_entry Old_ticker; -volatile rtems_unsigned32 Clock_driver_ticks; +volatile uint32_t Clock_driver_ticks; /* ticks since initialization */ unsigned int clock_isr_global[16]; /* place to store global regs */ @@ -124,7 +124,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/i960/rxgen960/console/concntl.h b/c/src/lib/libbsp/i960/rxgen960/console/concntl.h index f3b3f5e4d7..c1632a6ed7 100644 --- a/c/src/lib/libbsp/i960/rxgen960/console/concntl.h +++ b/c/src/lib/libbsp/i960/rxgen960/console/concntl.h @@ -12,5 +12,5 @@ typedef enum typedef struct { console_ioctl_t ioctl_type; - unsigned32 param; + uint32_t param; } console_ioctl_request_t; diff --git a/c/src/lib/libbsp/i960/rxgen960/console/console.c b/c/src/lib/libbsp/i960/rxgen960/console/console.c index 98b7e16a97..fd5124c6bf 100644 --- a/c/src/lib/libbsp/i960/rxgen960/console/console.c +++ b/c/src/lib/libbsp/i960/rxgen960/console/console.c @@ -39,7 +39,7 @@ rtems_device_driver console_initialize( { rtems_status_code status; - if ( console_pmr_init(*(unsigned32*)arg) ) + if ( console_pmr_init(*(uint32_t*)arg) ) return RTEMS_INVALID_NUMBER; @@ -158,9 +158,9 @@ rtems_device_driver console_read( ) { rtems_libio_rw_args_t *rw_args; - unsigned8 *buffer; - unsigned32 maximum; - unsigned32 count = 0; + uint8_t *buffer; + uint32_t maximum; + uint32_t count = 0; rw_args = (rtems_libio_rw_args_t *) arg; @@ -203,7 +203,7 @@ rtems_device_driver console_write( int count; int maximum; rtems_libio_rw_args_t *rw_args; - unsigned8 *buffer; + uint8_t *buffer; rw_args = (rtems_libio_rw_args_t *) arg; diff --git a/c/src/lib/libbsp/i960/rxgen960/include/bsp.h b/c/src/lib/libbsp/i960/rxgen960/include/bsp.h index d22488bf21..dfdbea48d0 100644 --- a/c/src/lib/libbsp/i960/rxgen960/include/bsp.h +++ b/c/src/lib/libbsp/i960/rxgen960/include/bsp.h @@ -71,8 +71,8 @@ extern "C" { */ #define rtems_bsp_delay( microseconds ) \ - { register rtems_unsigned32 _delay=(microseconds); \ - register rtems_unsigned32 _tmp = 0; /* initialized to avoid warning */ \ + { register uint32_t _delay=(microseconds); \ + register uint32_t _tmp = 0; /* initialized to avoid warning */ \ asm volatile( "0: \ remo 3,31,%0 ; \ cmpo 0,%0 ; \ diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c b/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c index 2946108438..3409bee8ba 100644 --- a/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c +++ b/c/src/lib/libbsp/i960/rxgen960/startup/bspstart.c @@ -67,11 +67,11 @@ bsp_pretasking_hook(void) { extern int end; - rtems_unsigned32 heap_start; + uint32_t heap_start; *(unsigned char *)(0x120f) = 0xd; -/* heap_start = (rtems_unsigned32) &end; */ - heap_start = (rtems_unsigned32) top_of_used_memory; +/* heap_start = (uint32_t) &end; */ + heap_start = (uint32_t) top_of_used_memory; if (heap_start & (CPU_ALIGNMENT-1)) heap_start = (heap_start + CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1); @@ -91,7 +91,7 @@ bsp_pretasking_hook(void) int rx_boot_card( int argc, char **argv, char **environp) { extern int end; - top_of_used_memory = (rtems_unsigned32) &end + 0x1000; + top_of_used_memory = (uint32_t) &end + 0x1000; if ((argc > 0) && argv && argv[0]) rtems_progname = argv[0]; else diff --git a/c/src/lib/libbsp/i960/rxgen960/timer/timer.c b/c/src/lib/libbsp/i960/rxgen960/timer/timer.c index 4511be51a4..80289362ef 100644 --- a/c/src/lib/libbsp/i960/rxgen960/timer/timer.c +++ b/c/src/lib/libbsp/i960/rxgen960/timer/timer.c @@ -95,7 +95,7 @@ int Read_timer() { volatile unsigned int *tcr1 = (unsigned int *) TCR1_ADDR; volatile unsigned int *trr1 = (unsigned int *) TRR1_ADDR; - rtems_unsigned32 remaining, total; + uint32_t remaining, total; /* this routine is supposed to count in 1/2 uSec units */ /* pretty funny when using a 33MHz clock for the counter */ -- cgit v1.2.3