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

Changed Instance structure in order to decrease memory waste.

Browse source
This commit is contained in:
Vincent Brillault 2011-07-13 10:28:56 +02:00
parent 286cf002bc
commit 4f76130a77
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -303,25 +303,24 @@ struct rpl_instance {
/* DAG configuration */ /* DAG configuration */
rpl_metric_container_t mc; rpl_metric_container_t mc;
rpl_of_t *of; rpl_of_t *of;
uint8_t instance_id;
rpl_dag_t *current_dag; rpl_dag_t *current_dag;
uint8_t used;
rpl_dag_t dag_table[RPL_MAX_DODAG_PER_INSTANCE]; rpl_dag_t dag_table[RPL_MAX_DODAG_PER_INSTANCE];
/* The current default router - used for routing "upwards" */ /* The current default router - used for routing "upwards" */
uip_ds6_defrt_t *def_route; uip_ds6_defrt_t *def_route;
uint8_t instance_id;
uint8_t used;
uint8_t dtsn_out; uint8_t dtsn_out;
uint8_t mop; uint8_t mop;
uint8_t dio_intdoubl; uint8_t dio_intdoubl;
uint8_t dio_intmin; uint8_t dio_intmin;
uint8_t dio_redundancy; uint8_t dio_redundancy;
uint8_t default_lifetime;
uint8_t dio_intcurrent;
uint8_t dio_send; /* for keeping track of which mode the timer is in */
uint8_t dio_counter;
rpl_rank_t max_rankinc; rpl_rank_t max_rankinc;
rpl_rank_t min_hoprankinc; rpl_rank_t min_hoprankinc;
uint8_t default_lifetime;
uint16_t lifetime_unit; /* lifetime in seconds = l_u * d_l */ uint16_t lifetime_unit; /* lifetime in seconds = l_u * d_l */
uint8_t dio_intcurrent;
uint8_t dio_send; /* for keeping track of which mode the timer is in
*/
uint8_t dio_counter;
#if RPL_CONF_STATS #if RPL_CONF_STATS
uint16_t dio_totint; uint16_t dio_totint;
uint16_t dio_totsend; uint16_t dio_totsend;