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

Remove leftover COOJA_IP64 flags

Browse Source
This commit is contained in:
Simon Duquennoy 2018-04-20 05:24:07 -07:00
parent f6f081b67f
commit c5e8c2097f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
os/net/mac/csma/csma-output.c
View File

@ -50,10 +50,10 @@
#include "lib/list.h" #include "lib/list.h"
#include "lib/memb.h" #include "lib/memb.h"
#if CONTIKI_TARGET_COOJA || CONTIKI_TARGET_COOJA_IP64 #if CONTIKI_TARGET_COOJA
#include "lib/simEnvChange.h" #include "lib/simEnvChange.h"
#include "sys/cooja_mt.h" #include "sys/cooja_mt.h"
#endif /* CONTIKI_TARGET_COOJA || CONTIKI_TARGET_COOJA_IP64 */ #endif /* CONTIKI_TARGET_COOJA */
/* Log configuration */ /* Log configuration */
#include "sys/log.h" #include "sys/log.h"
@ -207,10 +207,10 @@ send_one_packet(void *ptr)
wt = RTIMER_NOW(); wt = RTIMER_NOW();
watchdog_periodic(); watchdog_periodic();
while(RTIMER_CLOCK_LT(RTIMER_NOW(), wt + CSMA_ACK_WAIT_TIME)) { while(RTIMER_CLOCK_LT(RTIMER_NOW(), wt + CSMA_ACK_WAIT_TIME)) {
#if CONTIKI_TARGET_COOJA || CONTIKI_TARGET_COOJA_IP64 #if CONTIKI_TARGET_COOJA
simProcessRunValue = 1; simProcessRunValue = 1;
cooja_mt_yield(); cooja_mt_yield();
#endif /* CONTIKI_TARGET_COOJA || CONTIKI_TARGET_COOJA_IP64 */ #endif /* CONTIKI_TARGET_COOJA */
} }
ret = MAC_TX_NOACK; ret = MAC_TX_NOACK;
@ -225,10 +225,10 @@ send_one_packet(void *ptr)
watchdog_periodic(); watchdog_periodic();
while(RTIMER_CLOCK_LT(RTIMER_NOW(), while(RTIMER_CLOCK_LT(RTIMER_NOW(),
wt + CSMA_AFTER_ACK_DETECTED_WAIT_TIME)) { wt + CSMA_AFTER_ACK_DETECTED_WAIT_TIME)) {
#if CONTIKI_TARGET_COOJA || CONTIKI_TARGET_COOJA_IP64 #if CONTIKI_TARGET_COOJA
simProcessRunValue = 1; simProcessRunValue = 1;
cooja_mt_yield(); cooja_mt_yield();
#endif /* CONTIKI_TARGET_COOJA || CONTIKI_TARGET_COOJA_IP64 */ #endif /* CONTIKI_TARGET_COOJA */
} }
} }