From d6656ccde1c27d06c9bdd7ed02bf6b33e82a6196 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Sat, 3 Dec 2016 23:26:25 +0000 Subject: [PATCH] Fix minor typo --- core/net/mac/contikimac/contikimac.c | 10 +++++----- platform/srf06-cc26xx/contiki-conf.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/net/mac/contikimac/contikimac.c b/core/net/mac/contikimac/contikimac.c index 290273fa1..229cfb473 100644 --- a/core/net/mac/contikimac/contikimac.c +++ b/core/net/mac/contikimac/contikimac.c @@ -207,13 +207,13 @@ static int we_are_receiving_burst = 0; #define INTER_PACKET_INTERVAL RTIMER_ARCH_SECOND / 2500 #endif -/* AFTER_ACK_DETECTECT_WAIT_TIME is the time to wait after a potential +/* AFTER_ACK_DETECTED_WAIT_TIME is the time to wait after a potential ACK packet has been detected until we can read it out from the radio. */ -#ifdef CONTIKIMAC_CONF_AFTER_ACK_DETECTECT_WAIT_TIME -#define AFTER_ACK_DETECTECT_WAIT_TIME CONTIKIMAC_CONF_AFTER_ACK_DETECTECT_WAIT_TIME +#ifdef CONTIKIMAC_CONF_AFTER_ACK_DETECTED_WAIT_TIME +#define AFTER_ACK_DETECTED_WAIT_TIME CONTIKIMAC_CONF_AFTER_ACK_DETECTED_WAIT_TIME #else -#define AFTER_ACK_DETECTECT_WAIT_TIME RTIMER_ARCH_SECOND / 1500 +#define AFTER_ACK_DETECTED_WAIT_TIME RTIMER_ARCH_SECOND / 1500 #endif /* MAX_PHASE_STROBE_TIME is the time that we transmit repeated packets @@ -761,7 +761,7 @@ send_packet(mac_callback_t mac_callback, void *mac_callback_ptr, NETSTACK_RADIO.channel_clear() == 0)) { uint8_t ackbuf[ACK_LEN]; wt = RTIMER_NOW(); - while(RTIMER_CLOCK_LT(RTIMER_NOW(), wt + AFTER_ACK_DETECTECT_WAIT_TIME)) { } + while(RTIMER_CLOCK_LT(RTIMER_NOW(), wt + AFTER_ACK_DETECTED_WAIT_TIME)) { } len = NETSTACK_RADIO.read(ackbuf, ACK_LEN); if(len == ACK_LEN && seqno == ackbuf[ACK_LEN - 1]) { diff --git a/platform/srf06-cc26xx/contiki-conf.h b/platform/srf06-cc26xx/contiki-conf.h index eb2612efc..85c99ee19 100644 --- a/platform/srf06-cc26xx/contiki-conf.h +++ b/platform/srf06-cc26xx/contiki-conf.h @@ -120,7 +120,7 @@ #define CONTIKIMAC_CONF_CCA_SLEEP_TIME (RTIMER_ARCH_SECOND / 210) #define CONTIKIMAC_CONF_LISTEN_TIME_AFTER_PACKET_DETECTED (RTIMER_ARCH_SECOND / 20) #define CONTIKIMAC_CONF_SEND_SW_ACK 1 -#define CONTIKIMAC_CONF_AFTER_ACK_DETECTECT_WAIT_TIME (RTIMER_SECOND / 1000) +#define CONTIKIMAC_CONF_AFTER_ACK_DETECTED_WAIT_TIME (RTIMER_SECOND / 1000) #define CONTIKIMAC_CONF_INTER_PACKET_INTERVAL (RTIMER_SECOND / 240) #else #define NETSTACK_CONF_RADIO ieee_mode_driver