Merge pull request #733 from kkrentz/init-pr

Fix to queuebuf initialization
This commit is contained in:
George Oikonomou 2018-10-27 15:49:49 +01:00 committed by GitHub
commit c174d7ddcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 8 deletions

View File

@ -74,6 +74,10 @@
/* Packet buffer */
#define PACKETBUF_CONF_SIZE 1280 /**< Required IPv6 MTU size */
/* Queuebuf */
#define QUEUEBUF_CONF_ENABLED 0
/** @} */
/**

View File

@ -48,6 +48,7 @@
#include "sys/stack-check.h"
#include "dev/watchdog.h"
#include "net/queuebuf.h"
#include "net/app-layer/coap/coap-engine.h"
#include "services/rpl-border-router/rpl-border-router.h"
#include "services/orchestra/orchestra.h"
@ -89,6 +90,9 @@ main(void)
platform_init_stage_two();
#if QUEUEBUF_ENABLED
queuebuf_init();
#endif /* QUEUEBUF_ENABLED */
netstack_init();
node_id_init();

View File

@ -2061,11 +2061,6 @@ sicslowpan_init(void)
#endif /* SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS > 1 */
#endif /* SICSLOWPAN_COMPRESSION == SICSLOWPAN_COMPRESSION_IPHC */
/* We use the queuebuf module if fragmentation is enabled */
#if SICSLOWPAN_CONF_FRAG
queuebuf_init();
#endif
}
/*--------------------------------------------------------------------*/
int

View File

@ -539,5 +539,4 @@ csma_output_init(void)
memb_init(&packet_memb);
memb_init(&metadata_memb);
memb_init(&neighbor_memb);
queuebuf_init();
}

View File

@ -972,8 +972,7 @@ tsch_init(void)
return;
}
/* Init the queuebuf and TSCH sub-modules */
queuebuf_init();
/* Init TSCH sub-modules */
tsch_reset();
tsch_queue_init();
tsch_schedule_init();

View File

@ -55,6 +55,12 @@
#include "net/packetbuf.h"
#ifdef QUEUEBUF_CONF_ENABLED
#define QUEUEBUF_ENABLED QUEUEBUF_CONF_ENABLED
#else /* QUEUEBUF_CONF_ENABLED */
#define QUEUEBUF_ENABLED 1
#endif /* QUEUEBUF_CONF_ENABLED */
/* QUEUEBUF_NUM is the total number of queuebuf */
#ifdef QUEUEBUF_CONF_NUM
#define QUEUEBUF_NUM QUEUEBUF_CONF_NUM