summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-09-14 15:14:36 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-09-14 15:14:36 +0000
commit07e76b9b9ec3d6b4da7b6d20390cec81b2909993 (patch)
tree4410251c54037fd3dfa2c2f35e6412d1cec47f06 /c
parent2007-09-14 Daron Chabot <djc915@mail.usask.ca> (diff)
downloadrtems-07e76b9b9ec3d6b4da7b6d20390cec81b2909993.tar.bz2
2007-09-14 Joel Sherrill <joel.sherrill@OARcorp.com>
* network/if_1GHz/if_wm.c, network/if_1GHz/pci_map.c: Remove a few warnings.
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libbsp/powerpc/mvme5500/ChangeLog5
-rw-r--r--c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c18
-rw-r--r--c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/pci_map.c1
3 files changed, 8 insertions, 16 deletions
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
index 11d62c10c2..2fb8f8b9e4 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-14 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * network/if_1GHz/if_wm.c, network/if_1GHz/pci_map.c: Remove a few
+ warnings.
+
2007-09-07 Kate Feng <feng1@bnl.gov>
* ChangeLog, Makefile.am, README, README.booting, README.irq,
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c b/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c
index 2dbe21313f..453da7d9b1 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c
@@ -260,17 +260,6 @@ static void i82544EI_irq_off(const rtems_irq_connect_data *irq)
return;
}
}
-static int ifwm_macaddr(char *hwaddr)
-{
- hwaddr[0] = 0x00;
- hwaddr[1] = 0x01;
- hwaddr[2] = 0xaf;
- hwaddr[3] = 0x0b;
- hwaddr[4] = 0xb4;
- hwaddr[5] = 0x75;
-
- return 0;
-}
static int i82544EI_irq_is_on(const rtems_irq_connect_data *irq)
{
@@ -291,9 +280,9 @@ int rtems_i82544EI_driver_attach(struct rtems_bsdnet_ifconfig *config, int attac
struct ifnet *ifp;
uint8_t enaddr[ETHER_ADDR_LEN];
uint16_t myea[ETHER_ADDR_LEN / 2], cfg1, cfg2, swdpin;
- unsigned reg, preg;
+ unsigned reg;
int b,d,f; /* PCI bus/device/function */
- int unit, pmreg;
+ int unit;
void *softc_mem;
char *name;
@@ -503,7 +492,7 @@ static void i82544EI_stats(struct wm_softc *sc)
static int wm_ioctl(struct ifnet *ifp, u_long cmd,uint32_t data)
{
struct wm_softc *sc = ifp->if_softc;
- int error;
+ int error=0;
switch (cmd) {
default:
@@ -1478,7 +1467,6 @@ static void i82544EI_daemon(void *arg)
rtems_event_set events;
struct mbuf *m=0;
struct ifnet *ifp=&sc->arpcom.ac_if;
- int i;
#ifdef WM_DEBUG
printk("i82544EI_daemon()\n");
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/pci_map.c b/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/pci_map.c
index 94863f49e7..c238e637d0 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/pci_map.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/pci_map.c
@@ -66,7 +66,6 @@ int pci_io_find(int b, int d, int f, int reg,unsigned *basep,unsigned *sizep)
int pci_mem_find(int b, int d, int f, int reg, unsigned *basep,unsigned *sizep)
{
uint32_t address, mask;
- int s;
if (reg < PCI_MAPREG_START ||
#if 0