From 2359cdb7c04948cda676a37ce660ee6b7aaadc7d Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Fri, 13 Apr 2018 02:31:28 -0700 Subject: [PATCH] jn516x: use IEEE802154_DEFAULT_CHANNEL --- arch/platform/jn516x/contiki-conf.h | 8 -------- arch/platform/jn516x/dev/micromac-radio.c | 7 +------ examples/platform-specific/jn516x/rpl/common-conf.h | 2 -- examples/platform-specific/jn516x/tsch/common-conf.h | 2 -- 4 files changed, 1 insertion(+), 18 deletions(-) diff --git a/arch/platform/jn516x/contiki-conf.h b/arch/platform/jn516x/contiki-conf.h index f8dbdc3e5..e4d741400 100644 --- a/arch/platform/jn516x/contiki-conf.h +++ b/arch/platform/jn516x/contiki-conf.h @@ -40,14 +40,6 @@ #include "jn516x-def.h" -#ifdef RF_CHANNEL -#define MICROMAC_CONF_CHANNEL RF_CHANNEL -#endif - -#ifndef MICROMAC_CONF_CHANNEL -#define MICROMAC_CONF_CHANNEL 26 -#endif - /* Configure radio driver */ #ifndef NETSTACK_CONF_RADIO #define NETSTACK_CONF_RADIO micromac_radio_driver diff --git a/arch/platform/jn516x/dev/micromac-radio.c b/arch/platform/jn516x/dev/micromac-radio.c index 3ebc13578..6e2ddb908 100644 --- a/arch/platform/jn516x/dev/micromac-radio.c +++ b/arch/platform/jn516x/dev/micromac-radio.c @@ -100,11 +100,6 @@ #define MIRCOMAC_CONF_BUF_NUM 2 #endif /* MIRCOMAC_CONF_BUF_NUM */ -/* Init radio channel */ -#ifndef MICROMAC_CONF_CHANNEL -#define MICROMAC_CONF_CHANNEL 26 -#endif - /* Default energy level threshold for clear channel detection */ #ifndef MICROMAC_CONF_CCA_THR #define MICROMAC_CONF_CCA_THR 39 /* approximately -85 dBm */ @@ -159,7 +154,7 @@ static uint8_t autoack_enabled = MICROMAC_CONF_AUTOACK; static uint8_t send_on_cca = 0; /* Current radio channel */ -static int current_channel = MICROMAC_CONF_CHANNEL; +static int current_channel = IEEE802154_DEFAULT_CHANNEL; /* Current set point tx power Actual tx power may be different. Use get_txpower() for actual power */ diff --git a/examples/platform-specific/jn516x/rpl/common-conf.h b/examples/platform-specific/jn516x/rpl/common-conf.h index daa66ae29..8ffb3b4f5 100644 --- a/examples/platform-specific/jn516x/rpl/common-conf.h +++ b/examples/platform-specific/jn516x/rpl/common-conf.h @@ -72,8 +72,6 @@ #define IEEE802154_CONF_PANID 0xabcd -#define MICROMAC_CONF_CHANNEL 26 - /* UART Configuration */ #define UART_HW_FLOW_CTRL 0 diff --git a/examples/platform-specific/jn516x/tsch/common-conf.h b/examples/platform-specific/jn516x/tsch/common-conf.h index 39d012d52..5911f34ee 100644 --- a/examples/platform-specific/jn516x/tsch/common-conf.h +++ b/examples/platform-specific/jn516x/tsch/common-conf.h @@ -104,8 +104,6 @@ #if MAC_CONF_WITH_CSMA /* Configure Csma with ACK (default MAC) */ -#define MICROMAC_CONF_CHANNEL 26 - #define MICROMAC_CONF_AUTOACK 1 /* increase internal radio buffering */