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

Bugfixed stream mode: node listens 100% for 0.5 seconds in stream mode. Naming change: is_listening changed is_snooping.

Browse source
This commit is contained in:
adamdunkels 2010-04-01 10:02:04 +00:00
parent 5b121b4829
commit add426de4b
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
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.21 2010/03/31 20:27:15 adamdunkels Exp $ * $Id: contikimac.c,v 1.22 2010/04/01 10:02:04 adamdunkels Exp $
*/ */
/** /**
@ -161,9 +161,9 @@ static struct ctimer announcement_cycle_ctimer, announcement_ctimer;
static int announcement_radio_txpower; static int announcement_radio_txpower;
#endif /* CONTIKIMAC_CONF_ANNOUNCEMENTS */ #endif /* CONTIKIMAC_CONF_ANNOUNCEMENTS */
/* Flag that is used to keep track of whether or not we are listening /* Flag that is used to keep track of whether or not we are snooping
for announcements from neighbors. */ for announcements from neighbors. */
static volatile uint8_t is_listening; static volatile uint8_t is_snooping;
#if CONTIKIMAC_CONF_COMPOWER #if CONTIKIMAC_CONF_COMPOWER
static struct compower_activity current_packet; static struct compower_activity current_packet;
@ -203,7 +203,7 @@ on(void)
static void static void
off(void) off(void)
{ {
if(contikimac_is_on && radio_is_on != 0 /*&& is_listening == 0*/) { if(contikimac_is_on && radio_is_on != 0 && is_streaming == 0) {
radio_is_on = 0; radio_is_on = 0;
NETSTACK_RADIO.off(); NETSTACK_RADIO.off();
} }
@ -324,7 +324,7 @@ powercycle(struct rtimer *t, void *ptr)
radio off. Also, if a packet has been successfully radio off. Also, if a packet has been successfully
received (as indicated by the received (as indicated by the
NETSTACK_RADIO.pending_packet() function), we stop NETSTACK_RADIO.pending_packet() function), we stop
listening. */ snooping. */
if(NETSTACK_RADIO.channel_clear()) { if(NETSTACK_RADIO.channel_clear()) {
++silence_periods; ++silence_periods;
} else { } else {
@ -379,7 +379,7 @@ powercycle(struct rtimer *t, void *ptr)
compower_accumulate(&compower_idle_activity); compower_accumulate(&compower_idle_activity);
#endif /* CONTIKIMAC_CONF_COMPOWER */ #endif /* CONTIKIMAC_CONF_COMPOWER */
} }
} while((is_streaming || is_listening) && } while((is_snooping) &&
RTIMER_NOW() - cycle_start < CYCLE_TIME - CCA_CHECK_TIME * CCA_COUNT_MAX); RTIMER_NOW() - cycle_start < CYCLE_TIME - CCA_CHECK_TIME * CCA_COUNT_MAX);
if(RTIMER_NOW() - cycle_start < CYCLE_TIME) { if(RTIMER_NOW() - cycle_start < CYCLE_TIME) {
@ -926,16 +926,16 @@ cycle_announcement(void *ptr)
send_announcement, NULL); send_announcement, NULL);
ctimer_set(&announcement_cycle_ctimer, ANNOUNCEMENT_PERIOD, ctimer_set(&announcement_cycle_ctimer, ANNOUNCEMENT_PERIOD,
cycle_announcement, NULL); cycle_announcement, NULL);
if(is_listening > 0) { if(is_snooping > 0) {
is_listening--; is_snooping--;
/* printf("is_listening %d\n", is_listening); */ /* printf("is_snooping %d\n", is_snooping); */
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
listen_callback(int periods) listen_callback(int periods)
{ {
is_listening = periods + 1; is_snooping = periods + 1;
} }
#endif /* CONTIKIMAC_CONF_ANNOUNCEMENTS */ #endif /* CONTIKIMAC_CONF_ANNOUNCEMENTS */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/