Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2025-01-03 11:30:53 +00:00
Code Issues Projects Releases Wiki Activity

* Use uip_fw return codes.

Browse Source 
* Use unicast retransmission scheme also for broadcasts.
This commit is contained in:
bg- 2007-05-02 14:51:20 +00:00
parent cca02a05ed
commit 83f2b1da00
1 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
core/dev/cc2420.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: cc2420.c,v 1.12 2007/04/30 09:41:42 bg- Exp $ * @(#)$Id: cc2420.c,v 1.13 2007/05/02 14:51:20 bg- Exp $
*/ */
/* /*
* This code is almost device independent and should be easy to port. * This code is almost device independent and should be easy to port.
@ -38,15 +38,16 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "contiki.h"
#if defined(__AVR__) #if defined(__AVR__)
#include <avr/io.h> #include <avr/io.h>
#elif defined(__MSP430__) #elif defined(__MSP430__)
#include <io.h> #include <io.h>
#endif #endif
#include "contiki.h"
#include "net/uip.h" #include "net/uip.h"
#include "net/uip-fw.h"
#define BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN]) #define BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN])
#include "dev/leds.h" #include "dev/leds.h"
@ -55,10 +56,13 @@
#include "dev/cc2420.h" #include "dev/cc2420.h"
#include "dev/cc2420_const.h" #include "dev/cc2420_const.h"
#if 0 #define NDEBUG
#define PRINTF(...) printf(__VA_ARGS__) #include "lib/assert.h"
#else
#ifdef NDEBUG
#define PRINTF(...) do {} while (0) #define PRINTF(...) do {} while (0)
#else
#define PRINTF(...) printf(__VA_ARGS__)
#endif #endif
PROCESS(cc2420_process, "CC2420 driver"); PROCESS(cc2420_process, "CC2420 driver");
@ -75,7 +79,7 @@ static u8_t receive_on;
volatile u8_t cc2420_ack_received; /* Naive ACK management. */ volatile u8_t cc2420_ack_received; /* Naive ACK management. */
static u8_t last_used_seq; static u8_t last_used_seq;
static u16_t last_correspondent; static u16_t last_dst;
/* Radio stuff in network byte order. */ /* Radio stuff in network byte order. */
static u16_t pan_id; static u16_t pan_id;
@ -191,7 +195,7 @@ cc2420_send(struct hdr_802_15 *hdr, u8_t hdr_len,
const u8_t *payload, u8_t payload_len) const u8_t *payload, u8_t payload_len)
{ {
u8_t spiStatusByte; u8_t spiStatusByte;
int s; int s, ret;
/* struct hdr_802_15::len shall *not* be counted, thus the -1. /* struct hdr_802_15::len shall *not* be counted, thus the -1.
* 2 == sizeof(footer). * 2 == sizeof(footer).
@ -214,7 +218,7 @@ cc2420_send(struct hdr_802_15 *hdr, u8_t hdr_len,
} while (spiStatusByte & BV(CC2420_TX_ACTIVE)); } while (spiStatusByte & BV(CC2420_TX_ACTIVE));
hdr->dst_pan = pan_id; /* Not at fixed position! xxx/bg */ hdr->dst_pan = pan_id; /* Not at fixed position! xxx/bg */
last_correspondent = hdr->dst; /* Not dst either. */ last_dst = hdr->dst; /* Not dst either. */
last_used_seq++; last_used_seq++;
hdr->seq = last_used_seq; hdr->seq = last_used_seq;
cc2420_ack_received = 0; cc2420_ack_received = 0;
@ -226,28 +230,23 @@ cc2420_send(struct hdr_802_15 *hdr, u8_t hdr_len,
FASTSPI_WRITE_FIFO(payload, payload_len); FASTSPI_WRITE_FIFO(payload, payload_len);
splx(s); splx(s);
if (hdr->dst == 0xffff) { ret = cc2420_resend(); /* Send stuff from FIFO. */
int i; if (hdr->dst == 0xffff && ret == UIP_FW_OK) {
for (i = 0; i < 3; i++) { return ret;
static unsigned delaymask[] = { 1024-1, 2048-1, 4096-1 };
if (cc2420_resend() >= 0)
return 0;
PRINTF("resend i=%d\n", i);
clock_delay(rand() & delaymask[i]);
}
} else {
process_post(&cc2420_retransmit_process,
PROCESS_EVENT_MSG,
(void *)(unsigned)last_used_seq);
} }
return cc2420_resend(); /* Send stuff from FIFO. */
process_post(&cc2420_retransmit_process,
PROCESS_EVENT_MSG,
(void *)(unsigned)last_used_seq);
return UIP_FW_OK;
} }
/* /*
* Request packet to be sent using CSMA-CA. Requires that RSSI is * Request packet to be sent using CSMA-CA. Requires that RSSI is
* valid. * valid.
* *
* Return -3 on failure. * Return UIP_FW_DROPPED on failure.
*/ */
int int
cc2420_resend(void) cc2420_resend(void)
@ -257,7 +256,7 @@ cc2420_resend(void)
if (FIFOP_IS_1 && !FIFO_IS_1) { if (FIFOP_IS_1 && !FIFO_IS_1) {
/* RXFIFO overflow, send on retransmit. */ /* RXFIFO overflow, send on retransmit. */
PRINTF("rxfifo overflow!\n"); PRINTF("rxfifo overflow!\n");
// return -4; // return UIP_FW_DROPPED;
} }
/* The TX FIFO can only hold one packet! Make sure to not overrun /* The TX FIFO can only hold one packet! Make sure to not overrun
@ -277,12 +276,13 @@ cc2420_resend(void)
for (i = LOOP_20_SYMBOLS; i > 0; i--) for (i = LOOP_20_SYMBOLS; i > 0; i--)
if (SFD_IS_1) { if (SFD_IS_1) {
if (cc2420_status() & BV(CC2420_TX_ACTIVE)) if (cc2420_status() & BV(CC2420_TX_ACTIVE))
return 0; /* Transmission has started. */ return UIP_FW_OK; /* Transmission has started. */
else else
break; /* We must be receiving. */ break; /* We must be receiving. */
} }
} }
return -3; /* Transmission never started! */
return UIP_FW_DROPPED; /* Transmission never started! */
} }
void void
@ -479,7 +479,7 @@ PROCESS_THREAD(cc2420_process, ev, data)
} }
if (len == 2) { /* A DATA ACK packet. */ if (len == 2) { /* A DATA ACK packet. */
if (last_correspondent == h.src) if (last_dst == h.src)
cc2420_ack_received = 1; cc2420_ack_received = 1;
neigbour_update(h.src, 0); neigbour_update(h.src, 0);
} else if (len > 2 && uip_len > 0 } else if (len > 2 && uip_len > 0
@ -526,18 +526,23 @@ PROCESS_THREAD(cc2420_retransmit_process, ev, data)
} else if (seq != last_used_seq) } else if (seq != last_used_seq)
break; /* Transmitting different packet. */ break; /* Transmitting different packet. */
else if (n < MAX_RETRANSMISSIONS) { else if (n < MAX_RETRANSMISSIONS) {
cc2420_resend(); int ret;
PRINTF("RETRANS %d %d.%d\n", n, last_dst >> 8, last_dst & 0xff);
ret = cc2420_resend();
if (last_dst == 0xffff && ret == UIP_FW_OK) {
etimer_stop(&etimer);
break;
}
n++; n++;
PRINTF("RETRANS %d\n", n);
} else { } else {
break; break;
} }
} while (1); } while (1);
neigbour_update(last_correspondent, n); neigbour_update(last_dst, n);
#if 0 #if 0
#define CORRELATION_2_X(c) (((c) < 48) ? 0 : ((c) - 48)) #define CORRELATION_2_X(c) (((c) < 48) ? 0 : ((c) - 48))
PRINTF("%04x %2d %2d %2u %u\n", PRINTF("%04x %2d %2d %2u %u\n",
last_correspondent, n, last_dst, n,
RSSI_2_ED(cc2420_last_rssi), RSSI_2_ED(cc2420_last_rssi),
CORRELATION_2_X(cc2420_last_correlation), CORRELATION_2_X(cc2420_last_correlation),
clock_time()); clock_time());