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. --- .../sh/sh7750/include/rtems/score/ispsh7750.h | 2 +- c/src/lib/libcpu/sh/sh7750/include/sh/sh4uart.h | 40 +++++++++++----------- 2 files changed, 21 insertions(+), 21 deletions(-) (limited to 'c/src/lib/libcpu/sh/sh7750/include') diff --git a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/ispsh7750.h b/c/src/lib/libcpu/sh/sh7750/include/rtems/score/ispsh7750.h index 27c3b5fa08..2361b32137 100644 --- a/c/src/lib/libcpu/sh/sh7750/include/rtems/score/ispsh7750.h +++ b/c/src/lib/libcpu/sh/sh7750/include/rtems/score/ispsh7750.h @@ -50,7 +50,7 @@ extern "C" { /* dummy ISP */ extern void _dummy_isp( void ); -extern void __ISR_Handler( unsigned32 vector ); +extern void __ISR_Handler( uint32_t vector ); /* This variable contains VBR value used to pass control when debug, error * or virtual memory exceptions occured. diff --git a/c/src/lib/libcpu/sh/sh7750/include/sh/sh4uart.h b/c/src/lib/libcpu/sh/sh7750/include/sh/sh4uart.h index 295e75d409..04ab955569 100644 --- a/c/src/lib/libcpu/sh/sh7750/include/sh/sh4uart.h +++ b/c/src/lib/libcpu/sh/sh7750/include/sh/sh4uart.h @@ -35,35 +35,35 @@ /* * Macros to call UART registers */ -#define SCRDR(n) (*(volatile rtems_unsigned8 *)SH7750_SCRDR(n)) +#define SCRDR(n) (*(volatile uint8_t *)SH7750_SCRDR(n)) #define SCRDR1 SCRDR(1) #define SCRDR2 SCRDR(2) -#define SCTDR(n) (*(volatile rtems_unsigned8 *)SH7750_SCTDR(n)) +#define SCTDR(n) (*(volatile uint8_t *)SH7750_SCTDR(n)) #define SCTDR1 SCTDR(1) #define SCTDR2 SCTDR(2) -#define SCSMR(n) ((n) == 1 ? *(volatile rtems_unsigned8 *)SH7750_SCSMR1 : \ - *(volatile rtems_unsigned16 *)SH7750_SCSMR2) +#define SCSMR(n) ((n) == 1 ? *(volatile uint8_t *)SH7750_SCSMR1 : \ + *(volatile uint16_t *)SH7750_SCSMR2) #define SCSMR1 SCSMR(1) #define SCSMR2 SCSMR(2) -#define SCSCR(n) ((n) == 1 ? *(volatile rtems_unsigned8 *)SH7750_SCSCR1 : \ - *(volatile rtems_unsigned16 *)SH7750_SCSCR2) +#define SCSCR(n) ((n) == 1 ? *(volatile uint8_t *)SH7750_SCSCR1 : \ + *(volatile uint16_t *)SH7750_SCSCR2) #define SCSCR1 SCSCR(1) #define SCSCR2 SCSCR(2) -#define SCSSR(n) ((n) == 1 ? *(volatile rtems_unsigned8 *)SH7750_SCSSR1 : \ - *(volatile rtems_unsigned16 *)SH7750_SCSSR2) +#define SCSSR(n) ((n) == 1 ? *(volatile uint8_t *)SH7750_SCSSR1 : \ + *(volatile uint16_t *)SH7750_SCSSR2) #define SCSSR1 SCSSR(1) #define SCSSR2 SCSSR(2) -#define SCSPTR1 (*(volatile rtems_unsigned8 *)SH7750_SCSPTR1) -#define SCSPTR2 (*(volatile rtems_unsigned16 *)SH7750_SCSPTR2) -#define SCBRR(n) (*(volatile rtems_unsigned8 *)SH7750_SCBRR(n)) +#define SCSPTR1 (*(volatile uint8_t *)SH7750_SCSPTR1) +#define SCSPTR2 (*(volatile uint16_t *)SH7750_SCSPTR2) +#define SCBRR(n) (*(volatile uint8_t *)SH7750_SCBRR(n)) #define SCBRR1 SCBRR(1) #define SCBRR2 SCBRR(2) -#define SCFCR2 (*(volatile rtems_unsigned16 *)SH7750_SCFCR2) -#define SCFDR2 (*(volatile rtems_unsigned16 *)SH7750_SCFDR2) -#define SCLSR2 (*(volatile rtems_unsigned16 *)SH7750_SCLSR2) +#define SCFCR2 (*(volatile uint16_t *)SH7750_SCFCR2) +#define SCFDR2 (*(volatile uint16_t *)SH7750_SCFDR2) +#define SCLSR2 (*(volatile uint16_t *)SH7750_SCLSR2) -#define IPRB (*(volatile rtems_unsigned16 *)SH7750_IPRB) -#define IPRC (*(volatile rtems_unsigned16 *)SH7750_IPRC) +#define IPRB (*(volatile uint16_t *)SH7750_IPRB) +#define IPRC (*(volatile uint16_t *)SH7750_IPRC) /* * The following structure is a descriptor of single UART channel. @@ -71,14 +71,14 @@ * current operating values */ typedef struct sh4uart { - rtems_unsigned8 chn; /* UART channel number */ - rtems_unsigned8 int_driven; /* UART interrupt vector number, or + uint8_t chn; /* UART channel number */ + uint8_t int_driven; /* UART interrupt vector number, or 0 if polled I/O */ void *tty; /* termios channel descriptor */ volatile const char *tx_buf; /* Transmit buffer from termios */ - volatile rtems_unsigned32 tx_buf_len; /* Transmit buffer length */ - volatile rtems_unsigned32 tx_ptr; /* Index of next char to transmit*/ + volatile uint32_t tx_buf_len; /* Transmit buffer length */ + volatile uint32_t tx_ptr; /* Index of next char to transmit*/ rtems_isr_entry old_handler_transmit; /* Saved interrupt handlers */ rtems_isr_entry old_handler_receive; -- cgit v1.2.3