From e96a950bcf9953c0c0474fb21ec2af9c260e3668 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 31 Mar 2004 02:00:03 +0000 Subject: 2004-03-30 Ralf Corsepius * sh7032/clock/ckinit.c, sh7032/delay/delay.c, sh7032/include/ispsh7032.h, sh7032/sci/sci.c, sh7032/score/cpu_asm.c, sh7032/timer/timer.c, sh7045/clock/ckinit.c, sh7045/include/ispsh7045.h, sh7045/sci/sci.c, sh7045/sci/sci_termios.c, sh7045/score/cpu_asm.c, sh7045/timer/timer.c, sh7750/clock/ckinit.c, sh7750/include/rtems/score/ispsh7750.h, sh7750/include/sh/sh4uart.h, sh7750/sci/sh4uart.c, sh7750/score/cpu_asm.c, sh7750/score/ispsh7750.c, sh7750/timer/timer.c: Convert to using c99 fixed size types. --- c/src/lib/libcpu/sh/sh7045/clock/ckinit.c | 18 +++++++++--------- c/src/lib/libcpu/sh/sh7045/include/ispsh7045.h | 2 +- c/src/lib/libcpu/sh/sh7045/sci/sci.c | 18 +++++++++--------- c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c | 12 ++++++------ c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c | 12 ++++++------ c/src/lib/libcpu/sh/sh7045/timer/timer.c | 16 ++++++++-------- 6 files changed, 39 insertions(+), 39 deletions(-) (limited to 'c/src/lib/libcpu/sh/sh7045') diff --git a/c/src/lib/libcpu/sh/sh7045/clock/ckinit.c b/c/src/lib/libcpu/sh/sh7045/clock/ckinit.c index 2cde8e414e..c8fdb4b5a6 100644 --- a/c/src/lib/libcpu/sh/sh7045/clock/ckinit.c +++ b/c/src/lib/libcpu/sh/sh7045/clock/ckinit.c @@ -71,11 +71,11 @@ * number of clock ticks since the driver was initialized. */ -volatile rtems_unsigned32 Clock_driver_ticks; +volatile uint32_t Clock_driver_ticks; static void Clock_exit( void ); static rtems_isr Clock_isr( rtems_vector_number vector ); -static rtems_unsigned32 Clock_MHZ ; +static uint32_t Clock_MHZ ; /* * Clock_isrs is the number of clock ISRs until the next invocation of @@ -85,8 +85,8 @@ static rtems_unsigned32 Clock_MHZ ; * has passed. */ -rtems_unsigned32 Clock_isrs; /* ISRs until next tick */ -static rtems_unsigned32 Clock_isrs_const; /* only calculated once */ +uint32_t Clock_isrs; /* ISRs until next tick */ +static uint32_t Clock_isrs_const; /* only calculated once */ /* * These are set by clock driver during its init @@ -118,7 +118,7 @@ rtems_isr Clock_isr( * * perform any timer dependent tasks */ - unsigned8 temp; + uint8_t temp; /* reset the flags of the status register */ temp = read8( MTU_TSR0) & MTU0_STAT_MASK; @@ -148,8 +148,8 @@ void Install_clock( rtems_isr_entry clock_isr ) { - unsigned8 temp8 = 0; - unsigned32 factor = 1000000; + uint8_t temp8 = 0; + uint32_t factor = 1000000; /* @@ -222,7 +222,7 @@ void Install_clock( void Clock_exit( void ) { - unsigned8 temp8 = 0; + uint8_t temp8 = 0; /* turn off the timer interrupts */ /* set interrupt priority to 0 */ @@ -271,7 +271,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/libcpu/sh/sh7045/include/ispsh7045.h b/c/src/lib/libcpu/sh/sh7045/include/ispsh7045.h index b9b53ba669..db351ae978 100644 --- a/c/src/lib/libcpu/sh/sh7045/include/ispsh7045.h +++ b/c/src/lib/libcpu/sh/sh7045/include/ispsh7045.h @@ -43,7 +43,7 @@ extern "C" { #include -extern void __ISR_Handler( unsigned32 vector ); +extern void __ISR_Handler( uint32_t vector ); /* diff --git a/c/src/lib/libcpu/sh/sh7045/sci/sci.c b/c/src/lib/libcpu/sh/sh7045/sci/sci.c index 7b1d607390..ff8c935c00 100644 --- a/c/src/lib/libcpu/sh/sh7045/sci/sci.c +++ b/c/src/lib/libcpu/sh/sh7045/sci/sci.c @@ -78,7 +78,7 @@ struct scidev_t { char * name ; - unsigned32 addr ; + uint32_t addr ; rtems_device_minor_number minor ; unsigned short opened ; tcflag_t cflags ; @@ -104,8 +104,8 @@ static int _sci_set_cflags( struct scidev_t *sci_dev, tcflag_t c_cflag ) { - unsigned8 smr ; - unsigned8 brr ; + uint8_t smr ; + uint8_t brr ; if ( c_cflag & CBAUD ) { @@ -150,7 +150,7 @@ static int _sci_set_cflags( */ rtems_boolean wrtSCI0(unsigned char ch) { - unsigned8 temp; + uint8_t temp; rtems_boolean result=FALSE; if ((read8(SCI_SSR0) & SCI_TDRE) != 0x00) { @@ -166,7 +166,7 @@ rtems_boolean wrtSCI0(unsigned char ch) rtems_boolean wrtSCI1(unsigned char ch) { - unsigned8 temp; + uint8_t temp; rtems_boolean result=FALSE; if ((read8(SCI_SSR1) & SCI_TDRE) != 0x00) { @@ -203,7 +203,7 @@ void outbyte( rtems_boolean rdSCI0(unsigned char *ch) { - unsigned8 temp; + uint8_t temp; rtems_boolean result=FALSE; if ((read8(SCI_SSR0) & SCI_RDRF) != 0x00) { @@ -227,7 +227,7 @@ rtems_boolean rdSCI0(unsigned char *ch) rtems_boolean rdSCI1(unsigned char *ch) { - unsigned8 temp; + uint8_t temp; rtems_boolean result=FALSE; if ((read8(SCI_SSR1) & SCI_RDRF) != 0x00) { @@ -339,8 +339,8 @@ rtems_device_driver sh_sci_open( rtems_device_minor_number minor, void * arg ) { - unsigned8 temp8; - unsigned16 temp16; + uint8_t temp8; + uint16_t temp16; unsigned a ; diff --git a/c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c b/c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c index 81689633b0..f2d370e9be 100644 --- a/c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c +++ b/c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c @@ -71,8 +71,8 @@ int sh_sci_set_attributes( const struct termios *t ) { - unsigned8 smr ; - unsigned8 brr ; + uint8_t smr ; + uint8_t brr ; int a; tcflag_t c_cflag = t->c_cflag; @@ -135,7 +135,7 @@ rtems_isr sh_sci_rx_isr(rtems_vector_number vector) { if(Console_Port_Tbl[minor].ulIntVector == vector) { - unsigned8 temp8; + uint8_t temp8; /* * FIXME: error handling should be added @@ -193,7 +193,7 @@ rtems_isr sh_sci_tx_isr(rtems_vector_number vector) */ void sh_sci_init(int minor) { - unsigned16 temp16; + uint16_t temp16; /* * set PFC registers to enable I/O pins @@ -285,7 +285,7 @@ int sh_sci_first_open( int minor, void *arg ) { - unsigned8 temp8; + uint8_t temp8; unsigned int a ; /* @@ -439,7 +439,7 @@ void sh_sci_write_polled( */ int sh_sci_inbyte_nonblocking_polled(int minor) { - unsigned8 inbyte; + uint8_t inbyte; /* * Check if input buffer is full diff --git a/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c b/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c index 7b1dcbc636..821f00e6da 100644 --- a/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c +++ b/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c @@ -67,10 +67,10 @@ unsigned int sh_set_irq_priority( unsigned int irq, unsigned int prio ) { - unsigned32 shiftcount; - unsigned32 prioreg; - unsigned16 temp16; - unsigned32 level; + uint32_t shiftcount; + uint32_t prioreg; + uint16_t temp16; + uint32_t level; /* * first check for valid interrupt @@ -257,9 +257,9 @@ __CPU_Context_restore:\n\ * This routine provides the RTEMS interrupt management. */ -void __ISR_Handler( unsigned32 vector) +void __ISR_Handler( uint32_t vector) { - register unsigned32 level; + register uint32_t level; _CPU_ISR_Disable( level ); diff --git a/c/src/lib/libcpu/sh/sh7045/timer/timer.c b/c/src/lib/libcpu/sh/sh7045/timer/timer.c index 861aa5e90f..3a551faf7c 100644 --- a/c/src/lib/libcpu/sh/sh7045/timer/timer.c +++ b/c/src/lib/libcpu/sh/sh7045/timer/timer.c @@ -55,17 +55,17 @@ rtems_isr timerisr(); -static rtems_unsigned32 Timer_interrupts; +static uint32_t Timer_interrupts; rtems_boolean Timer_driver_Find_average_overhead; -static rtems_unsigned32 Timer_MHZ ; +static uint32_t Timer_MHZ ; void Timer_initialize( void ) { - rtems_unsigned8 temp8; - rtems_unsigned16 temp16; - rtems_unsigned32 level; + uint8_t temp8; + uint16_t temp16; + uint32_t level; rtems_isr *ignored; Timer_MHZ = rtems_cpu_configuration_get_clicks_per_second() / 1000000 ; @@ -145,8 +145,8 @@ void Timer_initialize( void ) int Read_timer( void ) { - rtems_unsigned32 clicks; - rtems_unsigned32 total ; + uint32_t clicks; + uint32_t total ; /* * Read the timer and see how many clicks it has been since we started. */ @@ -197,7 +197,7 @@ void Set_find_average_overhead( #pragma interrupt void timerisr( void ) { - unsigned8 temp8; + uint8_t temp8; /* reset the flags of the status register */ temp8 = read8( MTU_TSR1) & MTU1_STAT_MASK; -- cgit v1.2.3