diff --git a/core/net/ipv6/multicast/esmrf.c b/core/net/ipv6/multicast/esmrf.c index 54a18ebb0..d0cf18e09 100644 --- a/core/net/ipv6/multicast/esmrf.c +++ b/core/net/ipv6/multicast/esmrf.c @@ -82,7 +82,7 @@ static struct esmrf_stats stats; /* Macros */ /*---------------------------------------------------------------------------*/ /* CCI */ -#define ESMRF_FWD_DELAY() NETSTACK_RDC.channel_check_interval() +#define ESMRF_FWD_DELAY() (CLOCK_SECOND / 8) /* Number of slots in the next 500ms */ #define ESMRF_INTERVAL_COUNT ((CLOCK_SECOND >> 2) / fwd_delay) /*---------------------------------------------------------------------------*/ diff --git a/core/net/ipv6/multicast/smrf.c b/core/net/ipv6/multicast/smrf.c index 5f954dcfb..d99f5464c 100644 --- a/core/net/ipv6/multicast/smrf.c +++ b/core/net/ipv6/multicast/smrf.c @@ -59,7 +59,7 @@ /* Macros */ /*---------------------------------------------------------------------------*/ /* CCI */ -#define SMRF_FWD_DELAY() NETSTACK_RDC.channel_check_interval() +#define SMRF_FWD_DELAY() (CLOCK_SECOND / 8) /* Number of slots in the next 500ms */ #define SMRF_INTERVAL_COUNT ((CLOCK_SECOND >> 2) / fwd_delay) /*---------------------------------------------------------------------------*/ diff --git a/core/net/mac/csma.c b/core/net/mac/csma.c index f6238b2bb..df5bed51c 100644 --- a/core/net/mac/csma.c +++ b/core/net/mac/csma.c @@ -149,18 +149,9 @@ neighbor_queue_from_addr(const linkaddr_t *addr) static clock_time_t backoff_period(void) { - clock_time_t time; - /* The retransmission time must be proportional to the channel - check interval of the underlying radio duty cycling layer. */ - time = NETSTACK_RDC.channel_check_interval(); - - /* If the radio duty cycle has no channel check interval, we use - * the default in IEEE 802.15.4: aUnitBackoffPeriod which is + /* Use the default in IEEE 802.15.4: aUnitBackoffPeriod which is * 20 symbols i.e. 320 usec. That is, 1/3125 second. */ - if(time == 0) { - time = MAX(CLOCK_SECOND / 3125, 1); - } - return time; + return MAX(CLOCK_SECOND / 3125, 1); } /*---------------------------------------------------------------------------*/ static void @@ -465,15 +456,6 @@ off(int keep_radio_on) return NETSTACK_RDC.off(keep_radio_on); } /*---------------------------------------------------------------------------*/ -static unsigned short -channel_check_interval(void) -{ - if(NETSTACK_RDC.channel_check_interval) { - return NETSTACK_RDC.channel_check_interval(); - } - return 0; -} -/*---------------------------------------------------------------------------*/ static void init(void) { @@ -488,7 +470,6 @@ const struct mac_driver csma_driver = { send_packet, input_packet, on, - off, - channel_check_interval, + off }; /*---------------------------------------------------------------------------*/ diff --git a/core/net/mac/mac.h b/core/net/mac/mac.h index 8ab55bddd..a405b5ee1 100644 --- a/core/net/mac/mac.h +++ b/core/net/mac/mac.h @@ -68,9 +68,6 @@ struct mac_driver { /** Turn the MAC layer off. */ int (* off)(int keep_radio_on); - - /** Returns the channel check interval, expressed in clock_time_t ticks. */ - unsigned short (* channel_check_interval)(void); }; /* Generic MAC return values. */ diff --git a/core/net/mac/nordc.c b/core/net/mac/nordc.c index bb41335ff..224d4943f 100644 --- a/core/net/mac/nordc.c +++ b/core/net/mac/nordc.c @@ -70,12 +70,6 @@ off(int keep_radio_on) return 0; } /*---------------------------------------------------------------------------*/ -static unsigned short -channel_check_interval(void) -{ - return 0; -} -/*---------------------------------------------------------------------------*/ static void init(void) { @@ -88,7 +82,6 @@ const struct rdc_driver nordc_driver = { send_list, packet_input, on, - off, - channel_check_interval, + off }; /*---------------------------------------------------------------------------*/ diff --git a/core/net/mac/nullmac.c b/core/net/mac/nullmac.c index ae0d48ee1..bf0b5cb16 100644 --- a/core/net/mac/nullmac.c +++ b/core/net/mac/nullmac.c @@ -67,12 +67,6 @@ off(int keep_radio_on) return 0; } /*---------------------------------------------------------------------------*/ -static unsigned short -channel_check_interval(void) -{ - return 0; -} -/*---------------------------------------------------------------------------*/ static void init(void) { @@ -84,7 +78,6 @@ const struct mac_driver nullmac_driver = { send_packet, packet_input, on, - off, - channel_check_interval, + off }; /*---------------------------------------------------------------------------*/ diff --git a/core/net/mac/nullrdc.c b/core/net/mac/nullrdc.c index 56c524000..d17067d99 100644 --- a/core/net/mac/nullrdc.c +++ b/core/net/mac/nullrdc.c @@ -342,12 +342,6 @@ off(int keep_radio_on) } } /*---------------------------------------------------------------------------*/ -static unsigned short -channel_check_interval(void) -{ - return 0; -} -/*---------------------------------------------------------------------------*/ static void init(void) { @@ -361,7 +355,6 @@ const struct rdc_driver nullrdc_driver = { send_list, packet_input, on, - off, - channel_check_interval, + off }; /*---------------------------------------------------------------------------*/ diff --git a/core/net/mac/rdc.h b/core/net/mac/rdc.h index 9b4569158..0474a6cab 100644 --- a/core/net/mac/rdc.h +++ b/core/net/mac/rdc.h @@ -85,9 +85,6 @@ struct rdc_driver { /** Turn the MAC layer off. */ int (* off)(int keep_radio_on); - - /** Returns the channel check interval, expressed in clock_time_t ticks. */ - unsigned short (* channel_check_interval)(void); }; #endif /* RDC_H_ */ diff --git a/core/net/mac/tsch/tsch.c b/core/net/mac/tsch/tsch.c index b1a2776b1..2863b2a54 100644 --- a/core/net/mac/tsch/tsch.c +++ b/core/net/mac/tsch/tsch.c @@ -1011,19 +1011,12 @@ turn_off(int keep_radio_on) return 1; } /*---------------------------------------------------------------------------*/ -static unsigned short -channel_check_interval(void) -{ - return 0; -} -/*---------------------------------------------------------------------------*/ const struct mac_driver tschmac_driver = { "TSCH", tsch_init, send_packet, packet_input, turn_on, - turn_off, - channel_check_interval, + turn_off }; /*---------------------------------------------------------------------------*/ diff --git a/drivers/cpu/nrf52832/ble/ble-mac.c b/drivers/cpu/nrf52832/ble/ble-mac.c index 87f68fa46..9ef90e8b3 100644 --- a/drivers/cpu/nrf52832/ble/ble-mac.c +++ b/drivers/cpu/nrf52832/ble/ble-mac.c @@ -347,12 +347,6 @@ off(int keep_radio_on) return 1; } /*---------------------------------------------------------------------------*/ -static unsigned short -channel_check_interval(void) -{ - return 0; -} -/*---------------------------------------------------------------------------*/ static void init(void) { @@ -377,8 +371,7 @@ const struct mac_driver ble_ipsp_mac_driver = { send_packet, NULL, on, - off, - channel_check_interval, + off }; /*---------------------------------------------------------------------------*/ /** diff --git a/drivers/platform/cooja-ip64/contiki-cooja-ip64-main.c b/drivers/platform/cooja-ip64/contiki-cooja-ip64-main.c index 3e66ef179..797642211 100644 --- a/drivers/platform/cooja-ip64/contiki-cooja-ip64-main.c +++ b/drivers/platform/cooja-ip64/contiki-cooja-ip64-main.c @@ -189,10 +189,8 @@ contiki_init(void) /* Initialize communication stack */ netstack_init(); - printf("%s/%s/%s, channel check rate %lu Hz\n", - NETSTACK_NETWORK.name, NETSTACK_MAC.name, NETSTACK_RDC.name, - CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1: - NETSTACK_RDC.channel_check_interval())); + printf("%s/%s/%s\n", + NETSTACK_NETWORK.name, NETSTACK_MAC.name, NETSTACK_RDC.name); /* IPv6 CONFIGURATION */ diff --git a/drivers/platform/cooja/contiki-cooja-main.c b/drivers/platform/cooja/contiki-cooja-main.c index c2e7757a1..0117f6840 100644 --- a/drivers/platform/cooja/contiki-cooja-main.c +++ b/drivers/platform/cooja/contiki-cooja-main.c @@ -240,10 +240,8 @@ contiki_init() /* Initialize communication stack */ netstack_init(); - printf("%s/%s/%s, channel check rate %lu Hz\n", - NETSTACK_NETWORK.name, NETSTACK_MAC.name, NETSTACK_RDC.name, - CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1: - NETSTACK_RDC.channel_check_interval())); + printf("%s/%s/%s\n", + NETSTACK_NETWORK.name, NETSTACK_MAC.name, NETSTACK_RDC.name); #if NETSTACK_CONF_WITH_IPV4 /* IPv4 CONFIGURATION */ diff --git a/drivers/platform/sky/contiki-sky-main.c b/drivers/platform/sky/contiki-sky-main.c index 2bc75e5b9..890a2c13d 100644 --- a/drivers/platform/sky/contiki-sky-main.c +++ b/drivers/platform/sky/contiki-sky-main.c @@ -302,10 +302,8 @@ main(int argc, char **argv) NETSTACK_MAC.init(); NETSTACK_NETWORK.init(); - PRINTF("%s %s, channel check rate %lu Hz, radio channel %u, CCA threshold %i\n", + PRINTF("%s %s, radio channel %u, CCA threshold %i\n", NETSTACK_MAC.name, NETSTACK_RDC.name, - CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1: - NETSTACK_RDC.channel_check_interval()), CC2420_CONF_CHANNEL, CC2420_CONF_CCA_THRESH); @@ -345,10 +343,8 @@ main(int argc, char **argv) NETSTACK_MAC.init(); NETSTACK_NETWORK.init(); - PRINTF("%s %s, channel check rate %lu Hz, radio channel %u\n", + PRINTF("%s %s, radio channel %u\n", NETSTACK_MAC.name, NETSTACK_RDC.name, - CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0? 1: - NETSTACK_RDC.channel_check_interval()), CC2420_CONF_CHANNEL); #endif /* NETSTACK_CONF_WITH_IPV6 */ diff --git a/drivers/platform/srf06-cc26xx/contiki-main.c b/drivers/platform/srf06-cc26xx/contiki-main.c index bb9e50518..ee972db74 100644 --- a/drivers/platform/srf06-cc26xx/contiki-main.c +++ b/drivers/platform/srf06-cc26xx/contiki-main.c @@ -213,11 +213,6 @@ main(void) printf("%s\n", NETSTACK_MAC.name); printf(" RDC: "); printf("%s", NETSTACK_RDC.name); - - if(NETSTACK_RDC.channel_check_interval() != 0) { - printf(", Channel Check Interval: %u ticks", - NETSTACK_RDC.channel_check_interval()); - } printf("\n"); netstack_init(); diff --git a/drivers/platform/wismote/contiki-wismote-main.c b/drivers/platform/wismote/contiki-wismote-main.c index e8ef46617..254b23630 100644 --- a/drivers/platform/wismote/contiki-wismote-main.c +++ b/drivers/platform/wismote/contiki-wismote-main.c @@ -300,10 +300,8 @@ main(int argc, char **argv) NETSTACK_MAC.init(); NETSTACK_NETWORK.init(); - printf("%s %s, channel check rate %lu Hz, radio channel %u\n", + printf("%s %s, radio channel %u\n", NETSTACK_MAC.name, NETSTACK_RDC.name, - CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1: - NETSTACK_RDC.channel_check_interval()), RF_CHANNEL); process_start(&tcpip_process, NULL); @@ -341,10 +339,8 @@ main(int argc, char **argv) NETSTACK_MAC.init(); NETSTACK_NETWORK.init(); - printf("%s %s, channel check rate %lu Hz, radio channel %u\n", + printf("%s %s, radio channel %u\n", NETSTACK_MAC.name, NETSTACK_RDC.name, - CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0? 1: - NETSTACK_RDC.channel_check_interval()), RF_CHANNEL); #endif /* NETSTACK_CONF_WITH_IPV6 */ diff --git a/drivers/platform/z1/contiki-z1-main.c b/drivers/platform/z1/contiki-z1-main.c index 83e6a31b8..adbc99fad 100644 --- a/drivers/platform/z1/contiki-z1-main.c +++ b/drivers/platform/z1/contiki-z1-main.c @@ -319,10 +319,8 @@ main(int argc, char **argv) NETSTACK_MAC.init(); NETSTACK_NETWORK.init(); - printf("%s %s, channel check rate %lu Hz, radio channel %u\n", + printf("%s %s, radio channel %u\n", NETSTACK_MAC.name, NETSTACK_RDC.name, - CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1 : - NETSTACK_RDC.channel_check_interval()), CC2420_CONF_CHANNEL); process_start(&tcpip_process, NULL); @@ -360,10 +358,8 @@ main(int argc, char **argv) NETSTACK_MAC.init NETSTACK_NETWORK.init(); - printf("%s %s, channel check rate %lu Hz, radio channel %u\n", + printf("%s %s, radio channel %u\n", NETSTACK_MAC.name, NETSTACK_RDC.name, - CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1 : - NETSTACK_RDC.channel_check_interval()), CC2420_CONF_CHANNEL); #endif /* NETSTACK_CONF_WITH_IPV6 */ diff --git a/examples/ipv6/native-border-router/border-router-rdc.c b/examples/ipv6/native-border-router/border-router-rdc.c index 4aae30e5e..56301c7b1 100644 --- a/examples/ipv6/native-border-router/border-router-rdc.c +++ b/examples/ipv6/native-border-router/border-router-rdc.c @@ -170,12 +170,6 @@ off(int keep_radio_on) return 1; } /*---------------------------------------------------------------------------*/ -static unsigned short -channel_check_interval(void) -{ - return 0; -} -/*---------------------------------------------------------------------------*/ static void init(void) { @@ -189,7 +183,6 @@ const struct rdc_driver border_router_rdc_driver = { send_list, packet_input, on, - off, - channel_check_interval, + off }; /*---------------------------------------------------------------------------*/