From 1408ea8de8c89610e19ee52cef1c94825f9fd336 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 12 Dec 2006 10:24:16 +0000 Subject: Use uint32_t instead of rtems_unsigned32/unsigned32. --- c/src/lib/libbsp/sparc/leon2/console/console.c | 10 +++++----- c/src/lib/libbsp/sparc/leon2/timer/timer.c | 2 +- c/src/lib/libbsp/sparc/leon3/console/debugputs.c | 2 +- c/src/lib/libbsp/sparc/leon3/shmsupp/getcfg.c | 4 ++-- c/src/lib/libbsp/sparc/leon3/shmsupp/lock.c | 8 ++++---- c/src/lib/libbsp/sparc/leon3/timer/timer.c | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/sparc/leon2/console/console.c b/c/src/lib/libbsp/sparc/leon2/console/console.c index e426deee71..8d0c6999cf 100644 --- a/c/src/lib/libbsp/sparc/leon2/console/console.c +++ b/c/src/lib/libbsp/sparc/leon2/console/console.c @@ -108,7 +108,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; } @@ -148,7 +148,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; } @@ -171,8 +171,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 @@ -225,7 +225,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/leon2/timer/timer.c b/c/src/lib/libbsp/sparc/leon2/timer/timer.c index 0aae14362d..fa1a254da9 100644 --- a/c/src/lib/libbsp/sparc/leon2/timer/timer.c +++ b/c/src/lib/libbsp/sparc/leon2/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; diff --git a/c/src/lib/libbsp/sparc/leon3/console/debugputs.c b/c/src/lib/libbsp/sparc/leon3/console/debugputs.c index 066a584386..c772601848 100644 --- a/c/src/lib/libbsp/sparc/leon3/console/debugputs.c +++ b/c/src/lib/libbsp/sparc/leon3/console/debugputs.c @@ -89,7 +89,7 @@ void DEBUG_puts( ) { char *s; - /* unsigned32 old_level; */ + /* uint32_t old_level; */ /* LEON_Disable_interrupt( LEON_INTERRUPT_UART_1_RX_TX, old_level ); */ sparc_disable_interrupts(); diff --git a/c/src/lib/libbsp/sparc/leon3/shmsupp/getcfg.c b/c/src/lib/libbsp/sparc/leon3/shmsupp/getcfg.c index b56702849e..638c6666db 100644 --- a/c/src/lib/libbsp/sparc/leon3/shmsupp/getcfg.c +++ b/c/src/lib/libbsp/sparc/leon3/shmsupp/getcfg.c @@ -53,7 +53,7 @@ extern rtems_mpci_entry Shm_Return_packet( ); extern rtems_mpci_entry Shm_Send_packet( - rtems_unsigned32, + uint32_t, rtems_packet_prefix * ); @@ -80,7 +80,7 @@ extern rtems_mpci_entry Shm_Send_packet( shm_config_table BSP_shm_cfgtbl; void Shm_Get_configuration( - rtems_unsigned32 localnode, + uint32_t localnode, shm_config_table **shmcfg ) { diff --git a/c/src/lib/libbsp/sparc/leon3/shmsupp/lock.c b/c/src/lib/libbsp/sparc/leon3/shmsupp/lock.c index a750f818ac..f94cadb966 100644 --- a/c/src/lib/libbsp/sparc/leon3/shmsupp/lock.c +++ b/c/src/lib/libbsp/sparc/leon3/shmsupp/lock.c @@ -55,9 +55,9 @@ void Shm_Lock( Shm_Locked_queue_Control *lq_cb ) { - rtems_unsigned32 isr_level; - rtems_unsigned32 *lockptr = (rtems_unsigned32 *) &lq_cb->lock; - rtems_unsigned32 lock_value; + uint32_t isr_level; + uint32_t *lockptr = (uint32_t *) &lq_cb->lock; + uint32_t lock_value; lock_value = SHM_LOCK_VALUE; rtems_interrupt_disable( isr_level ); @@ -88,7 +88,7 @@ void Shm_Unlock( Shm_Locked_queue_Control *lq_cb ) { - rtems_unsigned32 isr_level; + uint32_t isr_level; lq_cb->lock = SHM_UNLOCK_VALUE; isr_level = Shm_isrstat; diff --git a/c/src/lib/libbsp/sparc/leon3/timer/timer.c b/c/src/lib/libbsp/sparc/leon3/timer/timer.c index d9a0f8b6b3..9d6f89a593 100644 --- a/c/src/lib/libbsp/sparc/leon3/timer/timer.c +++ b/c/src/lib/libbsp/sparc/leon3/timer/timer.c @@ -58,7 +58,7 @@ void Timer_initialize() int Read_timer() { - rtems_unsigned32 total; + uint32_t total; if (LEON3_Timer_Regs) { total = LEON3_Timer_Regs->timer[LEON3_TIMER_INDEX].value; -- cgit v1.2.3