diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-06-12 15:30:13 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-06-12 15:30:54 +0200 |
| commit | 74a13c86ea9b96ba075aa57549fab77f5d56ea67 (patch) | |
| tree | 05b85c4a354167f611644ff4ac9283d3f709f15e | |
| parent | network: Remove FreeBSD specific hack (diff) | |
| download | rtems-74a13c86ea9b96ba075aa57549fab77f5d56ea67.tar.bz2 | |
bsp/beatnik: Fixes due to header file changes
Update #2833.
| -rw-r--r-- | c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.c | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/beatnik/network/if_mve/mv643xx_eth.c | 10 |
2 files changed, 7 insertions, 7 deletions
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 98f145314c..3bdde5c65d 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 @@ -39,6 +39,7 @@ POSSIBILITY OF SUCH DAMAGE. #include <rtemscompat.h> #include <if_em.h> #include <rtemscompat1.h> +#include <inttypes.h> #endif /********************************************************************* @@ -1410,12 +1411,11 @@ em_encap(struct adapter *adapter, struct mbuf **m_headp) return (error); } #else - error = 0; + (void)error; { struct mbuf *m; for ( m=m_head, nsegs=0; m; m=m->m_next, nsegs++ ) { if ( nsegs >= sizeof(segs)/sizeof(segs[0]) ) { - error = -1; break; } segs[nsegs].ds_addr = mtod(m, unsigned); diff --git a/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/mv643xx_eth.c b/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/mv643xx_eth.c index 53f9b545af..42f3914e18 100644 --- a/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/mv643xx_eth.c +++ b/c/src/lib/libbsp/powerpc/beatnik/network/if_mve/mv643xx_eth.c @@ -89,6 +89,7 @@ #include <bsp/gtreg.h> #include <libcpu/byteorder.h> +#include <sys/param.h> #include <dev/mii/mii.h> #include <net/if_media.h> @@ -384,7 +385,7 @@ /* HELPER MACROS */ /* Align base to alignment 'a' */ -#define _ALIGN(b, a) ((((uint32_t)(b)) + (a)-1) & (~((a)-1))) +#define MV643XX_ALIGN(b, a) ((((uint32_t)(b)) + (a)-1) & (~((a)-1))) #define NOOP() do {} while(0) @@ -969,9 +970,8 @@ typedef char maxbuf[2048]; /* more than an ethernet packet */ */ static inline void FLUSH_BUF(register uintptr_t addr, register int len) { -typedef char maxbuf[2048]; /* more than an ethernet packet */ asm volatile("":::"memory"); - len = _ALIGN(len, RX_BUF_ALIGNMENT); + len = MV643XX_ALIGN(len, RX_BUF_ALIGNMENT); do { asm volatile("dcbf %0, %1"::"b"(addr),"r"(len)); len -= RX_BUF_ALIGNMENT; @@ -2434,7 +2434,7 @@ static int inited = 0; */ if ( mp->rbuf_count > 0 ) { - mp->rx_ring = (MvEthRxDesc)_ALIGN(mp->ring_area, RING_ALIGNMENT); + mp->rx_ring = (MvEthRxDesc)MV643XX_ALIGN(mp->ring_area, RING_ALIGNMENT); mveth_init_rx_desc_ring(mp); } @@ -2663,7 +2663,7 @@ unsigned long l,o; } o = mtod(m, unsigned long); - l = _ALIGN(o, RX_BUF_ALIGNMENT) - o; + l = MV643XX_ALIGN(o, RX_BUF_ALIGNMENT) - o; /* align start of buffer */ m->m_data += l; |