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

2007-09-07 Daniel Hellstrom <daniel@gaisler.com>

Browse Source 
* leon_smc91111/leon_smc91111.c, rasta/rasta.c: Remove warnings.
This commit is contained in:
Joel Sherrill
2007-09-07 14:34:13 +00:00
parent f6e2e97b59
commit 3734192d4d
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
c/src/lib/libbsp/sparc/leon2/ChangeLog
View File

@@ -1,3 +1,7 @@
2007-09-07 Daniel Hellstrom <daniel@gaisler.com>
* leon_smc91111/leon_smc91111.c, rasta/rasta.c: Remove warnings.
2007-09-06 Daniel Hellstrom <daniel@gaisler.com> 2007-09-06 Daniel Hellstrom <daniel@gaisler.com>
* pci/pci.c: New file. * pci/pci.c: New file.

2
c/src/lib/libbsp/sparc/leon2/leon_smc91111/leon_smc91111.c
View File

@@ -5,7 +5,7 @@
#include <rtems.h> #include <rtems.h>
#include <bsp.h> #include <bsp.h>
#include <stdio.h> #include <rtems/bspIo.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>

16
c/src/lib/libbsp/sparc/leon2/rasta/rasta.c
View File

@@ -58,7 +58,7 @@ typedef struct {
static int bus, dev, fun; static int bus, dev, fun;
LEON3_IrqCtrl_Regs_Map *irq = NULL; LEON3_IrqCtrl_Regs_Map *irq = NULL;
LEON_Register_Map *regs = 0x80000000; LEON_Register_Map *regs = (LEON_Register_Map *)0x80000000;
struct gpio_reg *gpio0, *gpio1; struct gpio_reg *gpio0, *gpio1;
@@ -205,7 +205,7 @@ void rasta_interrrupt_register(void *handler, int irqno, void *arg)
} }
int rasta_get_gpio(amba_confarea_type *abus, int index, unsigned int *address, int *irq) int rasta_get_gpio(amba_confarea_type *abus, int index, struct gpio_reg **regs, int *irq)
{ {
amba_apb_device dev; amba_apb_device dev;
int cores; int cores;
@@ -218,8 +218,8 @@ int rasta_get_gpio(amba_confarea_type *abus, int index, unsigned int *address, i
if ( cores < 1 ) if ( cores < 1 )
return -1; return -1;
if ( address ) if ( regs )
*address = dev.start; *regs = (struct gpio_reg *)dev.start;
if ( irq ) if ( irq )
*irq = dev.irq; *irq = dev.irq;
@@ -261,10 +261,10 @@ int rasta_register(void)
pci_read_config_dword(bus, dev, fun, 0x10, &bar0); pci_read_config_dword(bus, dev, fun, 0x10, &bar0);
pci_read_config_dword(bus, dev, fun, 0x14, &bar1); pci_read_config_dword(bus, dev, fun, 0x14, &bar1);
page0 = bar0 + 0x400000; page0 = (unsigned int *)(bar0 + 0x400000);
*page0 = 0x80000000; /* Point PAGE0 to start of APB */ *page0 = 0x80000000; /* Point PAGE0 to start of APB */
apb_base = bar0+APB2_OFFSET; apb_base = (unsigned int *)(bar0+APB2_OFFSET);
/* apb_base[0] = 0x000002ff; /* apb_base[0] = 0x000002ff;
apb_base[1] = 0x8a205260; apb_base[1] = 0x8a205260;
@@ -368,13 +368,13 @@ int rasta_register(void)
} }
/* Find GPIO0 address */ /* Find GPIO0 address */
if ( rasta_get_gpio(&abus,0,(unsigned int *)&gpio0,NULL) ){ if ( rasta_get_gpio(&abus,0,&gpio0,NULL) ){
printk("Failed to get address for RASTA GPIO0\n\r"); printk("Failed to get address for RASTA GPIO0\n\r");
return -1; return -1;
} }
/* Find GPIO1 address */ /* Find GPIO1 address */
if ( rasta_get_gpio(&abus,1,(unsigned int *)&gpio1,NULL) ){ if ( rasta_get_gpio(&abus,1,&gpio1,NULL) ){
printk("Failed to get address for RASTA GPIO1\n\r"); printk("Failed to get address for RASTA GPIO1\n\r");
return -1; return -1;
} }