deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'contiki' into osd

Browse source
This commit is contained in:
Harald Pichler 2015-01-28 09:34:57 +01:00
parent 451e2df0f5 2604260653
commit 0f109e3541
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/net/packetbuf.c
View file

@ -56,10 +56,10 @@ static uint16_t buflen, bufptr;
static uint8_t hdrptr; static uint8_t hdrptr;
/* The declarations below ensure that the packet buffer is aligned on /* The declarations below ensure that the packet buffer is aligned on
an even 16-bit boundary. On some platforms (most notably the an even 32-bit boundary. On some platforms (most notably the
msp430), having apotentially misaligned packet buffer may lead to msp430 or OpenRISC), having a potentially misaligned packet buffer may lead to
problems when accessing 16-bit values. */ problems when accessing words. */
static uint16_t packetbuf_aligned[(PACKETBUF_SIZE + PACKETBUF_HDR_SIZE) / 2 + 1]; static uint32_t packetbuf_aligned[(PACKETBUF_SIZE + PACKETBUF_HDR_SIZE + 3) / 4];
static uint8_t *packetbuf = (uint8_t *)packetbuf_aligned; static uint8_t *packetbuf = (uint8_t *)packetbuf_aligned;
static uint8_t *packetbufptr; static uint8_t *packetbufptr;