From b7acc4ada453eb4445370c6ac61cb2e442d98c20 Mon Sep 17 00:00:00 2001 From: Jennifer Averett Date: Mon, 2 May 2005 16:24:10 +0000 Subject: 2005-05-02 Jennifer Averett * libchip/network/cs8900.c, libchip/network/i82586.c, libchip/network/open_eth.c, libchip/network/sonic.c, libchip/serial/mc68681.c: Modified types to remove warnings. Added initialization to remove warnings. --- c/src/ChangeLog | 7 +++++++ c/src/libchip/network/cs8900.c | 2 +- c/src/libchip/network/i82586.c | 4 ++-- c/src/libchip/network/open_eth.c | 8 +++++++- c/src/libchip/network/sonic.c | 2 +- c/src/libchip/serial/mc68681.c | 2 +- 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 2089a9fb80..889c81134f 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,10 @@ +2005-05-02 Jennifer Averett + + * libchip/network/cs8900.c, libchip/network/i82586.c, + libchip/network/open_eth.c, libchip/network/sonic.c, + libchip/serial/mc68681.c: Modified types to remove + warnings. Added initialization to remove warnings. + 2005-04-28 Joel Sherrill * libchip/network/README.sonic: Rewritten to account for removal of diff --git a/c/src/libchip/network/cs8900.c b/c/src/libchip/network/cs8900.c index bf580c93fe..1577892987 100644 --- a/c/src/libchip/network/cs8900.c +++ b/c/src/libchip/network/cs8900.c @@ -1079,7 +1079,7 @@ cs8900_init (void *arg) } static int -cs8900_ioctl (struct ifnet *ifp, int cmd, caddr_t data) +cs8900_ioctl (struct ifnet *ifp, u_long cmd, caddr_t data) { cs8900_device *cs = ifp->if_softc; int error = 0; diff --git a/c/src/libchip/network/i82586.c b/c/src/libchip/network/i82586.c index 2191d3777c..c387910a49 100644 --- a/c/src/libchip/network/i82586.c +++ b/c/src/libchip/network/i82586.c @@ -182,7 +182,7 @@ Mode of operation: void i82586_reset (struct ie_softc *, int); void i82586_watchdog (struct ifnet *); void i82586_init (void *); -int i82586_ioctl (struct ifnet *, int cmd, caddr_t data); +int i82586_ioctl (struct ifnet *, u_long cmd, caddr_t data); void i82586_start (struct ifnet *); void i82586_stop (struct ifnet *, int); @@ -1952,7 +1952,7 @@ i82586_stop(struct ifnet *ifp, int disable) } int -i82586_ioctl(struct ifnet *ifp, int cmd, caddr_t data) +i82586_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { struct ie_softc *sc = ifp->if_softc; /* struct ifreq *ifr = (struct ifreq *)data; */ diff --git a/c/src/libchip/network/open_eth.c b/c/src/libchip/network/open_eth.c index fdbbf78ae3..f3dd89291d 100644 --- a/c/src/libchip/network/open_eth.c +++ b/c/src/libchip/network/open_eth.c @@ -55,6 +55,12 @@ #undef free #endif +/* + * XXX fix this + */ + +void *set_vector(void *, uint32_t, uint32_t); + /* #define OPEN_ETH_DEBUG */ @@ -637,7 +643,7 @@ open_eth_stats (struct open_eth_softc *sc) * Driver ioctl handler */ static int -open_eth_ioctl (struct ifnet *ifp, int command, caddr_t data) +open_eth_ioctl (struct ifnet *ifp, u_long command, caddr_t data) { struct open_eth_softc *sc = ifp->if_softc; int error = 0; diff --git a/c/src/libchip/network/sonic.c b/c/src/libchip/network/sonic.c index 644653ebab..38de0d2e92 100644 --- a/c/src/libchip/network/sonic.c +++ b/c/src/libchip/network/sonic.c @@ -1477,7 +1477,7 @@ SONIC_STATIC void sonic_init (void *arg) * Driver ioctl handler */ static int -sonic_ioctl (struct ifnet *ifp, int command, caddr_t data) +sonic_ioctl (struct ifnet *ifp, u_long command, caddr_t data) { struct sonic_softc *sc = ifp->if_softc; int error = 0; diff --git a/c/src/libchip/serial/mc68681.c b/c/src/libchip/serial/mc68681.c index 6319dea2b1..2d24ca6c8c 100644 --- a/c/src/libchip/serial/mc68681.c +++ b/c/src/libchip/serial/mc68681.c @@ -95,7 +95,7 @@ MC68681_STATIC int mc68681_set_attributes( unsigned int mode2; unsigned int baud_mask; unsigned int acr_bit; - unsigned int cmd; + unsigned int cmd = 0; setRegister_f setReg; rtems_interrupt_level Irql; -- cgit v1.2.3