giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove channel_check_interval

Browse Source
This commit is contained in:
Simon Duquennoy 2017-05-17 14:34:29 +02:00
parent 682e8f42b9
commit 95323b9ce7
17 changed files with 21 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/net/ipv6/multicast/esmrf.c
View File

@ -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)
/*---------------------------------------------------------------------------*/

2
core/net/ipv6/multicast/smrf.c
View File

@ -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)
/*---------------------------------------------------------------------------*/

25
core/net/mac/csma.c
View File

@ -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
};
/*---------------------------------------------------------------------------*/

3
core/net/mac/mac.h
View File

@ -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. */

9
core/net/mac/nordc.c
View File

@ -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
};
/*---------------------------------------------------------------------------*/

9
core/net/mac/nullmac.c
View File

@ -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
};
/*---------------------------------------------------------------------------*/

9
core/net/mac/nullrdc.c
View File

@ -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
};
/*---------------------------------------------------------------------------*/

3
core/net/mac/rdc.h
View File

@ -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_ */

9
core/net/mac/tsch/tsch.c
View File

@ -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
};
/*---------------------------------------------------------------------------*/

9
drivers/cpu/nrf52832/ble/ble-mac.c
View File

@ -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
};
/*---------------------------------------------------------------------------*/
/**

6
drivers/platform/cooja-ip64/contiki-cooja-ip64-main.c
View File

@ -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 */

6
drivers/platform/cooja/contiki-cooja-main.c
View File

@ -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 */

8
drivers/platform/sky/contiki-sky-main.c
View File

@ -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 */

5
drivers/platform/srf06-cc26xx/contiki-main.c
View File

@ -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();

8
drivers/platform/wismote/contiki-wismote-main.c
View File

@ -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 */

8
drivers/platform/z1/contiki-z1-main.c
View File

@ -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 */

9
examples/ipv6/native-border-router/border-router-rdc.c
View File

@ -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
};
/*---------------------------------------------------------------------------*/