From 2a7f710f5d42f8e458d491e17c5cbf9499313f7a Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 31 Mar 2004 04:14:40 +0000 Subject: 2004-03-31 Ralf Corsepius * console/uart.c, include/ep7312.h, startup/bspstart.c, timer/timer.c: Convert to using c99 fixed size types. --- c/src/lib/libbsp/arm/edb7312/ChangeLog | 5 + c/src/lib/libbsp/arm/edb7312/console/uart.c | 42 ++++---- c/src/lib/libbsp/arm/edb7312/include/ep7312.h | 134 ++++++++++++------------ c/src/lib/libbsp/arm/edb7312/startup/bspstart.c | 10 +- c/src/lib/libbsp/arm/edb7312/timer/timer.c | 8 +- 5 files changed, 102 insertions(+), 97 deletions(-) (limited to 'c/src/lib/libbsp/arm/edb7312') diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog index 277450dadf..f6cda0845c 100644 --- a/c/src/lib/libbsp/arm/edb7312/ChangeLog +++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog @@ -1,3 +1,8 @@ +2004-03-31 Ralf Corsepius + + * console/uart.c, include/ep7312.h, startup/bspstart.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/arm/edb7312/console/uart.c b/c/src/lib/libbsp/arm/edb7312/console/uart.c index 717d438869..dad78ae20b 100644 --- a/c/src/lib/libbsp/arm/edb7312/console/uart.c +++ b/c/src/lib/libbsp/arm/edb7312/console/uart.c @@ -56,9 +56,9 @@ console_tbl Console_Port_Tbl[] = { 16, /* ulMargin */ 8, /* ulHysteresis */ NULL, /* pDeviceParams */ - (unsigned32)EP7312_UARTCR1, /* ulCtrlPort1 */ - (unsigned32)EP7312_SYSFLG1, /* ulCtrlPort2 */ - (unsigned32)EP7312_UARTDR1, /* ulDataPort */ + (uint32_t)EP7312_UARTCR1, /* ulCtrlPort1 */ + (uint32_t)EP7312_SYSFLG1, /* ulCtrlPort2 */ + (uint32_t)EP7312_UARTDR1, /* ulDataPort */ 0, /* getRegister */ 0, /* setRegister */ 0, /* getData */ @@ -86,15 +86,15 @@ static int uart_set_attributes(int minor, const struct termios *t) int uart_poll_read(int minor) { - volatile unsigned32 *data_reg; - volatile unsigned32 *ctrl_reg1; - volatile unsigned32 *ctrl_reg2; + volatile uint32_t *data_reg; + volatile uint32_t *ctrl_reg1; + volatile uint32_t *ctrl_reg2; char c; int err; - data_reg = (unsigned32*)Console_Port_Tbl[minor].ulDataPort; - ctrl_reg1 = (unsigned32*)Console_Port_Tbl[minor].ulCtrlPort1; - ctrl_reg2 = (unsigned32*)Console_Port_Tbl[minor].ulCtrlPort2; + data_reg = (uint32_t*)Console_Port_Tbl[minor].ulDataPort; + ctrl_reg1 = (uint32_t*)Console_Port_Tbl[minor].ulCtrlPort1; + ctrl_reg2 = (uint32_t*)Console_Port_Tbl[minor].ulCtrlPort2; if ((*ctrl_reg2 & EP7312_UART_URXFE1) != 0) { return -1; @@ -114,15 +114,15 @@ BSP_output_char_function_type BSP_output_char = _BSP_null_char; static int uart_write(int minor, const char *buf, int len) { - volatile unsigned32 *data_reg; - volatile unsigned32 *ctrl_reg1; - volatile unsigned32 *ctrl_reg2; + volatile uint32_t *data_reg; + volatile uint32_t *ctrl_reg1; + volatile uint32_t *ctrl_reg2; int i; char c; - data_reg = (unsigned32*)Console_Port_Tbl[minor].ulDataPort; - ctrl_reg1 = (unsigned32*)Console_Port_Tbl[minor].ulCtrlPort1; - ctrl_reg2 = (unsigned32*)Console_Port_Tbl[minor].ulCtrlPort2; + data_reg = (uint32_t*)Console_Port_Tbl[minor].ulDataPort; + ctrl_reg1 = (uint32_t*)Console_Port_Tbl[minor].ulCtrlPort1; + ctrl_reg2 = (uint32_t*)Console_Port_Tbl[minor].ulCtrlPort2; for (i = 0; i < len; i++) { /* Wait for fifo to have room */ @@ -139,13 +139,13 @@ static int uart_write(int minor, const char *buf, int len) static void uart_init(int minor) { - volatile unsigned32 *data_reg; - volatile unsigned32 *ctrl_reg1; - volatile unsigned32 *ctrl_reg2; + volatile uint32_t *data_reg; + volatile uint32_t *ctrl_reg1; + volatile uint32_t *ctrl_reg2; - data_reg = (unsigned32*)Console_Port_Tbl[minor].ulDataPort; - ctrl_reg1 = (unsigned32*)Console_Port_Tbl[minor].ulCtrlPort1; - ctrl_reg2 = (unsigned32*)Console_Port_Tbl[minor].ulCtrlPort2; + data_reg = (uint32_t*)Console_Port_Tbl[minor].ulDataPort; + ctrl_reg1 = (uint32_t*)Console_Port_Tbl[minor].ulCtrlPort1; + ctrl_reg2 = (uint32_t*)Console_Port_Tbl[minor].ulCtrlPort2; /* *ctrl_reg = (BSP_UART_DATA8 | BSP_UART_STOP1 | diff --git a/c/src/lib/libbsp/arm/edb7312/include/ep7312.h b/c/src/lib/libbsp/arm/edb7312/include/ep7312.h index c81c4ce46f..b2e0b9f806 100644 --- a/c/src/lib/libbsp/arm/edb7312/include/ep7312.h +++ b/c/src/lib/libbsp/arm/edb7312/include/ep7312.h @@ -23,73 +23,73 @@ #define EP7312_REG_BASE 0x80000000 -#define EP7312_PADR ((volatile unsigned8 *)(EP7312_REG_BASE + 0x0000)) -#define EP7312_PBDR ((volatile unsigned8 *)(EP7312_REG_BASE + 0x0001)) -#define EP7312_PDDR ((volatile unsigned8 *)(EP7312_REG_BASE + 0x0003)) -#define EP7312_PADDR ((volatile unsigned8 *)(EP7312_REG_BASE + 0x0040)) -#define EP7312_PBDDR ((volatile unsigned8 *)(EP7312_REG_BASE + 0x0041)) -#define EP7312_PDDDR ((volatile unsigned8 *)(EP7312_REG_BASE + 0x0043)) -#define EP7312_PEDR ((volatile unsigned8 *)(EP7312_REG_BASE + 0x0080)) -#define EP7312_PEDDR ((volatile unsigned8 *)(EP7312_REG_BASE + 0x00C0)) -#define EP7312_SYSCON1 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0100)) -#define EP7312_SYSFLG1 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0140)) -#define EP7312_MEMCFG1 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0180)) -#define EP7312_MEMCFG2 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x01C0)) -#define EP7312_INTSR1 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0240)) -#define EP7312_INTMR1 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0280)) -#define EP7312_LCDCON ((volatile unsigned32 *)(EP7312_REG_BASE + 0x02C0)) -#define EP7312_TC1D ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0300)) -#define EP7312_TC2D ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0340)) -#define EP7312_RTCDR ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0380)) -#define EP7312_RTCMR ((volatile unsigned32 *)(EP7312_REG_BASE + 0x03C0)) -#define EP7312_PMPCON ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0400)) -#define EP7312_CODR ((volatile unsigned8 *)(EP7312_REG_BASE + 0x0440)) -#define EP7312_UARTDR1 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0480)) -#define EP7312_UARTCR1 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x04C0)) -#define EP7312_SYNCIO ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0500)) -#define EP7312_PALLSW ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0540)) -#define EP7312_PALMSW ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0580)) -#define EP7312_STFCLR ((volatile unsigned32 *)(EP7312_REG_BASE + 0x05C0)) -#define EP7312_BLEOI ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0600)) -#define EP7312_MCEOI ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0640)) -#define EP7312_TEOI ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0680)) -#define EP7312_TC1EOI ((volatile unsigned32 *)(EP7312_REG_BASE + 0x06C0)) -#define EP7312_TC2EOI ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0700)) -#define EP7312_RTCEOI ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0740)) -#define EP7312_UMSEOI ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0780)) -#define EP7312_COEOI ((volatile unsigned32 *)(EP7312_REG_BASE + 0x07C0)) -#define EP7312_HALT ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0800)) -#define EP7312_STDBY ((volatile unsigned32 *)(EP7312_REG_BASE + 0x0840)) -#define EP7312_FBADDR ((volatile unsigned8 *)(EP7312_REG_BASE + 0x1000)) -#define EP7312_SYSCON2 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x1100)) -#define EP7312_SYSFLG2 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x1140)) -#define EP7312_INTSR2 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x1240)) -#define EP7312_INTMR2 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x1280)) -#define EP7312_UARTDR2 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x1480)) -#define EP7312_UARTCR2 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x14C0)) -#define EP7312_SS2DR ((volatile unsigned32 *)(EP7312_REG_BASE + 0x1500)) -#define EP7312_SRXEOF ((volatile unsigned32 *)(EP7312_REG_BASE + 0x1600)) -#define EP7312_SS2POP ((volatile unsigned32 *)(EP7312_REG_BASE + 0x16C0)) -#define EP7312_KBDEOI ((volatile unsigned32 *)(EP7312_REG_BASE + 0x1700)) -#define EP7312_DAIR ((volatile unsigned32 *)(EP7312_REG_BASE + 0x2000)) -#define EP7312_DAIDR0 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x2040)) -#define EP7312_DAIDR1 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x2080)) -#define EP7312_DAIDR2 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x20C0)) -#define EP7312_DAISR ((volatile unsigned32 *)(EP7312_REG_BASE + 0x2100)) -#define EP7312_SYSCON3 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x2200)) -#define EP7312_INTSR3 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x2240)) -#define EP7312_INTMR3 ((volatile unsigned8 *)(EP7312_REG_BASE + 0x2280)) -#define EP7312_LEDFLSH ((volatile unsigned8 *)(EP7312_REG_BASE + 0x22C0)) -#define EP7312_SDCONF ((volatile unsigned32 *)(EP7312_REG_BASE + 0x2300)) -#define EP7312_SDRFPR ((volatile unsigned32 *)(EP7312_REG_BASE + 0x2340)) -#define EP7312_UNIQID ((volatile unsigned32 *)(EP7312_REG_BASE + 0x2440)) -#define EP7312_DAI64Fs ((volatile unsigned32 *)(EP7312_REG_BASE + 0x2600)) -#define EP7312_PLLW ((volatile unsigned8 *)(EP7312_REG_BASE + 0x2610)) -#define EP7312_PLLR ((volatile unsigned8 *)(EP7312_REG_BASE + 0xA5A8)) -#define EP7312_RANDID0 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x2700)) -#define EP7312_RANDID1 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x2704)) -#define EP7312_RANDID2 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x2708)) -#define EP7312_RANDID3 ((volatile unsigned32 *)(EP7312_REG_BASE + 0x270C)) +#define EP7312_PADR ((volatile uint8_t*)(EP7312_REG_BASE + 0x0000)) +#define EP7312_PBDR ((volatile uint8_t*)(EP7312_REG_BASE + 0x0001)) +#define EP7312_PDDR ((volatile uint8_t*)(EP7312_REG_BASE + 0x0003)) +#define EP7312_PADDR ((volatile uint8_t*)(EP7312_REG_BASE + 0x0040)) +#define EP7312_PBDDR ((volatile uint8_t*)(EP7312_REG_BASE + 0x0041)) +#define EP7312_PDDDR ((volatile uint8_t*)(EP7312_REG_BASE + 0x0043)) +#define EP7312_PEDR ((volatile uint8_t*)(EP7312_REG_BASE + 0x0080)) +#define EP7312_PEDDR ((volatile uint8_t*)(EP7312_REG_BASE + 0x00C0)) +#define EP7312_SYSCON1 ((volatile uint32_t*)(EP7312_REG_BASE + 0x0100)) +#define EP7312_SYSFLG1 ((volatile uint32_t*)(EP7312_REG_BASE + 0x0140)) +#define EP7312_MEMCFG1 ((volatile uint32_t*)(EP7312_REG_BASE + 0x0180)) +#define EP7312_MEMCFG2 ((volatile uint32_t*)(EP7312_REG_BASE + 0x01C0)) +#define EP7312_INTSR1 ((volatile uint32_t*)(EP7312_REG_BASE + 0x0240)) +#define EP7312_INTMR1 ((volatile uint32_t*)(EP7312_REG_BASE + 0x0280)) +#define EP7312_LCDCON ((volatile uint32_t*)(EP7312_REG_BASE + 0x02C0)) +#define EP7312_TC1D ((volatile uint32_t*)(EP7312_REG_BASE + 0x0300)) +#define EP7312_TC2D ((volatile uint32_t*)(EP7312_REG_BASE + 0x0340)) +#define EP7312_RTCDR ((volatile uint32_t*)(EP7312_REG_BASE + 0x0380)) +#define EP7312_RTCMR ((volatile uint32_t*)(EP7312_REG_BASE + 0x03C0)) +#define EP7312_PMPCON ((volatile uint32_t*)(EP7312_REG_BASE + 0x0400)) +#define EP7312_CODR ((volatile uint8_t*)(EP7312_REG_BASE + 0x0440)) +#define EP7312_UARTDR1 ((volatile uint32_t*)(EP7312_REG_BASE + 0x0480)) +#define EP7312_UARTCR1 ((volatile uint32_t*)(EP7312_REG_BASE + 0x04C0)) +#define EP7312_SYNCIO ((volatile uint32_t*)(EP7312_REG_BASE + 0x0500)) +#define EP7312_PALLSW ((volatile uint32_t*)(EP7312_REG_BASE + 0x0540)) +#define EP7312_PALMSW ((volatile uint32_t*)(EP7312_REG_BASE + 0x0580)) +#define EP7312_STFCLR ((volatile uint32_t*)(EP7312_REG_BASE + 0x05C0)) +#define EP7312_BLEOI ((volatile uint32_t*)(EP7312_REG_BASE + 0x0600)) +#define EP7312_MCEOI ((volatile uint32_t*)(EP7312_REG_BASE + 0x0640)) +#define EP7312_TEOI ((volatile uint32_t*)(EP7312_REG_BASE + 0x0680)) +#define EP7312_TC1EOI ((volatile uint32_t*)(EP7312_REG_BASE + 0x06C0)) +#define EP7312_TC2EOI ((volatile uint32_t*)(EP7312_REG_BASE + 0x0700)) +#define EP7312_RTCEOI ((volatile uint32_t*)(EP7312_REG_BASE + 0x0740)) +#define EP7312_UMSEOI ((volatile uint32_t*)(EP7312_REG_BASE + 0x0780)) +#define EP7312_COEOI ((volatile uint32_t*)(EP7312_REG_BASE + 0x07C0)) +#define EP7312_HALT ((volatile uint32_t*)(EP7312_REG_BASE + 0x0800)) +#define EP7312_STDBY ((volatile uint32_t*)(EP7312_REG_BASE + 0x0840)) +#define EP7312_FBADDR ((volatile uint8_t*)(EP7312_REG_BASE + 0x1000)) +#define EP7312_SYSCON2 ((volatile uint32_t*)(EP7312_REG_BASE + 0x1100)) +#define EP7312_SYSFLG2 ((volatile uint32_t*)(EP7312_REG_BASE + 0x1140)) +#define EP7312_INTSR2 ((volatile uint32_t*)(EP7312_REG_BASE + 0x1240)) +#define EP7312_INTMR2 ((volatile uint32_t*)(EP7312_REG_BASE + 0x1280)) +#define EP7312_UARTDR2 ((volatile uint32_t*)(EP7312_REG_BASE + 0x1480)) +#define EP7312_UARTCR2 ((volatile uint32_t*)(EP7312_REG_BASE + 0x14C0)) +#define EP7312_SS2DR ((volatile uint32_t*)(EP7312_REG_BASE + 0x1500)) +#define EP7312_SRXEOF ((volatile uint32_t*)(EP7312_REG_BASE + 0x1600)) +#define EP7312_SS2POP ((volatile uint32_t*)(EP7312_REG_BASE + 0x16C0)) +#define EP7312_KBDEOI ((volatile uint32_t*)(EP7312_REG_BASE + 0x1700)) +#define EP7312_DAIR ((volatile uint32_t*)(EP7312_REG_BASE + 0x2000)) +#define EP7312_DAIDR0 ((volatile uint32_t*)(EP7312_REG_BASE + 0x2040)) +#define EP7312_DAIDR1 ((volatile uint32_t*)(EP7312_REG_BASE + 0x2080)) +#define EP7312_DAIDR2 ((volatile uint32_t*)(EP7312_REG_BASE + 0x20C0)) +#define EP7312_DAISR ((volatile uint32_t*)(EP7312_REG_BASE + 0x2100)) +#define EP7312_SYSCON3 ((volatile uint32_t*)(EP7312_REG_BASE + 0x2200)) +#define EP7312_INTSR3 ((volatile uint32_t*)(EP7312_REG_BASE + 0x2240)) +#define EP7312_INTMR3 ((volatile uint8_t*)(EP7312_REG_BASE + 0x2280)) +#define EP7312_LEDFLSH ((volatile uint8_t*)(EP7312_REG_BASE + 0x22C0)) +#define EP7312_SDCONF ((volatile uint32_t*)(EP7312_REG_BASE + 0x2300)) +#define EP7312_SDRFPR ((volatile uint32_t*)(EP7312_REG_BASE + 0x2340)) +#define EP7312_UNIQID ((volatile uint32_t*)(EP7312_REG_BASE + 0x2440)) +#define EP7312_DAI64Fs ((volatile uint32_t*)(EP7312_REG_BASE + 0x2600)) +#define EP7312_PLLW ((volatile uint8_t*)(EP7312_REG_BASE + 0x2610)) +#define EP7312_PLLR ((volatile uint8_t*)(EP7312_REG_BASE + 0xA5A8)) +#define EP7312_RANDID0 ((volatile uint32_t*)(EP7312_REG_BASE + 0x2700)) +#define EP7312_RANDID1 ((volatile uint32_t*)(EP7312_REG_BASE + 0x2704)) +#define EP7312_RANDID2 ((volatile uint32_t*)(EP7312_REG_BASE + 0x2708)) +#define EP7312_RANDID3 ((volatile uint32_t*)(EP7312_REG_BASE + 0x270C)) /* serial port bits */ /* BITS in UBRLCR1 */ diff --git a/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c b/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c index 5f8de80d4e..62ba300662 100644 --- a/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c @@ -51,7 +51,7 @@ char *rtems_progname; /* Program name - from main(). */ /* Function prototypes */ /*************************************************************/ extern void rtems_irq_mngt_init(void); -void bsp_libc_init( void *, unsigned32, int ); +void bsp_libc_init( void *, uint32_t, int ); void bsp_postdriver_hook(void); /**************************************************************************/ @@ -75,8 +75,8 @@ void bsp_postdriver_hook(void); /**************************************************************************/ void bsp_pretasking_hook(void) { - unsigned32 heap_start; - unsigned32 heap_size; + uint32_t heap_start; + uint32_t heap_size; /* @@ -137,10 +137,10 @@ void bsp_start_default( void ) /* Place RTEMS workspace at beginning of free memory. */ BSP_Configuration.work_space_start = (void *)&_bss_free_start; - free_mem_start = ((unsigned32)&_bss_free_start + + free_mem_start = ((uint32_t)&_bss_free_start + BSP_Configuration.work_space_size); - free_mem_end = ((unsigned32)&_sdram_base + (unsigned32)&_sdram_size); + free_mem_end = ((uint32_t)&_sdram_base + (uint32_t)&_sdram_size); /* * Init rtems exceptions management diff --git a/c/src/lib/libbsp/arm/edb7312/timer/timer.c b/c/src/lib/libbsp/arm/edb7312/timer/timer.c index fe26177c73..27f896a2f6 100644 --- a/c/src/lib/libbsp/arm/edb7312/timer/timer.c +++ b/c/src/lib/libbsp/arm/edb7312/timer/timer.c @@ -24,7 +24,7 @@ #include #include -rtems_unsigned16 tstart; +uint16_t tstart; rtems_boolean Timer_driver_Find_average_overhead; void Timer_initialize( void ) @@ -50,8 +50,8 @@ void Timer_initialize( void ) int Read_timer( void ) { - rtems_unsigned16 t; - rtems_unsigned32 total; + uint16_t t; + uint32_t total; t = *EP7312_TC2D; /* @@ -60,7 +60,7 @@ int Read_timer( void ) * interrupts. */ - total = (unsigned32)0x0000ffff - t; /* result is 1/512000 = ~2 uS */ + total = (uint32_t)0x0000ffff - t; /* result is 1/512000 = ~2 uS */ total = (total * 1953) / 1000; /* convert to uS */ if ( Timer_driver_Find_average_overhead == 1 ) return total; /* in XXX microsecond units */ -- cgit v1.2.3