Merge pull request #1827 from alignan/pull/rf-channel

Harmonize RF_CHANNEL definition

platform/cc2530dk/contiki-conf.h

@@ -186,6 +186,10 @@
 #define IEEE802154_CONF_PANID 0xABCD
 #endif
 
+#ifdef RF_CHANNEL
+#define CC2530_RF_CONF_CHANNEL RF_CHANNEL
+#endif
+
 #ifndef CC2530_RF_CONF_CHANNEL
 #define CC2530_RF_CONF_CHANNEL    25
 #endif /* CC2530_RF_CONF_CHANNEL */

platform/cc2538dk/contiki-conf.h

@@ -364,6 +364,10 @@ typedef uint32_t rtimer_clock_t;
 #define IEEE802154_CONF_PANID           0xABCD
 #endif
 
+#ifdef RF_CHANNEL
+#define CC2538_RF_CONF_CHANNEL      RF_CHANNEL
+#endif
+
 #ifndef CC2538_RF_CONF_CHANNEL
 #define CC2538_RF_CONF_CHANNEL              25
 #endif /* CC2538_RF_CONF_CHANNEL */

platform/jn516x/platform-conf.h

@@ -53,6 +53,10 @@
 #define MIRCOMAC_CONF_BUF_NUM 2
 #endif
 
+#ifdef RF_CHANNEL
+#define MICROMAC_CONF_CHANNEL RF_CHANNEL
+#endif
+
 #ifndef MICROMAC_CONF_CHANNEL
 #define MICROMAC_CONF_CHANNEL 26
 #endif

platform/openmote-cc2538/contiki-conf.h

@@ -416,6 +416,10 @@ typedef uint32_t rtimer_clock_t;
 #define IEEE802154_CONF_PANID           0xABCD
 #endif
 
+#ifdef RF_CHANNEL
+#define CC2538_RF_CONF_CHANNEL      RF_CHANNEL
+#endif
+
 #ifndef CC2538_RF_CONF_CHANNEL
 #define CC2538_RF_CONF_CHANNEL              26
 #endif /* CC2538_RF_CONF_CHANNEL */

platform/srf06-cc26xx/contiki-conf.h

@@ -121,6 +121,10 @@
 #else
 #define NETSTACK_CONF_RADIO        ieee_mode_driver
 
+#ifdef RF_CHANNEL
+#define RF_CORE_CONF_CHANNEL             RF_CHANNEL
+#endif
+
 #ifndef RF_CORE_CONF_CHANNEL
 #define RF_CORE_CONF_CHANNEL                     25
 #endif

platform/zoul/contiki-conf.h

@@ -433,6 +433,10 @@ typedef uint32_t rtimer_clock_t;
 #define IEEE802154_CONF_PANID           0xABCD
 #endif
 
+#ifdef RF_CHANNEL
+#define CC2538_RF_CONF_CHANNEL      RF_CHANNEL
+#endif
+
 #ifndef CC2538_RF_CONF_CHANNEL
 #define CC2538_RF_CONF_CHANNEL              26
 #endif /* CC2538_RF_CONF_CHANNEL */