diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-03-14 23:41:57 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2005-03-14 23:41:57 +0000 |
| commit | 650a6e7f206a89859b15c5b5445718cc08fb6840 (patch) | |
| tree | 2635fa74c046679cfbf27245645ba66e82bf22aa /c/src/lib/libbsp/mips | |
| parent | 2005-03-14 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-650a6e7f206a89859b15c5b5445718cc08fb6840.tar.bz2 | |
2005-03-14 Joel Sherrill <joel@OARcorp.com>
* include/.cvsignore: Fixed typo.
* network/network.c: Now compiles with GCC 4.0.
Diffstat (limited to 'c/src/lib/libbsp/mips')
| -rw-r--r-- | c/src/lib/libbsp/mips/csb350/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/mips/csb350/include/.cvsignore | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/mips/csb350/network/network.c | 9 |
3 files changed, 12 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/mips/csb350/ChangeLog b/c/src/lib/libbsp/mips/csb350/ChangeLog index 15426daf2e..609aeffdf1 100644 --- a/c/src/lib/libbsp/mips/csb350/ChangeLog +++ b/c/src/lib/libbsp/mips/csb350/ChangeLog @@ -1,3 +1,8 @@ +2005-03-14 Joel Sherrill <joel@OARcorp.com> + + * include/.cvsignore: Fixed typo. + * network/network.c: Now compiles with GCC 4.0. + 2005-03-04 Joel Sherrill <joel@OARcorp.com> * .cvsignore, ChangeLog, include/.cvsignore: New files. diff --git a/c/src/lib/libbsp/mips/csb350/include/.cvsignore b/c/src/lib/libbsp/mips/csb350/include/.cvsignore index a413bfe280..e067316c09 100644 --- a/c/src/lib/libbsp/mips/csb350/include/.cvsignore +++ b/c/src/lib/libbsp/mips/csb350/include/.cvsignore @@ -1 +1 @@ -include/bspopts.h.in +bspopts.h.in diff --git a/c/src/lib/libbsp/mips/csb350/network/network.c b/c/src/lib/libbsp/mips/csb350/network/network.c index 7bf2cc65d4..30e100be16 100644 --- a/c/src/lib/libbsp/mips/csb350/network/network.c +++ b/c/src/lib/libbsp/mips/csb350/network/network.c @@ -458,7 +458,8 @@ void au1x00_emac_init_hw(au1x00_emac_softc_t *sc) * boundary. */ if (mtod(m, unsigned32) & 0x1f) { - mtod(m, unsigned32) = (mtod(m, unsigned32) + 0x1f) & 0x1f; + unsigned32 *p = &mtod(m, unsigned32); + *p = (mtod(m, unsigned32) + 0x1f) & 0x1f; } sc->rx_dma[i].addr = (mtod(m, unsigned32) & ~0xe0000000); sc->rx_mbuf[i] = m; @@ -652,7 +653,9 @@ void au1x00_emac_rx_daemon (void *arg) * The receive buffer must be aligned with a cache line * boundary. */ - mtod(m, unsigned32) = (mtod(m, unsigned32) + 0x1f) & ~0x1f; + { unsigned32 *p = &mtod(m, unsigned32); + *p = (mtod(m, unsigned32) + 0x1f) & ~0x1f; + } } else { sc->rx_dropped++; @@ -824,7 +827,7 @@ au1x00_emac_ioctl (struct ifnet *ifp, int command, caddr_t data) /* interrupt handler */ rtems_isr au1x00_emac_isr (rtems_vector_number v) { - au1x00_emac_softc_t *sc; + volatile au1x00_emac_softc_t *sc; int index; int tx_flag = 0; int rx_flag = 0; |