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

Use NETSTACK_RDC_* instead of NETSTACK_CONF_RDC_*

Browse source
This commit is contained in:
Niclas Finne 2012-01-09 18:06:30 +01:00
parent f3db12c19d
commit 9d261eec56
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,7 @@
*/ */
#include "contiki.h" #include "contiki.h"
#include "net/netstack.h"
#include "net/rime.h" #include "net/rime.h"
#include "net/rime/collect.h" #include "net/rime/collect.h"
#include "net/rime/collect-neighbor.h" #include "net/rime/collect-neighbor.h"
@ -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 * 32 / NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE #define REXMIT_TIME CLOCK_SECOND * 32 / NETSTACK_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 * 32 / NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE #define BROADCAST_ANNOUNCEMENT_BUMP_TIME CLOCK_SECOND * 32 / NETSTACK_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