Changeset 74a13c8 in rtems


Ignore:
Timestamp:
Jun 12, 2017, 1:30:13 PM (2 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
0af8bb6
Parents:
86c1004
git-author:
Sebastian Huber <sebastian.huber@…> (06/12/17 13:30:13)
git-committer:
Sebastian Huber <sebastian.huber@…> (06/12/17 13:30:54)
Message:

bsp/beatnik: Fixes due to header file changes

Update #2833.

Location:
c/src/lib/libbsp/powerpc/beatnik/network
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/beatnik/network/if_em/if_em.c

    r86c1004 r74a13c8  
    4040#include <if_em.h>
    4141#include <rtemscompat1.h>
     42#include <inttypes.h>
    4243#endif
    4344
     
    14111412        }
    14121413#else
    1413                 error = 0;
     1414                (void)error;
    14141415                {
    14151416                struct mbuf *m;
    14161417                        for ( m=m_head, nsegs=0; m; m=m->m_next, nsegs++ ) {
    14171418                                if ( nsegs >= sizeof(segs)/sizeof(segs[0]) ) {
    1418                                         error = -1;
    14191419                                        break;
    14201420                                }
  • c/src/lib/libbsp/powerpc/beatnik/network/if_mve/mv643xx_eth.c

    r86c1004 r74a13c8  
    9090#include <libcpu/byteorder.h>
    9191
     92#include <sys/param.h>
    9293#include <dev/mii/mii.h>
    9394#include <net/if_media.h>
     
    385386
    386387/* Align base to alignment 'a' */
    387 #define _ALIGN(b, a)    ((((uint32_t)(b)) + (a)-1) & (~((a)-1)))
     388#define MV643XX_ALIGN(b, a)     ((((uint32_t)(b)) + (a)-1) & (~((a)-1)))
    388389
    389390#define NOOP()                  do {} while(0)
     
    970971static inline void FLUSH_BUF(register uintptr_t addr, register int len)
    971972{
    972 typedef char maxbuf[2048]; /* more than an ethernet packet */
    973973        asm volatile("":::"memory");
    974         len = _ALIGN(len, RX_BUF_ALIGNMENT);
     974        len = MV643XX_ALIGN(len, RX_BUF_ALIGNMENT);
    975975        do {
    976976                asm volatile("dcbf %0, %1"::"b"(addr),"r"(len));
     
    24352435
    24362436        if ( mp->rbuf_count > 0 ) {
    2437                 mp->rx_ring = (MvEthRxDesc)_ALIGN(mp->ring_area, RING_ALIGNMENT);
     2437                mp->rx_ring = (MvEthRxDesc)MV643XX_ALIGN(mp->ring_area, RING_ALIGNMENT);
    24382438                mveth_init_rx_desc_ring(mp);
    24392439        }
     
    26642664
    26652665        o = mtod(m, unsigned long);
    2666         l = _ALIGN(o, RX_BUF_ALIGNMENT) - o;
     2666        l = MV643XX_ALIGN(o, RX_BUF_ALIGNMENT) - o;
    26672667
    26682668        /* align start of buffer */
Note: See TracChangeset for help on using the changeset viewer.