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

Bugfix: the return value sometimes was wrong when a collision was detected.

Browse source
This commit is contained in:
adamdunkels 2010-10-03 20:39:24 +00:00
parent ae88ed04f1
commit ceebd7020a
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/net/mac/contikimac.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: contikimac.c,v 1.37 2010/04/30 07:25:51 adamdunkels Exp $ * $Id: contikimac.c,v 1.38 2010/10/03 20:39:24 adamdunkels Exp $
*/ */
/** /**
@ -108,7 +108,7 @@ struct announcement_msg {
#ifdef CONTIKIMAC_CONF_CYCLE_TIME #ifdef CONTIKIMAC_CONF_CYCLE_TIME
#define CYCLE_TIME (CONTIKIMAC_CONF_CYCLE_TIME) #define CYCLE_TIME (CONTIKIMAC_CONF_CYCLE_TIME)
#else #else
#define CYCLE_TIME (RTIMER_ARCH_SECOND / MAC_CHANNEL_CHECK_RATE) #define CYCLE_TIME (RTIMER_ARCH_SECOND / NETSTACK_RDC_CHANNEL_CHECK_RATE)
#endif #endif
#define MAX_PHASE_STROBE_TIME RTIMER_ARCH_SECOND / 20 #define MAX_PHASE_STROBE_TIME RTIMER_ARCH_SECOND / 20
@ -773,7 +773,7 @@ send_packet(mac_callback_t mac_callback, void *mac_callback_ptr)
on(); on();
} }
watchdog_periodic();
t0 = RTIMER_NOW(); t0 = RTIMER_NOW();
t = RTIMER_NOW(); t = RTIMER_NOW();
#if NURTIMER #if NURTIMER
@ -875,9 +875,7 @@ send_packet(mac_callback_t mac_callback, void *mac_callback_ptr)
return from the function. */ return from the function. */
if(collisions > 0) { if(collisions > 0) {
ret = MAC_TX_COLLISION; ret = MAC_TX_COLLISION;
} } else if(!is_broadcast && !got_strobe_ack) {
if(!is_broadcast && !got_strobe_ack) {
ret = MAC_TX_NOACK; ret = MAC_TX_NOACK;
} else { } else {
ret = MAC_TX_OK; ret = MAC_TX_OK;
@ -1022,9 +1020,9 @@ send_announcement(void *ptr)
int announcement_len; int announcement_len;
int transmit_len; int transmit_len;
#if WITH_CONTIKIMAC_HEADER #if WITH_CONTIKIMAC_HEADER
struct hdr *chdr struct hdr *chdr;
#endif /* WITH_CONTIKIMAC_HEADER */ #endif /* WITH_CONTIKIMAC_HEADER */
/* Set up the probe header. */ /* Set up the probe header. */
packetbuf_clear(); packetbuf_clear();
announcement_len = format_announcement(packetbuf_dataptr()); announcement_len = format_announcement(packetbuf_dataptr());