RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

GRETH: fix build warnings with GCC-4.9

Browse Source
This commit is contained in:
Daniel Hellstrom
2015-02-05 08:05:56 +01:00
parent bf6fe95853
commit aedc98492d
2 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
c/src/lib/libbsp/sparc/leon3/include/bsp.h
View File

@@ -101,7 +101,7 @@ extern int rtems_leon_greth_driver_attach(
/* Configure GRETH driver */ /* Configure GRETH driver */
#define GRETH_SUPPORTED #define GRETH_SUPPORTED
#define GRETH_MEM_LOAD(addr) leon_r32_no_cache(addr) #define GRETH_MEM_LOAD(addr) leon_r32_no_cache((uintptr_t)addr)
extern int CPU_SPARC_HAS_SNOOPING; extern int CPU_SPARC_HAS_SNOOPING;

43
c/src/lib/libbsp/sparc/shared/net/greth.c
View File

@@ -117,7 +117,7 @@ extern void ipalign(struct mbuf *m);
#endif #endif
const struct timespec greth_tan = { const struct timespec greth_tan = {
GRETH_AUTONEGO_TIMEOUT_MS/1000, GRETH_AUTONEGO_TIMEOUT_MS/1000,
GRETH_AUTONEGO_TIMEOUT_MS*1000000 (GRETH_AUTONEGO_TIMEOUT_MS % 1000) * 1000000
}; };
/* For optimizing the autonegotiation time */ /* For optimizing the autonegotiation time */
@@ -213,7 +213,7 @@ static char *almalloc(int sz, int alignment)
/* GRETH interrupt handler */ /* GRETH interrupt handler */
void greth_interrupt (void *arg) static void greth_interrupt (void *arg)
{ {
uint32_t status; uint32_t status;
uint32_t ctrl; uint32_t ctrl;
@@ -256,16 +256,17 @@ static uint32_t read_mii(struct greth_softc *sc, uint32_t phy_addr, uint32_t reg
sc->regs->mdio_ctrl = (phy_addr << 11) | (reg_addr << 6) | GRETH_MDIO_READ; sc->regs->mdio_ctrl = (phy_addr << 11) | (reg_addr << 6) | GRETH_MDIO_READ;
while (sc->regs->mdio_ctrl & GRETH_MDIO_BUSY) {} while (sc->regs->mdio_ctrl & GRETH_MDIO_BUSY) {}
if (!(sc->regs->mdio_ctrl & GRETH_MDIO_LINKFAIL)) { if (!(sc->regs->mdio_ctrl & GRETH_MDIO_LINKFAIL)) {
MIIDBG("greth%d: mii read[%d] OK to %x.%x (0x%08x,0x%08x)\n", MIIDBG("greth%d: mii read[%d] OK to %" PRIx32 ".%" PRIx32
sc->minor, sc->phy_read_access, phy_addr, reg_addr, " (0x%08" PRIx32 ",0x%08" PRIx32 ")\n",
sc->regs->ctrl, sc->regs->mdio_ctrl); sc->minor, sc->phy_read_access, phy_addr, reg_addr,
sc->regs->ctrl, sc->regs->mdio_ctrl);
return((sc->regs->mdio_ctrl >> 16) & 0xFFFF); return((sc->regs->mdio_ctrl >> 16) & 0xFFFF);
} else { } else {
printf("greth%d: mii read[%d] failed to %x.%x (0x%08x,0x%08x)\n", printf("greth%d: mii read[%d] failed to %" PRIx32 ".%" PRIx32
sc->minor, sc->phy_read_access, phy_addr, reg_addr, " (0x%08" PRIx32 ",0x%08" PRIx32 ")\n",
sc->regs->ctrl, sc->regs->mdio_ctrl); sc->minor, sc->phy_read_access, phy_addr, reg_addr,
return (0xffff); sc->regs->ctrl, sc->regs->mdio_ctrl);
return (0xffff);
} }
} }
@@ -277,13 +278,15 @@ static void write_mii(struct greth_softc *sc, uint32_t phy_addr, uint32_t reg_ad
((data & 0xFFFF) << 16) | (phy_addr << 11) | (reg_addr << 6) | GRETH_MDIO_WRITE; ((data & 0xFFFF) << 16) | (phy_addr << 11) | (reg_addr << 6) | GRETH_MDIO_WRITE;
while (sc->regs->mdio_ctrl & GRETH_MDIO_BUSY) {} while (sc->regs->mdio_ctrl & GRETH_MDIO_BUSY) {}
if (!(sc->regs->mdio_ctrl & GRETH_MDIO_LINKFAIL)) { if (!(sc->regs->mdio_ctrl & GRETH_MDIO_LINKFAIL)) {
MIIDBG("greth%d: mii write[%d] OK to %x.%x (0x%08x,0x%08x)\n", MIIDBG("greth%d: mii write[%d] OK to to %" PRIx32 ".%" PRIx32
sc->minor, sc->phy_write_access, phy_addr, reg_addr, "(0x%08" PRIx32 ",0x%08" PRIx32 ")\n",
sc->regs->ctrl, sc->regs->mdio_ctrl); sc->minor, sc->phy_write_access, phy_addr, reg_addr,
sc->regs->ctrl, sc->regs->mdio_ctrl);
} else { } else {
printf("greth%d: mii write[%d] failed to %x.%x (0x%08x,0x%08x)\n", printf("greth%d: mii write[%d] failed to to %" PRIx32 ".%" PRIx32
sc->minor, sc->phy_write_access, phy_addr, reg_addr, " (0x%08" PRIx32 ",0x%08" PRIx32 ")\n",
sc->regs->ctrl, sc->regs->mdio_ctrl); sc->minor, sc->phy_write_access, phy_addr, reg_addr,
sc->regs->ctrl, sc->regs->mdio_ctrl);
} }
} }
@@ -310,7 +313,7 @@ static void print_init_info(struct greth_softc *sc)
} }
#ifdef GRETH_AUTONEGO_PRINT_TIME #ifdef GRETH_AUTONEGO_PRINT_TIME
if ( sc->auto_neg ) { if ( sc->auto_neg ) {
printf("Autonegotiation Time: %dms\n", sc->auto_neg_time.tv_sec * 1000 + printf("Autonegotiation Time: %ldms\n", sc->auto_neg_time.tv_sec * 1000 +
sc->auto_neg_time.tv_nsec / 1000000); sc->auto_neg_time.tv_nsec / 1000000);
} }
#endif #endif
@@ -621,7 +624,7 @@ void ipalign(struct mbuf *m)
} }
#endif #endif
void static void
greth_Daemon (void *arg) greth_Daemon (void *arg)
{ {
struct ether_header *eh; struct ether_header *eh;
@@ -841,7 +844,7 @@ sendpacket (struct ifnet *ifp, struct mbuf *m)
} }
int static int
sendpacket_gbit (struct ifnet *ifp, struct mbuf *m) sendpacket_gbit (struct ifnet *ifp, struct mbuf *m)
{ {
struct greth_softc *dp = ifp->if_softc; struct greth_softc *dp = ifp->if_softc;
@@ -1236,7 +1239,7 @@ greth_ioctl (struct ifnet *ifp, ioctl_command_t command, caddr_t data)
/* /*
* Attach an GRETH driver to the system * Attach an GRETH driver to the system
*/ */
int static int
greth_interface_driver_attach ( greth_interface_driver_attach (
struct rtems_bsdnet_ifconfig *config, struct rtems_bsdnet_ifconfig *config,
int attach int attach