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

Configuration of the objective function made easier. Updated OF0 to the new rank calculation.

Browse source
This commit is contained in:
nvt-se 2011-01-04 20:43:28 +00:00
parent b2296e462b
commit 7a43b7d832
4 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/net/rpl/rpl.h
View file

@ -30,7 +30,7 @@
*
* Author: Joakim Eriksson, Nicolas Tsiftes
*
* $Id: rpl.h,v 1.28 2010/12/17 15:24:25 nvt-se Exp $
* $Id: rpl.h,v 1.29 2011/01/04 20:43:28 nvt-se Exp $
*/
#ifndef RPL_H
@ -57,6 +57,18 @@
#define RPL_CONF_STATS 0
#endif /* RPL_CONF_STATS */
/*
* The objective function used by RPL is configurable through the
* RPL_CONF_OF parameter. This should be defined to be the name of an
* rpl_of_t object linked into the system image, e.g., rpl_of0.
*/
#ifdef RPL_CONF_OF
#define RPL_OF RPL_CONF_OF
#else
/* ETX is the default objective function. */
#define RPL_OF rpl_of_etx
#endif /* RPL_CONF_OF */
/* The RPL Codes for the message types */
#define RPL_CODE_DIS 0 /* DIS message */
#define RPL_CODE_DIO 1 /* DIO message */
@ -116,8 +128,6 @@
#define RPL_DEFAULT_INSTANCE 0
#define RPL_ANY_INSTANCE -1
#define RPL_DEFAULT_OCP 1
/* Represents 2^n ms. */
/* Default alue according to the specification is 3 which
means 8 milliseconds - this is not a reasonable value if