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

Removed the explicit header buffer; both the header and data are not in the same 'physical' buffer. Added function for copying referenced data into the rimebuf.

Browse source
This commit is contained in:
adamdunkels 2007-03-13 10:28:16 +00:00
parent 21ef887f07
commit ca359a6314
1 changed files with 39 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
core/net/rime/rimebuf.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: rimebuf.c,v 1.1 2007/02/28 16:38:52 adamdunkels Exp $ * $Id: rimebuf.c,v 1.2 2007/03/13 10:28:16 adamdunkels Exp $
*/ */
/** /**
@ -46,12 +46,11 @@
static u16_t buflen, bufptr; static u16_t buflen, bufptr;
static u8_t rimebuf[NETBUF_SIZE]; static u8_t hdrptr;
static u8_t rimebuf[RIMEBUF_SIZE + RIMEBUF_HDR_SIZE];
static u8_t *rimebufptr; static u8_t *rimebufptr;
static u8_t hdrptr;
static u8_t rimebuf_hdr[NETBUF_HDR_SIZE];
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -59,9 +58,9 @@ void
rimebuf_clear(void) rimebuf_clear(void)
{ {
buflen = bufptr = 0; buflen = bufptr = 0;
hdrptr = NETBUF_HDR_SIZE; hdrptr = RIMEBUF_HDR_SIZE;
rimebufptr = rimebuf; rimebufptr = &rimebuf[RIMEBUF_HDR_SIZE];
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int int
@ -70,51 +69,60 @@ rimebuf_copyfrom(u8_t *from, u16_t len)
u16_t l; u16_t l;
rimebuf_clear(); rimebuf_clear();
l = len > NETBUF_SIZE? NETBUF_SIZE: len; l = len > RIMEBUF_SIZE? RIMEBUF_SIZE: len;
memcpy(rimebufptr, from, l); memcpy(rimebufptr, from, l);
buflen = l; buflen = l;
return l; return l;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void
rimebuf_copy_reference(void)
{
if(rimebuf_is_reference()) {
memcpy(&rimebuf[RIMEBUF_HDR_SIZE], rimebuf_reference_ptr(),
rimebuf_datalen());
}
}
/*---------------------------------------------------------------------------*/
int int
rimebuf_copyto_hdr(u8_t *to) rimebuf_copyto_hdr(u8_t *to)
{ {
{ if(DEBUG_LEVEL > 0) {
int i; int i;
DEBUGF(0, "rimebuf_write_hdr: header:\n"); DEBUGF(0, "rimebuf_write_hdr: header:\n");
for(i = hdrptr; i < NETBUF_HDR_SIZE; ++i) { for(i = hdrptr; i < RIMEBUF_HDR_SIZE; ++i) {
DEBUGF(0, "0x%02x, ", rimebuf_hdr[i]); DEBUGF(0, "0x%02x, ", rimebuf[i]);
} }
DEBUGF(0, "\n"); DEBUGF(0, "\n");
} }
memcpy(to, rimebuf_hdr + hdrptr, NETBUF_HDR_SIZE - hdrptr); memcpy(to, rimebuf + hdrptr, RIMEBUF_HDR_SIZE - hdrptr);
return NETBUF_HDR_SIZE - hdrptr; return RIMEBUF_HDR_SIZE - hdrptr;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int int
rimebuf_copyto(u8_t *to) rimebuf_copyto(u8_t *to)
{ {
{ if(DEBUG_LEVEL > 0) {
int i; int i;
char buffer[1000]; char buffer[1000];
char *bufferptr = buffer; char *bufferptr = buffer;
bufferptr[0] = 0; bufferptr[0] = 0;
for(i = hdrptr; i < NETBUF_HDR_SIZE; ++i) { for(i = hdrptr; i < RIMEBUF_HDR_SIZE; ++i) {
bufferptr += sprintf(bufferptr, "0x%02x, ", rimebuf_hdr[i]); bufferptr += sprintf(bufferptr, "0x%02x, ", rimebuf[i]);
} }
DEBUGF(0, "rimebuf_write: header: %s\n", buffer); DEBUGF(0, "rimebuf_write: header: %s\n", buffer);
bufferptr = buffer; bufferptr = buffer;
bufferptr[0] = 0; bufferptr[0] = 0;
for(i = bufptr; i < buflen + bufptr; ++i) { for(i = bufptr; i < buflen + bufptr; ++i) {
bufferptr += sprintf(bufferptr, "0x%02x, ", rimebuf[i]); bufferptr += sprintf(bufferptr, "0x%02x, ", rimebufptr[i]);
} }
DEBUGF(0, "rimebuf_write: data: %s\n", buffer); DEBUGF(0, "rimebuf_write: data: %s\n", buffer);
} }
memcpy(to, rimebuf_hdr + hdrptr, NETBUF_HDR_SIZE - hdrptr); memcpy(to, rimebuf + hdrptr, RIMEBUF_HDR_SIZE - hdrptr);
memcpy(to + NETBUF_HDR_SIZE - hdrptr, rimebufptr + bufptr, memcpy(to + RIMEBUF_HDR_SIZE - hdrptr, rimebufptr + bufptr,
buflen); buflen);
return NETBUF_HDR_SIZE - hdrptr + buflen; return RIMEBUF_HDR_SIZE - hdrptr + buflen;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int int
@ -141,7 +149,7 @@ rimebuf_hdrreduce(int size)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
rimebuf_set_len(u16_t len) rimebuf_set_datalen(u16_t len)
{ {
DEBUGF(0, "rimebuf_set_len: len %d\n", len); DEBUGF(0, "rimebuf_set_len: len %d\n", len);
buflen = len; buflen = len;
@ -150,13 +158,13 @@ rimebuf_set_len(u16_t len)
void * void *
rimebuf_dataptr(void) rimebuf_dataptr(void)
{ {
return (void *)(&rimebuf[bufptr]); return (void *)(&rimebuf[bufptr + RIMEBUF_HDR_SIZE]);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void * void *
rimebuf_hdrptr(void) rimebuf_hdrptr(void)
{ {
return (void *)(&rimebuf_hdr[hdrptr]); return (void *)(&rimebuf[hdrptr]);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
@ -170,7 +178,7 @@ rimebuf_reference(void *ptr, u16_t len)
int int
rimebuf_is_reference(void) rimebuf_is_reference(void)
{ {
return rimebufptr != rimebuf; return rimebufptr != &rimebuf[RIMEBUF_HDR_SIZE];
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void * void *
@ -180,7 +188,7 @@ rimebuf_reference_ptr(void)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
u16_t u16_t
rimebuf_len(void) rimebuf_datalen(void)
{ {
return buflen; return buflen;
} }
@ -188,6 +196,12 @@ rimebuf_len(void)
u8_t u8_t
rimebuf_hdrlen(void) rimebuf_hdrlen(void)
{ {
return NETBUF_HDR_SIZE - hdrptr; return RIMEBUF_HDR_SIZE - hdrptr;
}
/*---------------------------------------------------------------------------*/
u16_t
rimebuf_totlen(void)
{
return rimebuf_hdrlen() + rimebuf_datalen();
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/