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

Fixed build for platforms which use the default value for QUEUEBUF_NUM.

Browse source
This commit is contained in:
oliverschmidt 2010-10-12 19:51:28 +00:00
parent af3f4ae679
commit 2f89e69ff7
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/net/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.3 2010/10/04 20:26:01 adamdunkels Exp $ * $Id: queuebuf.c,v 1.4 2010/10/12 19:51:28 oliverschmidt Exp $
*/ */
/** /**
@ -47,12 +47,6 @@
#include <string.h> /* for memcpy() */ #include <string.h> /* for memcpy() */
#ifdef QUEUEBUF_CONF_NUM
#define QUEUEBUF_NUM QUEUEBUF_CONF_NUM
#else
#define QUEUEBUF_NUM 8
#endif
#ifdef QUEUEBUF_CONF_REF_NUM #ifdef QUEUEBUF_CONF_REF_NUM
#define QUEUEBUF_REF_NUM QUEUEBUF_CONF_REF_NUM #define QUEUEBUF_REF_NUM QUEUEBUF_CONF_REF_NUM
#else #else

8
core/net/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.2 2010/10/04 20:26:01 adamdunkels Exp $ * $Id: queuebuf.h,v 1.3 2010/10/12 19:51:28 oliverschmidt Exp $
*/ */
/** /**
@ -56,6 +56,12 @@
#include "net/packetbuf.h" #include "net/packetbuf.h"
#ifdef QUEUEBUF_CONF_NUM
#define QUEUEBUF_NUM QUEUEBUF_CONF_NUM
#else
#define QUEUEBUF_NUM 8
#endif
struct queuebuf; struct queuebuf;
void queuebuf_init(void); void queuebuf_init(void);

4
core/net/rime/collect.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: collect.c,v 1.60 2010/10/11 23:42:01 adamdunkels Exp $ * $Id: collect.c,v 1.61 2010/10/12 19:51:28 oliverschmidt Exp $
*/ */
/** /**
@ -129,7 +129,7 @@ struct ack_msg {
#define REXMIT_TIME CLOCK_SECOND * 1 #define REXMIT_TIME CLOCK_SECOND * 1
#define MAX_REXMIT_TIME_SCALING 2 #define MAX_REXMIT_TIME_SCALING 2
#define FORWARD_PACKET_LIFETIME (120 * (REXMIT_TIME)) #define FORWARD_PACKET_LIFETIME (120 * (REXMIT_TIME))
#define MAX_SENDING_QUEUE QUEUEBUF_CONF_NUM / 2 #define MAX_SENDING_QUEUE QUEUEBUF_NUM / 2
#define KEEPALIVE_REXMITS 8 #define KEEPALIVE_REXMITS 8
MEMB(send_queue_memb, struct packetqueue_item, MAX_SENDING_QUEUE); MEMB(send_queue_memb, struct packetqueue_item, MAX_SENDING_QUEUE);