Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-08-30 19:57:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

bsp/beatnik: Fixes due to header file changes

Browse Source 
Update #2833.
This commit is contained in:
Sebastian Huber
2017-06-12 15:30:54 +02:00
parent 86c100439c
commit 74a13c86ea
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.c
+2 -2
View File
@@ -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);
c/src/lib/libbsp/powerpc/beatnik/network/if_mve/mv643xx_eth.c
+5 -5
View File
@@ -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;