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

Bugfix by Simon Duquennoy: don't transmit packet until previous packet has been sent by the RDC layer.

Browse source
This commit is contained in:
adamdunkels 2011-01-13 19:06:22 +00:00
parent 6f89233b01
commit 26e3b6fdc0
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/net/mac/csma.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: csma.c,v 1.24 2010/12/16 22:44:02 adamdunkels Exp $ * $Id: csma.c,v 1.25 2011/01/13 19:06:22 adamdunkels Exp $
*/ */
/** /**
@ -92,6 +92,8 @@ LIST(queued_packet_list);
static struct ctimer transmit_timer; static struct ctimer transmit_timer;
static uint8_t rdc_is_transmitting;
static void packet_sent(void *ptr, int status, int num_transmissions); static void packet_sent(void *ptr, int status, int num_transmissions);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -118,6 +120,12 @@ transmit_queued_packet(void *ptr)
/* struct queued_packet *q = ptr;*/ /* struct queued_packet *q = ptr;*/
struct queued_packet *q; struct queued_packet *q;
/* Don't transmit a packet if the RDC is still transmitting the
previous one. */
if(rdc_is_transmitting) {
return;
}
// printf("q %d\n", list_length(queued_packet_list)); // printf("q %d\n", list_length(queued_packet_list));
q = list_head(queued_packet_list); q = list_head(queued_packet_list);
@ -127,6 +135,7 @@ transmit_queued_packet(void *ptr)
PRINTF("csma: sending number %d %p, queue len %d\n", q->transmissions, q, PRINTF("csma: sending number %d %p, queue len %d\n", q->transmissions, q,
list_length(queued_packet_list)); list_length(queued_packet_list));
// printf("s %d\n", packetbuf_addr(PACKETBUF_ADDR_RECEIVER)->u8[0]); // printf("s %d\n", packetbuf_addr(PACKETBUF_ADDR_RECEIVER)->u8[0]);
rdc_is_transmitting = 1;
NETSTACK_RDC.send(packet_sent, q); NETSTACK_RDC.send(packet_sent, q);
} }
} }
@ -150,7 +159,7 @@ free_queued_packet(void)
struct queued_packet *q; struct queued_packet *q;
// printf("q %d\n", list_length(queued_packet_list)); // printf("q %d\n", list_length(queued_packet_list));
q = list_head(queued_packet_list); q = list_head(queued_packet_list);
if(q != NULL) { if(q != NULL) {
@ -175,6 +184,8 @@ packet_sent(void *ptr, int status, int num_transmissions)
int num_tx; int num_tx;
int backoff_transmissions; int backoff_transmissions;
rdc_is_transmitting = 0;
switch(status) { switch(status) {
case MAC_TX_OK: case MAC_TX_OK:
case MAC_TX_NOACK: case MAC_TX_NOACK:
@ -333,6 +344,7 @@ static void
init(void) init(void)
{ {
memb_init(&packet_memb); memb_init(&packet_memb);
rdc_is_transmitting = 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
const struct mac_driver csma_driver = { const struct mac_driver csma_driver = {