deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix compiler warnings

Browse source
This commit is contained in:
dak664 2010-08-01 21:18:07 +00:00
parent 52ff852aa8
commit 12479c32bc
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/net/mac/cxmac.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: cxmac.c,v 1.13 2010/06/15 19:22:25 adamdunkels Exp $ * $Id: cxmac.c,v 1.14 2010/08/01 21:18:07 dak664 Exp $
*/ */
/** /**
@ -600,14 +600,13 @@ send_packet(void)
#endif #endif
off(); off();
} else { } else {
rtimer_clock_t wt;
NETSTACK_RADIO.send(strobe, strobe_len); NETSTACK_RADIO.send(strobe, strobe_len);
#if 0 #if 0
/* Turn off the radio for a while to let the other side /* Turn off the radio for a while to let the other side
respond. We don't need to keep our radio on when we know respond. We don't need to keep our radio on when we know
that the other side needs some time to produce a reply. */ that the other side needs some time to produce a reply. */
off(); off();
wt = RTIMER_NOW(); rtimer_clock_t wt = RTIMER_NOW();
while(RTIMER_CLOCK_LT(RTIMER_NOW(), wt + WAIT_TIME_BEFORE_STROBE_ACK)); while(RTIMER_CLOCK_LT(RTIMER_NOW(), wt + WAIT_TIME_BEFORE_STROBE_ACK));
#endif /* 0 */ #endif /* 0 */
on(); on();

4
core/net/rime/rime.c
View file

@ -33,7 +33,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: rime.c,v 1.29 2010/05/28 06:18:39 nifi Exp $ * $Id: rime.c,v 1.30 2010/08/01 21:18:07 dak664 Exp $
*/ */
/** /**
@ -105,7 +105,7 @@ const struct mac_driver *rime_mac;
#ifdef RIME_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME #ifdef RIME_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME
#define BROADCAST_ANNOUNCEMENT_MAX_TIME RIME_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME #define BROADCAST_ANNOUNCEMENT_MAX_TIME RIME_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME
#else /* RIME_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME */ #else /* RIME_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME */
#define BROADCAST_ANNOUNCEMENT_MAX_TIME CLOCK_SECOND * 600 #define BROADCAST_ANNOUNCEMENT_MAX_TIME CLOCK_SECOND * 600UL
#endif /* RIME_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME */ #endif /* RIME_CONF_BROADCAST_ANNOUNCEMENT_MAX_TIME */