From d1288984208bd8a3989ee556e7b95f08157fb345 Mon Sep 17 00:00:00 2001
From: Simon Duquennoy <simon.duquennoy@ri.se>
Date: Fri, 13 Apr 2018 02:33:02 -0700
Subject: [PATCH] cc2420: use IEEE802154_DEFAULT_CHANNEL

---
 arch/dev/cc2420/cc2420.c         | 2 +-
 arch/dev/cc2420/cc2420.h         | 4 ----
 arch/platform/sky/contiki-conf.h | 4 ----
 arch/platform/sky/platform.c     | 4 ++--
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/arch/dev/cc2420/cc2420.c b/arch/dev/cc2420/cc2420.c
index 9310ec9e4..5cfa00e4a 100644
--- a/arch/dev/cc2420/cc2420.c
+++ b/arch/dev/cc2420/cc2420.c
@@ -641,7 +641,7 @@ cc2420_init(void)
   init_security();
 
   cc2420_set_pan_addr(0xffff, 0x0000, NULL);
-  cc2420_set_channel(CC2420_CONF_CHANNEL);
+  cc2420_set_channel(IEEE802154_DEFAULT_CHANNEL);
   cc2420_set_cca_threshold(CC2420_CONF_CCA_THRESH);
 
   flushrx();
diff --git a/arch/dev/cc2420/cc2420.h b/arch/dev/cc2420/cc2420.h
index a030632a6..07b578aa4 100644
--- a/arch/dev/cc2420/cc2420.h
+++ b/arch/dev/cc2420/cc2420.h
@@ -50,10 +50,6 @@
 
 #define WITH_SEND_CCA 1
 
-#ifndef CC2420_CONF_CHANNEL
-#define CC2420_CONF_CHANNEL 26
-#endif /* CC2420_CONF_CHANNEL */
-
 #ifndef CC2420_CONF_CCA_THRESH
 #define CC2420_CONF_CCA_THRESH -45
 #endif /* CC2420_CONF_CCA_THRESH */
diff --git a/arch/platform/sky/contiki-conf.h b/arch/platform/sky/contiki-conf.h
index 500e00e08..8df4549ef 100644
--- a/arch/platform/sky/contiki-conf.h
+++ b/arch/platform/sky/contiki-conf.h
@@ -11,10 +11,6 @@
 #include "sky-def.h"
 #include "msp430-def.h"
 /*---------------------------------------------------------------------------*/
-/* Map RF_CHANNEL to cc2420 default channel */
-#ifdef RF_CHANNEL
-#define CC2420_CONF_CHANNEL RF_CHANNEL
-#endif /* RF_CHANNEL */
 
 /* Configure radio driver */
 #ifndef NETSTACK_CONF_RADIO
diff --git a/arch/platform/sky/platform.c b/arch/platform/sky/platform.c
index d71471340..bbc273bf0 100644
--- a/arch/platform/sky/platform.c
+++ b/arch/platform/sky/platform.c
@@ -207,11 +207,11 @@ platform_init_stage_three(void)
 #if NETSTACK_CONF_WITH_IPV6
   LOG_INFO("%s, rf channel %u, CCA threshold %i\n",
            NETSTACK_MAC.name,
-           CC2420_CONF_CHANNEL,
+           IEEE802154_DEFAULT_CHANNEL,
            CC2420_CONF_CCA_THRESH);
 #else /* NETSTACK_CONF_WITH_IPV6 */
   LOG_INFO("%s, rf channel %u\n",
-           NETSTACK_MAC.name, CC2420_CONF_CHANNEL);
+           NETSTACK_MAC.name, IEEE802154_DEFAULT_CHANNEL);
 #endif /* NETSTACK_CONF_WITH_IPV6 */
 
 #if !NETSTACK_CONF_WITH_IPV6