RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

mips/malta: Fix warnings

Browse Source
This commit is contained in:
Joel Sherrill
2014-10-16 15:12:42 -05:00
parent f3a66a3e68
commit 2681fc467c
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
c/src/lib/libbsp/mips/malta/console/conscfg.c
View File

@@ -39,13 +39,13 @@
#define COM_IO_BASE_ADDRESS (0xa0000000UL | 0x18000000UL) #define COM_IO_BASE_ADDRESS (0xa0000000UL | 0x18000000UL)
uint8_t com_get_register(uint32_t addr, uint8_t i); static uint8_t com_get_register(uintptr_t addr, uint8_t i);
void com_set_register(uint32_t addr, uint8_t i, uint8_t val); static void com_set_register(uintptr_t addr, uint8_t i, uint8_t val);
uint8_t tty2_get_register(uint32_t addr, uint8_t i); static uint8_t tty2_get_register(uintptr_t addr, uint8_t i);
void tty2_set_register(uint32_t addr, uint8_t i, uint8_t val); 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; uint8_t val;
volatile uint8_t *ptr; volatile uint8_t *ptr;
@@ -57,7 +57,7 @@ uint8_t com_get_register(uint32_t addr, uint8_t i)
return val; 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; volatile uint8_t *ptr;
@@ -67,7 +67,7 @@ void com_set_register(uint32_t addr, uint8_t i, uint8_t val)
*ptr = 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; uint8_t val;
volatile uint8_t *ptr; volatile uint8_t *ptr;
@@ -80,7 +80,7 @@ uint8_t tty2_get_register(uint32_t addr, uint8_t i)
return val; 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; volatile uint8_t *ptr;

10
c/src/lib/libbsp/mips/malta/include/bsp.h
View File

@@ -17,6 +17,8 @@
#ifndef _BSP_H #ifndef _BSP_H
#define _BSP_H #define _BSP_H
#ifndef ASM
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #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_le16( uint32_t base, uint32_t addr, uint16_t val );
void simple_out_16( 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 #ifdef __cplusplus
} }
#endif #endif
#endif /* !ASM */
#endif #endif

2
c/src/lib/libbsp/mips/malta/start/start.S
View File

@@ -20,6 +20,8 @@
#include <rtems/asm.h> #include <rtems/asm.h>
#include <bsp/regs.h> #include <bsp/regs.h>
#include <bsp.h>
#ifdef __mips16 #ifdef __mips16
/* This file contains 32 bit assembly code. */ /* This file contains 32 bit assembly code. */
.set nomips16 .set nomips16

1
c/src/lib/libbsp/mips/malta/startup/inittlb.c
View File

@@ -11,6 +11,7 @@
* http://www.rtems.org/license/LICENSE. * http://www.rtems.org/license/LICENSE.
*/ */
#include <bsp.h>
#include <rtems/mips/idtcpu.h> #include <rtems/mips/idtcpu.h>
extern void resettlb( int i ); extern void resettlb( int i );