diff options
| -rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/network/network.c | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/m68k/uC5282/ChangeLog b/c/src/lib/libbsp/m68k/uC5282/ChangeLog index 994c228453..172fdb290f 100644 --- a/c/src/lib/libbsp/m68k/uC5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/uC5282/ChangeLog @@ -1,3 +1,8 @@ +2010-04-26 Eric Norum <norume@aps.anl.gov> + + * startup/bspstart.c: Clean up some warnings. + * network/network.c: Fix up full/half duplex printout and some warnings. + 2010-04-08 Joel Sherrill <joel.sherrilL@OARcorp.com> * start/start.S: Spacing. diff --git a/c/src/lib/libbsp/m68k/uC5282/network/network.c b/c/src/lib/libbsp/m68k/uC5282/network/network.c index 1cc26c0820..364dbd8356 100644 --- a/c/src/lib/libbsp/m68k/uC5282/network/network.c +++ b/c/src/lib/libbsp/m68k/uC5282/network/network.c @@ -831,7 +831,7 @@ enet_stats(struct mcf5282_enet_struct *sc) else { fixed = 1; speed = sc->mii_cr & 0x2000 ? 100 : 10; - full = sc->mii_cr & 0x100 ? "full" : "half"; + full = sc->mii_cr & 0x100 ? 1 : 0; } printf("Link %s %d Mb/s, %s-duplex.\n", fixed ? "fixed" : "auto-negotiate", @@ -872,7 +872,7 @@ enet_stats(struct mcf5282_enet_struct *sc) } static int -fec_ioctl(struct ifnet *ifp, int command, caddr_t data) +fec_ioctl(struct ifnet *ifp, ioctl_command_t command, caddr_t data) { struct mcf5282_enet_struct *sc = ifp->if_softc; int error = 0; @@ -925,7 +925,7 @@ rtems_fec_driver_attach(struct rtems_bsdnet_ifconfig *config, int attaching ) int mtu; int unitNumber; char *unitName; - unsigned char *hwaddr; + const unsigned char *hwaddr; const char *env; /* diff --git a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c index 22fc635dcd..8b7dfc5a76 100644 --- a/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/uC5282/startup/bspstart.c @@ -21,6 +21,7 @@ #include <bsp.h> #include <rtems/error.h> #include <errno.h> +#include <stdio.h> /* * Location of 'VME' access @@ -184,7 +185,7 @@ void _CPU_cache_invalidate_1_data_line(const void *addr) #endif } -extern void bsp_fake_syscall(void); +extern void bsp_fake_syscall(int); /* * The Arcturus boot ROM prints exception information improperly |