added rpl support for tmote sky - enabled by default
This commit is contained in:
parent
168a65d989
commit
b0640af3a2
2 changed files with 11 additions and 9 deletions
|
@ -1,5 +1,5 @@
|
||||||
/* -*- C -*- */
|
/* -*- C -*- */
|
||||||
/* @(#)$Id: contiki-conf.h,v 1.76 2010/03/19 13:27:46 adamdunkels Exp $ */
|
/* @(#)$Id: contiki-conf.h,v 1.77 2010/04/30 13:52:14 joxe Exp $ */
|
||||||
|
|
||||||
#ifndef CONTIKI_CONF_H
|
#ifndef CONTIKI_CONF_H
|
||||||
#define CONTIKI_CONF_H
|
#define CONTIKI_CONF_H
|
||||||
|
@ -116,9 +116,9 @@
|
||||||
#define UIP_CONF_LL_802154 1
|
#define UIP_CONF_LL_802154 1
|
||||||
#define UIP_CONF_LLH_LEN 0
|
#define UIP_CONF_LLH_LEN 0
|
||||||
|
|
||||||
#ifndef UIP_CONF_ROUTER
|
#define UIP_CONF_ROUTER 1
|
||||||
#define UIP_CONF_ROUTER 0
|
#define UIP_CONF_IPV6_RPL 1
|
||||||
#endif
|
|
||||||
|
|
||||||
#define UIP_CONF_IPV6 1
|
#define UIP_CONF_IPV6 1
|
||||||
#define UIP_CONF_IPV6_QUEUE_PKT 1
|
#define UIP_CONF_IPV6_QUEUE_PKT 1
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* @(#)$Id: contiki-sky-main.c,v 1.78 2010/03/19 14:08:15 joxe Exp $
|
* @(#)$Id: contiki-sky-main.c,v 1.79 2010/04/30 13:52:14 joxe Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
@ -51,9 +51,8 @@
|
||||||
#include "net/mac/frame802154.h"
|
#include "net/mac/frame802154.h"
|
||||||
|
|
||||||
#if WITH_UIP6
|
#if WITH_UIP6
|
||||||
#include "net/sicslowpan.h"
|
|
||||||
#include "net/uip-ds6.h"
|
#include "net/uip-ds6.h"
|
||||||
#include "net/mac/sicslowmac.h"
|
#include "net/rpl/rpl.h"
|
||||||
#endif /* WITH_UIP6 */
|
#endif /* WITH_UIP6 */
|
||||||
|
|
||||||
#include "net/rime.h"
|
#include "net/rime.h"
|
||||||
|
@ -339,6 +338,9 @@ main(int argc, char **argv)
|
||||||
ipaddr.u8[7 * 2], ipaddr.u8[7 * 2 + 1]);
|
ipaddr.u8[7 * 2], ipaddr.u8[7 * 2 + 1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if UIP_CONF_IPV6_RPL
|
||||||
|
rpl_init();
|
||||||
|
#endif /* UIP_CONF_IPV6_RPL */
|
||||||
|
|
||||||
#else /* WITH_UIP6 */
|
#else /* WITH_UIP6 */
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue