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

* console/console.c, leon_greth/leon_greth.c,
	leon_smc91111/leon_smc91111.c: Remove warnings.
This commit is contained in:
Joel Sherrill
2007-09-07 14:34:15 +00:00
parent 3734192d4d
commit 309cb3b572
4 changed files with 10 additions and 7 deletions

View File

@@ -1,3 +1,8 @@
2007-09-07 Daniel Hellstrom <daniel@gaisler.com>
* console/console.c, leon_greth/leon_greth.c,
leon_smc91111/leon_smc91111.c: Remove warnings.
2007-09-06 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-09-06 Joel Sherrill <joel.sherrill@OARcorp.com>
* pci/pci.c: Fix some warnings. * pci/pci.c: Fix some warnings.

View File

@@ -91,7 +91,6 @@ static int isinit = 0;
volatile LEON3_UART_Regs_Map *LEON3_Console_Uart[LEON3_APBUARTS]; volatile LEON3_UART_Regs_Map *LEON3_Console_Uart[LEON3_APBUARTS];
int scan_uarts() { int scan_uarts() {
unsigned int iobar, conf;
int i; int i;
amba_apb_device apbuarts[LEON3_APBUARTS]; amba_apb_device apbuarts[LEON3_APBUARTS];
@@ -100,7 +99,7 @@ int scan_uarts() {
uarts = amba_find_apbslvs(&amba_conf,VENDOR_GAISLER,GAISLER_APBUART,apbuarts,LEON3_APBUARTS); uarts = amba_find_apbslvs(&amba_conf,VENDOR_GAISLER,GAISLER_APBUART,apbuarts,LEON3_APBUARTS);
for(i=0; i<uarts; i++){ for(i=0; i<uarts; i++){
LEON3_Console_Uart[i] = apbuarts[i].start; LEON3_Console_Uart[i] = (volatile LEON3_UART_Regs_Map *)apbuarts[i].start;
} }
isinit = 1; isinit = 1;
} }

View File

@@ -32,8 +32,6 @@ int rtems_leon_greth_driver_attach(
) )
{ {
int device_found = 0; int device_found = 0;
int i;
unsigned int conf, iobar;
unsigned int base_addr = 0; /* avoid warnings */ unsigned int base_addr = 0; /* avoid warnings */
unsigned int eth_irq = 0; /* avoid warnings */ unsigned int eth_irq = 0; /* avoid warnings */
amba_apb_device apbgreth; amba_apb_device apbgreth;

View File

@@ -4,7 +4,7 @@
#include <bsp.h> #include <bsp.h>
#include <libchip/smc91111exp.h> #include <libchip/smc91111exp.h>
#include <stdio.h> #include <rtems/bspIo.h>
#define SMC91111_BASE_ADDR (void*)0x20000300 #define SMC91111_BASE_ADDR (void*)0x20000300
@@ -33,9 +33,10 @@ rtems_smc91111_driver_attach_leon3 (struct rtems_bsdnet_ifconfig *config,
unsigned long addr_mctrl = 0; unsigned long addr_mctrl = 0;
LEON3_IOPORT_Regs_Map *io; LEON3_IOPORT_Regs_Map *io;
amba_apb_device apbpio, apbmctrl; amba_apb_device apbpio;
amba_ahb_device apbmctrl;
if ( amba_find_ahbslv(&amba_conf,VENDOR_GAISLER,GAISLER_PIOPORT,&apbpio) != 1 ){ if ( amba_find_apbslv(&amba_conf,VENDOR_GAISLER,GAISLER_PIOPORT,&apbpio) != 1 ){
printk("SMC9111_leon3: didn't find PIO\n"); printk("SMC9111_leon3: didn't find PIO\n");
return 0; return 0;
} }