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

Removed the (unused) header packet of the queuebuf. Added a function for accessing address attributes in the queuebuf

Browse source
This commit is contained in:
adamdunkels 2010-04-30 07:29:08 +00:00
parent 3c735fcea4
commit e523c36cdf
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/net/rime/queuebuf.c
View file

@ -33,7 +33,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: queuebuf.c,v 1.16 2010/02/08 21:10:32 adamdunkels Exp $ * $Id: queuebuf.c,v 1.17 2010/04/30 07:29:08 adamdunkels Exp $
*/ */
/** /**
@ -61,7 +61,7 @@
struct queuebuf { struct queuebuf {
uint16_t len; uint16_t len;
uint8_t data[PACKETBUF_SIZE + PACKETBUF_HDR_SIZE]; uint8_t data[PACKETBUF_SIZE];
struct packetbuf_attr attrs[PACKETBUF_NUM_ATTRS]; struct packetbuf_attr attrs[PACKETBUF_NUM_ATTRS];
struct packetbuf_addr addrs[PACKETBUF_NUM_ADDRS]; struct packetbuf_addr addrs[PACKETBUF_NUM_ADDRS];
}; };
@ -132,6 +132,7 @@ queuebuf_new_from_packetbuf(void)
if(buf != NULL) { if(buf != NULL) {
#if QUEUEBUF_STATS #if QUEUEBUF_STATS
++queuebuf_len; ++queuebuf_len;
PRINTF("queuebuf len %d\n", queuebuf_len);
if(queuebuf_len == queuebuf_max_len + 1) { if(queuebuf_len == queuebuf_max_len + 1) {
memb_free(&bufmem, buf); memb_free(&bufmem, buf);
queuebuf_len--; queuebuf_len--;
@ -182,7 +183,7 @@ void
queuebuf_to_packetbuf(struct queuebuf *b) queuebuf_to_packetbuf(struct queuebuf *b)
{ {
struct queuebuf_ref *r; struct queuebuf_ref *r;
if(memb_inmemb(&bufmem, b)) { if(memb_inmemb(&bufmem, b)) {
packetbuf_copyfrom(b->data, b->len); packetbuf_copyfrom(b->data, b->len);
packetbuf_attr_copyfrom(b->attrs, b->addrs); packetbuf_attr_copyfrom(b->attrs, b->addrs);
@ -215,4 +216,10 @@ queuebuf_datalen(struct queuebuf *b)
return b->len; return b->len;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
const rimeaddr_t *
queuebuf_addr(struct queuebuf *b, uint8_t type)
{
return &b->addrs[type];
}
/*---------------------------------------------------------------------------*/
/** @} */ /** @} */

3
core/net/rime/queuebuf.h
View file

@ -41,7 +41,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: queuebuf.h,v 1.6 2009/03/12 21:58:21 adamdunkels Exp $ * $Id: queuebuf.h,v 1.7 2010/04/30 07:29:08 adamdunkels Exp $
*/ */
/** /**
@ -67,6 +67,7 @@ void queuebuf_to_packetbuf(struct queuebuf *b);
void *queuebuf_dataptr(struct queuebuf *b); void *queuebuf_dataptr(struct queuebuf *b);
int queuebuf_datalen(struct queuebuf *b); int queuebuf_datalen(struct queuebuf *b);
const rimeaddr_t *queuebuf_addr(struct queuebuf *b, uint8_t type);
#endif /* __QUEUEBUF_H__ */ #endif /* __QUEUEBUF_H__ */