From ae175987d57111e358a5bb078bc1aaa7f93587c3 Mon Sep 17 00:00:00 2001 From: Akshai M Date: Tue, 19 May 2020 17:51:01 +0530 Subject: [PATCH] gnrc/gomach : Move GNRC_GOMACH_WAIT_RX_END_US to 'CONFIG_' --- sys/include/net/gnrc/gomach/gomach.h | 8 ++++---- sys/net/gnrc/link_layer/gomach/gomach.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/include/net/gnrc/gomach/gomach.h b/sys/include/net/gnrc/gomach/gomach.h index cd883fd4d3..60559a32b4 100644 --- a/sys/include/net/gnrc/gomach/gomach.h +++ b/sys/include/net/gnrc/gomach/gomach.h @@ -168,11 +168,11 @@ extern "C" { * * Sometimes in GoMacH, if a node finds RX ongoing when it is just about to * enter the next MAC state, it will set up a timeout for waiting this packet - * reception complete with a timeout of this @ref GNRC_GOMACH_WAIT_RX_END_US - * duration. + * reception complete with a timeout of this + * @ref CONFIG_GNRC_GOMACH_WAIT_RX_END_US duration. */ -#ifndef GNRC_GOMACH_WAIT_RX_END_US -#define GNRC_GOMACH_WAIT_RX_END_US (6U * US_PER_MS) +#ifndef CONFIG_GNRC_GOMACH_WAIT_RX_END_US +#define CONFIG_GNRC_GOMACH_WAIT_RX_END_US (6U * US_PER_MS) #endif /** diff --git a/sys/net/gnrc/link_layer/gomach/gomach.c b/sys/net/gnrc/link_layer/gomach/gomach.c index e1b2dbb2ed..d29bf11bd7 100644 --- a/sys/net/gnrc/link_layer/gomach/gomach.c +++ b/sys/net/gnrc/link_layer/gomach/gomach.c @@ -1159,7 +1159,7 @@ static bool _handle_in_t2u_send_preamble(gnrc_netif_t *netif) gnrc_gomach_clear_timeout(netif, GNRC_GOMACH_TIMEOUT_WAIT_RX_END); gnrc_gomach_set_timeout(netif, GNRC_GOMACH_TIMEOUT_WAIT_RX_END, - GNRC_GOMACH_WAIT_RX_END_US); + CONFIG_GNRC_GOMACH_WAIT_RX_END_US); return false; } @@ -1540,7 +1540,7 @@ static void _cp_listen_end(gnrc_netif_t *netif) netif->mac.prot.gomach.cp_extend_count++; gnrc_gomach_clear_timeout(netif, GNRC_GOMACH_TIMEOUT_WAIT_RX_END); gnrc_gomach_set_timeout(netif, GNRC_GOMACH_TIMEOUT_WAIT_RX_END, - GNRC_GOMACH_WAIT_RX_END_US); + CONFIG_GNRC_GOMACH_WAIT_RX_END_US); } else { gnrc_gomach_clear_timeout(netif, GNRC_GOMACH_TIMEOUT_WAIT_RX_END); @@ -1757,7 +1757,7 @@ static void gomach_vtdma(gnrc_netif_t *netif) if (gnrc_gomach_get_netdev_state(netif) == NETOPT_STATE_RX) { gnrc_gomach_clear_timeout(netif, GNRC_GOMACH_TIMEOUT_WAIT_RX_END); gnrc_gomach_set_timeout(netif, GNRC_GOMACH_TIMEOUT_WAIT_RX_END, - GNRC_GOMACH_WAIT_RX_END_US); + CONFIG_GNRC_GOMACH_WAIT_RX_END_US); return; }