diff options
author | Nick Withers <nick.withers@anu.edu.au> | 2014-11-27 17:39:36 +1100 |
---|---|---|
committer | Gedare Bloom <gedare@rtems.org> | 2014-12-23 22:40:32 -0500 |
commit | 2d5c48691453a05ffb3a264f75e71490166f819a (patch) | |
tree | 349fff13e895c9c30ca9d0ec5b51270681beba0b /c/src/lib/libbsp/powerpc/mvme3100 | |
parent | pc386: scan all functions of multi-function PCI devices (diff) | |
download | rtems-2d5c48691453a05ffb3a264f75e71490166f819a.tar.bz2 |
Use fixed-width C99 types for PowerPC in_be16() and co.
Also use the const qualifier on the address pointer's target in in_*()
Closes #2128
Diffstat (limited to 'c/src/lib/libbsp/powerpc/mvme3100')
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h b/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h index 62992398fd..eb92150767 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h @@ -110,7 +110,7 @@ #define BSP_UART_IOBASE_COM2 (BSP_8540_CCSR_BASE+0x4600) #define PCI_CONFIG_ADDR (BSP_8540_CCSR_BASE+0x8000) #define PCI_CONFIG_DATA (BSP_8540_CCSR_BASE+0x8004) -#define PCI_CONFIG_WR_ADDR( addr, val ) out_be32((unsigned int*)(addr), (val)) +#define PCI_CONFIG_WR_ADDR( addr, val ) out_be32((uint32_t*)(addr), (val)) #define BSP_CONSOLE_PORT BSP_UART_COM1 #define BSP_UART_BAUD_BASE (-9600) /* use existing divisor to determine clock rate */ diff --git a/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c index 86b9ec0744..d384f557b7 100644 --- a/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c @@ -142,13 +142,13 @@ char *save_boot_params( static inline uint32_t _ccsr_rd32(uint32_t off) { - return in_be32( (volatile unsigned *)(BSP_8540_CCSR_BASE + off) ); + return in_be32( (volatile uint32_t *)(BSP_8540_CCSR_BASE + off) ); } static inline void _ccsr_wr32(uint32_t off, uint32_t val) { - out_be32( (volatile unsigned *)(BSP_8540_CCSR_BASE + off), val ); + out_be32( (volatile uint32_t *)(BSP_8540_CCSR_BASE + off), val ); } |