From a612b501b3b1473f3996acf55fbb142c28743be6 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 1 Sep 2006 15:39:00 +0000 Subject: 2006-09-01 Joel Sherrill * libchip/network/cs8900.c, libchip/network/greth.c, libchip/network/i82586.c, libchip/network/open_eth.c, libchip/network/sonic.c: Remove warnings -- use uintptr_t, properly sized integers, and inttypes.h printf helpers. --- c/src/ChangeLog | 7 +++++++ c/src/libchip/network/cs8900.c | 2 +- c/src/libchip/network/greth.c | 7 +++++-- c/src/libchip/network/i82586.c | 4 ++-- c/src/libchip/network/open_eth.c | 4 +++- c/src/libchip/network/sonic.c | 2 +- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 780de5d2fb..b788cf2311 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,10 @@ +2006-09-01 Joel Sherrill + + * libchip/network/cs8900.c, libchip/network/greth.c, + libchip/network/i82586.c, libchip/network/open_eth.c, + libchip/network/sonic.c: Remove warnings -- use uintptr_t, properly + sized integers, and inttypes.h printf helpers. + 2006-08-09 Kolja Waschk * aclocal/rtems-cpu-subdirs.m4: New port to Altera NIOS II. diff --git a/c/src/libchip/network/cs8900.c b/c/src/libchip/network/cs8900.c index 1577892987..0121c1c3e5 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, u_long cmd, caddr_t data) +cs8900_ioctl (struct ifnet *ifp, ioctl_command_t cmd, caddr_t data) { cs8900_device *cs = ifp->if_softc; int error = 0; diff --git a/c/src/libchip/network/greth.c b/c/src/libchip/network/greth.c index 699373d25b..7090189eaf 100644 --- a/c/src/libchip/network/greth.c +++ b/c/src/libchip/network/greth.c @@ -41,6 +41,8 @@ #undef free #endif +extern void set_vector( rtems_isr_entry, rtems_vector_number, int ); + /* #define GRETH_DEBUG */ @@ -224,7 +226,8 @@ greth_initialize_hardware (struct greth_softc *sc) write_mii(0, 0x8000); while (read_mii(0) & 0x8000) {} fd = regs->mdio_ctrl >> 24; /*duplex mode*/ - printf("greth: driver attached, PHY config : 0x%04x\n", read_mii(0)); + printf( + "greth: driver attached, PHY config: 0x%04" PRIx32 "\n", read_mii(0)); /* Initialize rx/tx descriptor pointers */ sc->txdesc = (greth_rxtxdesc *) almalloc(1024); @@ -560,7 +563,7 @@ greth_stats (struct greth_softc *sc) * Driver ioctl handler */ static int -greth_ioctl (struct ifnet *ifp, int command, caddr_t data) +greth_ioctl (struct ifnet *ifp, ioctl_command_t command, caddr_t data) { struct greth_softc *sc = ifp->if_softc; int error = 0; diff --git a/c/src/libchip/network/i82586.c b/c/src/libchip/network/i82586.c index c387910a49..38f6f8abf1 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 *, u_long cmd, caddr_t data); +int i82586_ioctl (struct ifnet *, ioctl_command_t 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, u_long cmd, caddr_t data) +i82586_ioctl(struct ifnet *ifp, ioctl_command_t 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 b1feb3c5d0..a02901b0a2 100644 --- a/c/src/libchip/network/open_eth.c +++ b/c/src/libchip/network/open_eth.c @@ -55,6 +55,8 @@ #undef free #endif +extern void set_vector( rtems_isr_entry, rtems_vector_number, int ); + /* #define OPEN_ETH_DEBUG */ @@ -630,7 +632,7 @@ open_eth_stats (struct open_eth_softc *sc) * Driver ioctl handler */ static int -open_eth_ioctl (struct ifnet *ifp, u_long command, caddr_t data) +open_eth_ioctl (struct ifnet *ifp, ioctl_command_t 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 38de0d2e92..6cfb60d247 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, u_long command, caddr_t data) +sonic_ioctl (struct ifnet *ifp, ioctl_command_t command, caddr_t data) { struct sonic_softc *sc = ifp->if_softc; int error = 0; -- cgit v1.2.3