diff options
| author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-10-16 15:12:42 -0500 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2014-10-19 17:00:56 -0500 |
| commit | 2681fc467c1b63ac1c71557a11b751f0e25abdf5 (patch) | |
| tree | 1648706822138346a11cd522d82b1fecf46332fd | |
| parent | mips/hurricane: Fix warnings (diff) | |
| download | rtems-2681fc467c1b63ac1c71557a11b751f0e25abdf5.tar.bz2 | |
mips/malta: Fix warnings
| -rw-r--r-- | c/src/lib/libbsp/mips/malta/console/conscfg.c | 16 | ||||
| -rw-r--r-- | c/src/lib/libbsp/mips/malta/include/bsp.h | 10 | ||||
| -rw-r--r-- | c/src/lib/libbsp/mips/malta/start/start.S | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/mips/malta/startup/inittlb.c | 1 |
4 files changed, 21 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/mips/malta/console/conscfg.c b/c/src/lib/libbsp/mips/malta/console/conscfg.c index cefeb1990e..8d84c9321c 100644 --- a/c/src/lib/libbsp/mips/malta/console/conscfg.c +++ b/c/src/lib/libbsp/mips/malta/console/conscfg.c @@ -39,13 +39,13 @@ #define COM_IO_BASE_ADDRESS (0xa0000000UL | 0x18000000UL) -uint8_t com_get_register(uint32_t addr, uint8_t i); -void com_set_register(uint32_t addr, uint8_t i, uint8_t val); -uint8_t tty2_get_register(uint32_t addr, uint8_t i); -void tty2_set_register(uint32_t addr, uint8_t i, uint8_t val); +static uint8_t com_get_register(uintptr_t addr, uint8_t i); +static void com_set_register(uintptr_t addr, uint8_t i, uint8_t val); +static uint8_t tty2_get_register(uintptr_t addr, uint8_t i); +static void tty2_set_register(uintptr_t addr, uint8_t i, uint8_t val); -uint8_t com_get_register(uint32_t addr, uint8_t i) +uint8_t com_get_register(uintptr_t addr, uint8_t i) { uint8_t val; volatile uint8_t *ptr; @@ -57,7 +57,7 @@ uint8_t com_get_register(uint32_t addr, uint8_t i) return val; } -void com_set_register(uint32_t addr, uint8_t i, uint8_t val) +void com_set_register(uintptr_t addr, uint8_t i, uint8_t val) { volatile uint8_t *ptr; @@ -67,7 +67,7 @@ void com_set_register(uint32_t addr, uint8_t i, uint8_t val) *ptr = val; } -uint8_t tty2_get_register(uint32_t addr, uint8_t i) +uint8_t tty2_get_register(uintptr_t addr, uint8_t i) { uint8_t val; volatile uint8_t *ptr; @@ -80,7 +80,7 @@ uint8_t tty2_get_register(uint32_t addr, uint8_t i) return val; } -void tty2_set_register(uint32_t addr, uint8_t i, uint8_t val) +void tty2_set_register(uintptr_t addr, uint8_t i, uint8_t val) { volatile uint8_t *ptr; diff --git a/c/src/lib/libbsp/mips/malta/include/bsp.h b/c/src/lib/libbsp/mips/malta/include/bsp.h index 12a2b4b2fd..0d5b01540d 100644 --- a/c/src/lib/libbsp/mips/malta/include/bsp.h +++ b/c/src/lib/libbsp/mips/malta/include/bsp.h @@ -17,6 +17,8 @@ #ifndef _BSP_H #define _BSP_H +#ifndef ASM + #ifdef __cplusplus extern "C" { #endif @@ -99,8 +101,16 @@ uint32_t simple_in_32( uint32_t base, uint32_t addr ); void simple_out_le16( uint32_t base, uint32_t addr, uint16_t val ); void simple_out_16( uint32_t base, uint32_t addr, uint16_t val ); +/* + * Prototypes for methods called from .S for dependency tracking + */ +void init_tlb(void); +void resettlb(int i); + #ifdef __cplusplus } #endif +#endif /* !ASM */ + #endif diff --git a/c/src/lib/libbsp/mips/malta/start/start.S b/c/src/lib/libbsp/mips/malta/start/start.S index 468a43b4a0..0c185b50ed 100644 --- a/c/src/lib/libbsp/mips/malta/start/start.S +++ b/c/src/lib/libbsp/mips/malta/start/start.S @@ -20,6 +20,8 @@ #include <rtems/asm.h> #include <bsp/regs.h> +#include <bsp.h> + #ifdef __mips16 /* This file contains 32 bit assembly code. */ .set nomips16 diff --git a/c/src/lib/libbsp/mips/malta/startup/inittlb.c b/c/src/lib/libbsp/mips/malta/startup/inittlb.c index 37176b2137..0088b98483 100644 --- a/c/src/lib/libbsp/mips/malta/startup/inittlb.c +++ b/c/src/lib/libbsp/mips/malta/startup/inittlb.c @@ -11,6 +11,7 @@ * http://www.rtems.org/license/LICENSE. */ +#include <bsp.h> #include <rtems/mips/idtcpu.h> extern void resettlb( int i ); |