From 16ce0e7078067b9d0b8c05760b5ad8dec8cc8205 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 30 Mar 2004 11:45:56 +0000 Subject: 2004-03-30 Ralf Corsepius * c4xio.h, cpu.c, irq.c, rtems/score/cpu.h: Convert to using c99 fixed size types. --- cpukit/score/cpu/c4x/ChangeLog | 5 +++++ cpukit/score/cpu/c4x/c4xio.h | 6 +++--- cpukit/score/cpu/c4x/cpu.c | 8 ++++---- cpukit/score/cpu/c4x/irq.c | 4 ++-- cpukit/score/cpu/c4x/rtems/score/cpu.h | 18 +++++++++--------- cpukit/score/cpu/c4x/rtems/tic4x/c4xio.h | 6 +++--- 6 files changed, 26 insertions(+), 21 deletions(-) (limited to 'cpukit') diff --git a/cpukit/score/cpu/c4x/ChangeLog b/cpukit/score/cpu/c4x/ChangeLog index b352bea391..5889e457c3 100644 --- a/cpukit/score/cpu/c4x/ChangeLog +++ b/cpukit/score/cpu/c4x/ChangeLog @@ -1,3 +1,8 @@ +2004-03-30 Ralf Corsepius + + * c4xio.h, cpu.c, irq.c, rtems/score/cpu.h: Convert to using c99 + fixed size types. + 2004-03-29 Ralf Corsepius * configure.ac: RTEMS_TOP([../../../..]). diff --git a/cpukit/score/cpu/c4x/c4xio.h b/cpukit/score/cpu/c4x/c4xio.h index f85f461ebc..d398211dfb 100644 --- a/cpukit/score/cpu/c4x/c4xio.h +++ b/cpukit/score/cpu/c4x/c4xio.h @@ -90,15 +90,15 @@ struct c4x_timer { #else -static inline unsigned32 c3x_get_iof( void ) +static inline uint32_t c3x_get_iof( void ) { - register unsigned32 iof_value; + register uint32_t iof_value; __asm__ volatile ("ldi iof, %0" : "=r" (iof_value)); return iof_value; } -static inline void c3x_set_iof( unsigned32 value ) +static inline void c3x_set_iof( uint32_t value ) { __asm__ volatile ("ldi %0,iof" : : "g" (value) : "iof", "cc"); } diff --git a/cpukit/score/cpu/c4x/cpu.c b/cpukit/score/cpu/c4x/cpu.c index b0f639a602..b9655b642f 100644 --- a/cpukit/score/cpu/c4x/cpu.c +++ b/cpukit/score/cpu/c4x/cpu.c @@ -72,7 +72,7 @@ void _CPU_Initialize( */ void _CPU_ISR_install_raw_handler( - unsigned32 vector, + uint32_t vector, proc_ptr new_handler, proc_ptr *old_handler ) @@ -97,8 +97,8 @@ void _CPU_ISR_install_raw_handler( void _CPU_Context_Initialize( Context_Control *_the_context, void *_stack_base, - unsigned32 _size, - unsigned32 _isr, + uint32_t _size, + uint32_t _isr, void (*_entry_point)(void), int _is_fp ) @@ -133,7 +133,7 @@ void _CPU_Context_Initialize( */ void _CPU_ISR_install_vector( - unsigned32 vector, + uint32_t vector, proc_ptr new_handler, proc_ptr *old_handler ) diff --git a/cpukit/score/cpu/c4x/irq.c b/cpukit/score/cpu/c4x/irq.c index 3117a83f54..104b3afdc4 100644 --- a/cpukit/score/cpu/c4x/irq.c +++ b/cpukit/score/cpu/c4x/irq.c @@ -27,9 +27,9 @@ register unsigned long *stack_ptr asm("sp"); -void __ISR_Handler(unsigned32 vector, void *isr_sp) +void __ISR_Handler(uint32_t vector, void *isr_sp) { - register unsigned32 level; + register uint32_t level; /* already disabled when we get here */ /* _CPU_ISR_Disable( level ); */ diff --git a/cpukit/score/cpu/c4x/rtems/score/cpu.h b/cpukit/score/cpu/c4x/rtems/score/cpu.h index ad1d404d33..f2ed61319f 100644 --- a/cpukit/score/cpu/c4x/rtems/score/cpu.h +++ b/cpukit/score/cpu/c4x/rtems/score/cpu.h @@ -536,10 +536,10 @@ typedef struct { void (*postdriver_hook)( void ); void (*idle_task)( void ); boolean do_zero_of_workspace; - unsigned32 idle_task_stack_size; - unsigned32 interrupt_stack_size; - unsigned32 extra_mpci_receive_server_stack; - void * (*stack_allocate_hook)( unsigned32 ); + uint32_t idle_task_stack_size; + uint32_t interrupt_stack_size; + uint32_t extra_mpci_receive_server_stack; + void * (*stack_allocate_hook)( uint32_t ); void (*stack_free_hook)( void* ); /* end of fields required on all CPUs */ @@ -876,8 +876,8 @@ SCORE_EXTERN void (*_CPU_Thread_dispatch_pointer)(); void _CPU_Context_Initialize( Context_Control *_the_context, void *_stack_base, - unsigned32 _size, - unsigned32 _isr, + uint32_t _size, + uint32_t _isr, void (*_entry_point)(void), int _is_fp ); @@ -1110,7 +1110,7 @@ void _CPU_Initialize( */ void _CPU_ISR_install_raw_handler( - unsigned32 vector, + uint32_t vector, proc_ptr new_handler, proc_ptr *old_handler ); @@ -1126,7 +1126,7 @@ void _CPU_ISR_install_raw_handler( */ void _CPU_ISR_install_vector( - unsigned32 vector, + uint32_t vector, proc_ptr new_handler, proc_ptr *old_handler ); @@ -1240,7 +1240,7 @@ static inline unsigned int CPU_swap_u32( unsigned int value ) { - unsigned32 byte1, byte2, byte3, byte4, swapped; + uint32_t byte1, byte2, byte3, byte4, swapped; byte4 = (value >> 24) & 0xff; byte3 = (value >> 16) & 0xff; diff --git a/cpukit/score/cpu/c4x/rtems/tic4x/c4xio.h b/cpukit/score/cpu/c4x/rtems/tic4x/c4xio.h index f85f461ebc..d398211dfb 100644 --- a/cpukit/score/cpu/c4x/rtems/tic4x/c4xio.h +++ b/cpukit/score/cpu/c4x/rtems/tic4x/c4xio.h @@ -90,15 +90,15 @@ struct c4x_timer { #else -static inline unsigned32 c3x_get_iof( void ) +static inline uint32_t c3x_get_iof( void ) { - register unsigned32 iof_value; + register uint32_t iof_value; __asm__ volatile ("ldi iof, %0" : "=r" (iof_value)); return iof_value; } -static inline void c3x_set_iof( unsigned32 value ) +static inline void c3x_set_iof( uint32_t value ) { __asm__ volatile ("ldi %0,iof" : : "g" (value) : "iof", "cc"); } -- cgit v1.2.3