From bd978031bff85e31c9ede09506028910a894f224 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 31 Mar 2004 05:18:03 +0000 Subject: 2004-03-31 Ralf Corsepius * clock/ckinit.c, console/console.c, console/debugputs.c, include/bsp.h, include/leon.h, startup/setvec.c, startup/spurious.c, timer/timer.c: Convert to using c99 fixed size types. --- c/src/lib/libbsp/sparc/leon/ChangeLog | 6 ++++++ c/src/lib/libbsp/sparc/leon/clock/ckinit.c | 6 +++--- c/src/lib/libbsp/sparc/leon/console/console.c | 10 +++++----- c/src/lib/libbsp/sparc/leon/console/debugputs.c | 2 +- c/src/lib/libbsp/sparc/leon/include/bsp.h | 2 +- c/src/lib/libbsp/sparc/leon/include/leon.h | 12 ++++++------ c/src/lib/libbsp/sparc/leon/startup/setvec.c | 4 ++-- c/src/lib/libbsp/sparc/leon/startup/spurious.c | 10 +++++----- c/src/lib/libbsp/sparc/leon/timer/timer.c | 2 +- 9 files changed, 30 insertions(+), 24 deletions(-) (limited to 'c/src/lib/libbsp/sparc/leon') diff --git a/c/src/lib/libbsp/sparc/leon/ChangeLog b/c/src/lib/libbsp/sparc/leon/ChangeLog index 836437e179..9a2b45db1f 100644 --- a/c/src/lib/libbsp/sparc/leon/ChangeLog +++ b/c/src/lib/libbsp/sparc/leon/ChangeLog @@ -1,3 +1,9 @@ +2004-03-31 Ralf Corsepius + + * clock/ckinit.c, console/console.c, console/debugputs.c, + include/bsp.h, include/leon.h, startup/setvec.c, startup/spurious.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/sparc/leon/clock/ckinit.c b/c/src/lib/libbsp/sparc/leon/clock/ckinit.c index 3ff92a7dba..10b465682c 100644 --- a/c/src/lib/libbsp/sparc/leon/clock/ckinit.c +++ b/c/src/lib/libbsp/sparc/leon/clock/ckinit.c @@ -38,7 +38,7 @@ * Clock ticks since initialization */ -volatile rtems_unsigned32 Clock_driver_ticks; +volatile uint32_t Clock_driver_ticks; /* * This is the value programmed into the count down timer. It @@ -47,7 +47,7 @@ volatile rtems_unsigned32 Clock_driver_ticks; * the simulator. */ -extern rtems_unsigned32 CPU_SPARC_CLICKS_PER_TICK; +extern uint32_t CPU_SPARC_CLICKS_PER_TICK; rtems_isr_entry Old_ticker; @@ -222,7 +222,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/sparc/leon/console/console.c b/c/src/lib/libbsp/sparc/leon/console/console.c index 2fba40345f..5b6bab7470 100644 --- a/c/src/lib/libbsp/sparc/leon/console/console.c +++ b/c/src/lib/libbsp/sparc/leon/console/console.c @@ -107,7 +107,7 @@ rtems_isr console_isr_a( if ( LEON_REG.UART_Status_1 & LEON_REG_UART_STATUS_THE ) { if ( !Ring_buffer_Is_empty( &TX_Buffer[ 0 ] ) ) { Ring_buffer_Remove_character( &TX_Buffer[ 0 ], ch ); - LEON_REG.UART_Channel_1 = (unsigned32) ch; + LEON_REG.UART_Channel_1 = (uint32_t) ch; } else Is_TX_active[ 0 ] = FALSE; } @@ -147,7 +147,7 @@ rtems_isr console_isr_b( if ( LEON_REG.UART_Status_2 & LEON_REG_UART_STATUS_THE ) { if ( !Ring_buffer_Is_empty( &TX_Buffer[ 1 ] ) ) { Ring_buffer_Remove_character( &TX_Buffer[ 1 ], ch ); - LEON_REG.UART_Channel_2 = (unsigned32) ch; + LEON_REG.UART_Channel_2 = (uint32_t) ch; } else Is_TX_active[ 1 ] = FALSE; } @@ -170,8 +170,8 @@ rtems_isr console_isr_b( void console_exit() { - rtems_unsigned32 port; - rtems_unsigned32 ch; + uint32_t port; + uint32_t ch; /* * Although the interrupts for the UART are unmasked, the PIL is set to @@ -224,7 +224,7 @@ void console_exit() */ #ifdef RDB_BREAK_IN - extern unsigned32 trap_table[]; + extern uint32_t trap_table[]; #endif void console_initialize_interrupts( void ) diff --git a/c/src/lib/libbsp/sparc/leon/console/debugputs.c b/c/src/lib/libbsp/sparc/leon/console/debugputs.c index 46eb310e0b..f5e634d1b3 100644 --- a/c/src/lib/libbsp/sparc/leon/console/debugputs.c +++ b/c/src/lib/libbsp/sparc/leon/console/debugputs.c @@ -96,7 +96,7 @@ void DEBUG_puts( ) { char *s; - unsigned32 old_level; + uint32_t old_level; LEON_Disable_interrupt( LEON_INTERRUPT_UART_1_RX_TX, old_level ); LEON_REG.UART_Control_1 = LEON_REG_UART_CTRL_TE; diff --git a/c/src/lib/libbsp/sparc/leon/include/bsp.h b/c/src/lib/libbsp/sparc/leon/include/bsp.h index e614461725..6b97159318 100644 --- a/c/src/lib/libbsp/sparc/leon/include/bsp.h +++ b/c/src/lib/libbsp/sparc/leon/include/bsp.h @@ -131,7 +131,7 @@ extern int rtems_leon_open_eth_driver_attach (struct rtems_bsdnet_ifconfig *conf * This is very dependent on the clock speed of the target. */ -extern void Clock_delay(rtems_unsigned32 microseconds); +extern void Clock_delay(uint32_t microseconds); #define delay( microseconds ) Clock_delay(microseconds) diff --git a/c/src/lib/libbsp/sparc/leon/include/leon.h b/c/src/lib/libbsp/sparc/leon/include/leon.h index b439bae0cc..f6958ed55e 100644 --- a/c/src/lib/libbsp/sparc/leon/include/leon.h +++ b/c/src/lib/libbsp/sparc/leon/include/leon.h @@ -298,7 +298,7 @@ extern LEON_Register_Map LEON_REG; #define LEON_Mask_interrupt( _source ) \ do { \ - unsigned32 _level; \ + uint32_t _level; \ \ _level = sparc_disable_interrupts(); \ LEON_REG.Interrupt_Mask &= ~(1 << (_source)); \ @@ -307,7 +307,7 @@ extern LEON_Register_Map LEON_REG; #define LEON_Unmask_interrupt( _source ) \ do { \ - unsigned32 _level; \ + uint32_t _level; \ \ _level = sparc_disable_interrupts(); \ LEON_REG.Interrupt_Mask |= (1 << (_source)); \ @@ -316,8 +316,8 @@ extern LEON_Register_Map LEON_REG; #define LEON_Disable_interrupt( _source, _previous ) \ do { \ - unsigned32 _level; \ - unsigned32 _mask = 1 << (_source); \ + uint32_t _level; \ + uint32_t _mask = 1 << (_source); \ \ _level = sparc_disable_interrupts(); \ (_previous) = LEON_REG.Interrupt_Mask; \ @@ -328,8 +328,8 @@ extern LEON_Register_Map LEON_REG; #define LEON_Restore_interrupt( _source, _previous ) \ do { \ - unsigned32 _level; \ - unsigned32 _mask = 1 << (_source); \ + uint32_t _level; \ + uint32_t _mask = 1 << (_source); \ \ _level = sparc_disable_interrupts(); \ LEON_REG.Interrupt_Mask = \ diff --git a/c/src/lib/libbsp/sparc/leon/startup/setvec.c b/c/src/lib/libbsp/sparc/leon/startup/setvec.c index e0887026ac..08ee295ad5 100644 --- a/c/src/lib/libbsp/sparc/leon/startup/setvec.c +++ b/c/src/lib/libbsp/sparc/leon/startup/setvec.c @@ -39,8 +39,8 @@ rtems_isr_entry set_vector( /* returns old vector */ ) { rtems_isr_entry previous_isr; - unsigned32 real_trap; - unsigned32 source; + uint32_t real_trap; + uint32_t source; if ( type ) rtems_interrupt_catch( handler, vector, &previous_isr ); diff --git a/c/src/lib/libbsp/sparc/leon/startup/spurious.c b/c/src/lib/libbsp/sparc/leon/startup/spurious.c index 8dc9a6f407..47eb8cd3c0 100644 --- a/c/src/lib/libbsp/sparc/leon/startup/spurious.c +++ b/c/src/lib/libbsp/sparc/leon/startup/spurious.c @@ -23,7 +23,7 @@ static const char digits[16] = "0123456789abcdef"; /* Simple integer-to-string conversion */ -void itos(unsigned32 u, char *s) +void itos(uint32_t u, char *s) { int i; @@ -44,7 +44,7 @@ rtems_isr bsp_spurious_handler( ) { char line[ 80 ]; - rtems_unsigned32 real_trap; + uint32_t real_trap; real_trap = SPARC_REAL_TRAP_NUMBER(trap); @@ -143,9 +143,9 @@ rtems_isr bsp_spurious_handler( void bsp_spurious_initialize() { - rtems_unsigned32 trap; - unsigned32 level; - unsigned32 mask; + uint32_t trap; + uint32_t level; + uint32_t mask; level = sparc_disable_interrupts(); mask = LEON_REG.Interrupt_Mask; diff --git a/c/src/lib/libbsp/sparc/leon/timer/timer.c b/c/src/lib/libbsp/sparc/leon/timer/timer.c index 0aae14362d..9cf535477a 100644 --- a/c/src/lib/libbsp/sparc/leon/timer/timer.c +++ b/c/src/lib/libbsp/sparc/leon/timer/timer.c @@ -55,7 +55,7 @@ void Timer_initialize() int Read_timer() { - rtems_unsigned32 total; + uint32_t total; total = LEON_REG.Timer_Counter_2; -- cgit v1.2.3