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

Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki

Browse source
This commit is contained in:
Nicolas Tsiftes 2011-12-09 16:48:48 +01:00
commit 1a02b241f1
5 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/net/rime/collect.c
View file

@ -126,7 +126,7 @@ struct ack_msg {
full, incoming packets are dropped instead of being forwarded. */ full, incoming packets are dropped instead of being forwarded. */
#define MAX_MAC_REXMITS 2 #define MAX_MAC_REXMITS 2
#define MAX_ACK_MAC_REXMITS 5 #define MAX_ACK_MAC_REXMITS 5
#define REXMIT_TIME CLOCK_SECOND * 4 #define REXMIT_TIME CLOCK_SECOND * 32 / NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE
#define FORWARD_PACKET_LIFETIME_BASE REXMIT_TIME * 2 #define FORWARD_PACKET_LIFETIME_BASE REXMIT_TIME * 2
#define MAX_SENDING_QUEUE 3 * QUEUEBUF_NUM / 4 #define MAX_SENDING_QUEUE 3 * QUEUEBUF_NUM / 4
#define MIN_AVAILABLE_QUEUE_ENTRIES 4 #define MIN_AVAILABLE_QUEUE_ENTRIES 4

2
core/net/rime/rime.c
View file

@ -72,7 +72,7 @@ const struct mac_driver *rime_mac;
#ifdef RIME_CONF_BROADCAST_ANNOUNCEMENT_BUMP_TIME #ifdef RIME_CONF_BROADCAST_ANNOUNCEMENT_BUMP_TIME
#define BROADCAST_ANNOUNCEMENT_BUMP_TIME RIME_CONF_BROADCAST_ANNOUNCEMENT_BUMP_TIME #define BROADCAST_ANNOUNCEMENT_BUMP_TIME RIME_CONF_BROADCAST_ANNOUNCEMENT_BUMP_TIME
#else /* RIME_CONF_BROADCAST_ANNOUNCEMENT_BUMP_TIME */ #else /* RIME_CONF_BROADCAST_ANNOUNCEMENT_BUMP_TIME */
#define BROADCAST_ANNOUNCEMENT_BUMP_TIME CLOCK_SECOND * 8 #define BROADCAST_ANNOUNCEMENT_BUMP_TIME CLOCK_SECOND * 32 / NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE
#endif /* RIME_CONF_BROADCAST_ANNOUNCEMENT_BUMP_TIME */ #endif /* RIME_CONF_BROADCAST_ANNOUNCEMENT_BUMP_TIME */
#ifdef RIME_CONF_BROADCAST_ANNOUNCEMENT_MIN_TIME #ifdef RIME_CONF_BROADCAST_ANNOUNCEMENT_MIN_TIME

1
core/net/rpl/rpl-dag.c
View file

@ -96,6 +96,7 @@ MEMB(parent_memb, struct rpl_parent, RPL_MAX_PARENTS_PER_DODAG*RPL_MAX_INSTANCES
/************************************************************************/ /************************************************************************/
/* Allocate instance table. */ /* Allocate instance table. */
rpl_instance_t instance_table[RPL_MAX_INSTANCES]; rpl_instance_t instance_table[RPL_MAX_INSTANCES];
rpl_instance_t *default_instance;
/************************************************************************/ /************************************************************************/
/* Remove DAG parents with a rank that is at least the same as minimum_rank. */ /* Remove DAG parents with a rank that is at least the same as minimum_rank. */

2
core/net/rpl/rpl-private.h
View file

@ -253,7 +253,7 @@ extern rpl_stats_t rpl_stats;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Instances */ /* Instances */
extern rpl_instance_t instance_table[]; extern rpl_instance_t instance_table[];
rpl_instance_t *default_instance; extern rpl_instance_t *default_instance;
/* ICMPv6 functions for RPL. */ /* ICMPv6 functions for RPL. */
void dis_output(uip_ipaddr_t *addr); void dis_output(uip_ipaddr_t *addr);

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

@ -110,7 +110,7 @@
#if RPL_MAX_DODAG_PER_INSTANCE > 1 #if RPL_MAX_DODAG_PER_INSTANCE > 1
#define RPL_DAO_SPECIFY_DODAG 1 #define RPL_DAO_SPECIFY_DODAG 1
#else /* RPL_MAX_DODAG_PER_INSTANCE > 1*/ #else /* RPL_MAX_DODAG_PER_INSTANCE > 1*/
#define RPL__DAO_SPECIFY_DODAG 0 #define RPL_DAO_SPECIFY_DODAG 0
#endif /* RPL_MAX_DODAG_PER_INSTANCE > 1 */ #endif /* RPL_MAX_DODAG_PER_INSTANCE > 1 */
#else /* RPL_CONF_DAO_SPECIFY_DODAG */ #else /* RPL_CONF_DAO_SPECIFY_DODAG */
#define RPL_DAO_SPECIFY_DODAG RPL_CONF_DAO_SPECIFY_DODAG #define RPL_DAO_SPECIFY_DODAG RPL_CONF_DAO_SPECIFY_DODAG