From 25c28e06cceb3c5ecc468b5551faf2cfc445788c Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Mon, 5 Sep 2011 20:42:12 +0200 Subject: [PATCH 1/5] Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE) --- platform/msb430/contiki-conf.h | 2 +- platform/z1/contiki-conf.h | 1 - platform/z1sp/contiki-conf.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/platform/msb430/contiki-conf.h b/platform/msb430/contiki-conf.h index d75ded1fe..e6b525d40 100644 --- a/platform/msb430/contiki-conf.h +++ b/platform/msb430/contiki-conf.h @@ -12,7 +12,7 @@ #define NETSTACK_CONF_NETWORK rime_driver #define NETSTACK_CONF_FRAMER framer_nullmac -#define MAC_CONF_CHANNEL_CHECK_RATE 8 +#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8 #define ENERGEST_CONF_ON 1 diff --git a/platform/z1/contiki-conf.h b/platform/z1/contiki-conf.h index a0fd94e8b..5258090ad 100644 --- a/platform/z1/contiki-conf.h +++ b/platform/z1/contiki-conf.h @@ -73,7 +73,6 @@ #define NETSTACK_CONF_FRAMER framer_802154 #define CC2420_CONF_AUTOACK 1 -#define MAC_CONF_CHANNEL_CHECK_RATE 8 #define COLLECT_CONF_ANNOUNCEMENTS 1 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0 diff --git a/platform/z1sp/contiki-conf.h b/platform/z1sp/contiki-conf.h index c09b44635..20e8db9f1 100644 --- a/platform/z1sp/contiki-conf.h +++ b/platform/z1sp/contiki-conf.h @@ -67,7 +67,6 @@ #define NETSTACK_CONF_FRAMER framer_802154 #define CC2420_CONF_AUTOACK 0 -#define MAC_CONF_CHANNEL_CHECK_RATE 8 #define COLLECT_CONF_ANNOUNCEMENTS 1 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0 From 4fd8133aa3fcbde867be4769c89da6cfbe12c6d4 Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Mon, 5 Sep 2011 20:42:19 +0200 Subject: [PATCH 2/5] Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE) --- cpu/6502/6502def.h | 1 - 1 file changed, 1 deletion(-) diff --git a/cpu/6502/6502def.h b/cpu/6502/6502def.h index 6b87dd86e..ea9d272d5 100644 --- a/cpu/6502/6502def.h +++ b/cpu/6502/6502def.h @@ -68,7 +68,6 @@ typedef unsigned short uip_stats_t; #define UIP_ARCH_ADD32 1 #define UIP_ARCH_CHKSUM 1 -#define MAC_CONF_CHANNEL_CHECK_RATE 1 #define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 1 #define LOADER_CONF_ARCH "lib/unload.h" From 13853b2cfdb5599e9fce73316e515bb1a298ce4a Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Mon, 5 Sep 2011 20:42:38 +0200 Subject: [PATCH 3/5] Set default RDC wakeup rate to 8 hz --- core/net/netstack.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/net/netstack.h b/core/net/netstack.h index 775e237f7..96f56a2b2 100644 --- a/core/net/netstack.h +++ b/core/net/netstack.h @@ -71,7 +71,7 @@ #ifdef NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE #define NETSTACK_RDC_CHANNEL_CHECK_RATE NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE #else /* NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE */ -#define NETSTACK_RDC_CHANNEL_CHECK_RATE 4 +#define NETSTACK_RDC_CHANNEL_CHECK_RATE 8 #endif /* NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE */ #endif /* NETSTACK_RDC_CHANNEL_CHECK_RATE */ From 0f8145c78be5331dcc0f56660e1f10de2e76a93d Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Mon, 5 Sep 2011 20:43:01 +0200 Subject: [PATCH 4/5] Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE) --- platform/iris/contiki-conf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/iris/contiki-conf.h b/platform/iris/contiki-conf.h index 51fadd71c..00a1401c3 100644 --- a/platform/iris/contiki-conf.h +++ b/platform/iris/contiki-conf.h @@ -56,7 +56,7 @@ #define NETSTACK_CONF_FRAMER framer_802154 #define RF230_CONF_AUTOACK 1 -#define MAC_CONF_CHANNEL_CHECK_RATE 8 +#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0 #define CXMAC_CONF_ANNOUNCEMENTS 0 @@ -70,7 +70,7 @@ #define NETSTACK_CONF_FRAMER framer_802154 #define RF230_CONF_AUTOACK 1 -#define MAC_CONF_CHANNEL_CHECK_RATE 8 +#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8 #define COLLECT_CONF_ANNOUNCEMENTS 1 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 1 From 8fee2a507ccb635c999c5513fefbf7ebec18018c Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Mon, 5 Sep 2011 20:43:10 +0200 Subject: [PATCH 5/5] Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE) --- platform/micaz/contiki-conf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/micaz/contiki-conf.h b/platform/micaz/contiki-conf.h index 75160fa9e..20ee75a18 100644 --- a/platform/micaz/contiki-conf.h +++ b/platform/micaz/contiki-conf.h @@ -56,7 +56,7 @@ #define NETSTACK_CONF_FRAMER framer_802154 #define CC2420_CONF_AUTOACK 1 -#define MAC_CONF_CHANNEL_CHECK_RATE 8 +#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0 #define CXMAC_CONF_ANNOUNCEMENTS 0 @@ -70,7 +70,7 @@ #define NETSTACK_CONF_FRAMER framer_802154 #define CC2420_CONF_AUTOACK 1 -#define MAC_CONF_CHANNEL_CHECK_RATE 8 +#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8 #define COLLECT_CONF_ANNOUNCEMENTS 1 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 1