diff options
| author | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2010-03-27 15:00:43 +0000 |
|---|---|---|
| committer | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2010-03-27 15:00:43 +0000 |
| commit | 4f5d1c9fd160fc19c0ccd47c7730f0f6141043a9 (patch) | |
| tree | 419aaf4738e8832bff977e2fed95567a317d2b77 /c/src/lib/libbsp/powerpc/beatnik | |
| parent | 2010-03-27 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-4f5d1c9fd160fc19c0ccd47c7730f0f6141043a9.tar.bz2 | |
removed warnings
Diffstat (limited to 'c/src/lib/libbsp/powerpc/beatnik')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/beatnik/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.c | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe.c | 8 |
3 files changed, 9 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/powerpc/beatnik/ChangeLog b/c/src/lib/libbsp/powerpc/beatnik/ChangeLog index e8dd64c9ea..b426cec6de 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/ChangeLog +++ b/c/src/lib/libbsp/powerpc/beatnik/ChangeLog @@ -1,3 +1,7 @@ +2010-03-27 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> + + * network/if_gfe/if_gme.c, network/if_em/if_em.c: Removed warnings + 2010-02-09 Till Straumann <strauman@slac.stanford.edu> * network/if_mve/mv643xx_eth.c: Fixed alignment attribute diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.c b/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.c index 749a4877a4..dc3bc93844 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.c +++ b/c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.c @@ -2571,7 +2571,7 @@ em_initialize_transmit_unit(struct adapter * adapter) E1000_WRITE_REG(&adapter->hw, TDT, 0); - HW_DEBUGOUT2("Base = %x, Length = %x\n", + HW_DEBUGOUT2("Base = %" PRIx32 ", Length = %" PRIx32 "\n", E1000_READ_REG(&adapter->hw, TDBAL), E1000_READ_REG(&adapter->hw, TDLEN)); diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe.c b/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe.c index 47ceb98182..b707fb8410 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe.c +++ b/c/src/lib/libbsp/powerpc/beatnik/network/if_gfe/if_gfe.c @@ -811,7 +811,7 @@ gfe_ifwatchdog(struct ifnet *ifp) uint32_t curtxdnum = (bus_space_read_4(sc->sc_gt_memt, sc->sc_gt_memh, txq->txq_ectdp) - txq->txq_desc_busaddr) / sizeof(txq->txq_descs[0]); GE_TXDPOSTSYNC(sc, txq, txq->txq_fi); GE_TXDPOSTSYNC(sc, txq, curtxdnum); - printf(" (fi=%d(%#x),lo=%d,cur=%" PRId32 "(%#x),icm=%#x) ", + printf(" (fi=%d(%#" PRIx32 "),lo=%d,cur=%" PRIx32 "(%#" PRIx32 "),icm=%#" PRIx32 ") ", txq->txq_fi, txq->txq_descs[txq->txq_fi].ed_cmdsts, txq->txq_lo, curtxdnum, txq->txq_descs[curtxdnum].ed_cmdsts, GE_READ(sc, EICR)); @@ -1758,7 +1758,7 @@ gfe_tx_enqueue(struct gfe_softc *sc, enum gfe_txprio txprio) */ d = NEXT_TXD(l); - out_be32(&d->ed_cmdsts,0); + out_be32((unsigned int*)&d->ed_cmdsts,0); GE_TXDPRESYNC(sc, txq, d - txq->txq_descs); @@ -2270,12 +2270,12 @@ gfe_whack(struct gfe_softc *sc, enum gfe_whack_op op) #endif /* FALLTHROUGH */ case GE_WHACK_CHANGE: - GE_DPRINTF(sc, ("(pcr=%#x,imr=%#x)", + GE_DPRINTF(sc, ("(pcr=%#" PRIx32 ",imr=%#" PRIx32 ")", GE_READ(sc, EPCR), GE_READ(sc, EIMR))); GE_WRITE(sc, EPCR, sc->sc_pcr | ETH_EPCR_EN); GE_WRITE(sc, EIMR, sc->sc_intrmask); gfe_ifstart(&sc->sc_ec.ec_if); - GE_DPRINTF(sc, ("(ectdp0=%#x, ectdp1=%#x)", + GE_DPRINTF(sc, ("(ectdp0=%#" PRIx32 ", ectdp1=%#" PRIx32 ")", GE_READ(sc, ECTDP0), GE_READ(sc, ECTDP1))); GE_FUNC_EXIT(sc, ""); return error; |