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

A number of updates to nullrdc

Browse Source 
* add a few rimestats to keep track of sent and received acks
* made a number of configuration options possible to override (ack timing)
* added the logic for sending 802.15.4 link layer ack packets, despite not being able to guarentee the 802.15.4 MAC timing
* increased the number of sequence numbers to keep track of for duplicate filtering
This commit is contained in:
Adam Dunkels 2013-03-17 23:47:00 +01:00
parent 4541d3e85b
commit 5993595a8f
1 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
core/net/mac/nullrdc.c
View File

@ -42,6 +42,7 @@
#include "net/packetbuf.h" #include "net/packetbuf.h"
#include "net/queuebuf.h" #include "net/queuebuf.h"
#include "net/netstack.h" #include "net/netstack.h"
#include "net/rime/rimestats.h"
#include <string.h> #include <string.h>
#define DEBUG 0 #define DEBUG 0
@ -78,11 +79,30 @@
#include "sys/rtimer.h" #include "sys/rtimer.h"
#include "dev/watchdog.h" #include "dev/watchdog.h"
#ifdef NULLRDC_CONF_ACK_WAIT_TIME
#define ACK_WAIT_TIME NULLRDC_CONF_ACK_WAIT_TIME
#else /* NULLRDC_CONF_ACK_WAIT_TIME */
#define ACK_WAIT_TIME RTIMER_SECOND / 2500 #define ACK_WAIT_TIME RTIMER_SECOND / 2500
#endif /* NULLRDC_CONF_ACK_WAIT_TIME */
#ifdef NULLRDC_CONF_AFTER_ACK_DETECTED_WAIT_TIME
#define AFTER_ACK_DETECTED_WAIT_TIME NULLRDC_CONF_AFTER_ACK_DETECTED_WAIT_TIME
#else /* NULLRDC_CONF_AFTER_ACK_DETECTED_WAIT_TIME */
#define AFTER_ACK_DETECTED_WAIT_TIME RTIMER_SECOND / 1500 #define AFTER_ACK_DETECTED_WAIT_TIME RTIMER_SECOND / 1500
#define ACK_LEN 3 #endif /* NULLRDC_CONF_AFTER_ACK_DETECTED_WAIT_TIME */
#endif /* NULLRDC_802154_AUTOACK */ #endif /* NULLRDC_802154_AUTOACK */
#ifdef NULLRDC_CONF_SEND_802154_ACK
#define NULLRDC_SEND_802154_ACK NULLRDC_CONF_SEND_802154_ACK
#else /* NULLRDC_CONF_SEND_802154_ACK */
#define NULLRDC_SEND_802154_ACK 0
#endif /* NULLRDC_CONF_SEND_802154_ACK */
#if NULLRDC_SEND_802154_ACK
#include "net/mac/frame802154.h"
#endif /* NULLRDC_SEND_802154_ACK */
#define ACK_LEN 3
#if NULLRDC_802154_AUTOACK || NULLRDC_802154_AUTOACK_HW #if NULLRDC_802154_AUTOACK || NULLRDC_802154_AUTOACK_HW
struct seqno { struct seqno {
rimeaddr_t sender; rimeaddr_t sender;
@ -92,7 +112,7 @@ struct seqno {
#ifdef NETSTACK_CONF_MAC_SEQNO_HISTORY #ifdef NETSTACK_CONF_MAC_SEQNO_HISTORY
#define MAX_SEQNOS NETSTACK_CONF_MAC_SEQNO_HISTORY #define MAX_SEQNOS NETSTACK_CONF_MAC_SEQNO_HISTORY
#else /* NETSTACK_CONF_MAC_SEQNO_HISTORY */ #else /* NETSTACK_CONF_MAC_SEQNO_HISTORY */
#define MAX_SEQNOS 16 #define MAX_SEQNOS 8
#endif /* NETSTACK_CONF_MAC_SEQNO_HISTORY */ #endif /* NETSTACK_CONF_MAC_SEQNO_HISTORY */
static struct seqno received_seqnos[MAX_SEQNOS]; static struct seqno received_seqnos[MAX_SEQNOS];
@ -135,8 +155,11 @@ send_packet(mac_callback_t sent, void *ptr)
already received a packet that needs to be read before already received a packet that needs to be read before
sending with auto ack. */ sending with auto ack. */
ret = MAC_TX_COLLISION; ret = MAC_TX_COLLISION;
} else { } else {
if(!is_broadcast) {
RIMESTATS_ADD(reliabletx);
}
switch(NETSTACK_RADIO.transmit(packetbuf_totlen())) { switch(NETSTACK_RADIO.transmit(packetbuf_totlen())) {
case RADIO_TX_OK: case RADIO_TX_OK:
if(is_broadcast) { if(is_broadcast) {
@ -165,13 +188,16 @@ send_packet(mac_callback_t sent, void *ptr)
len = NETSTACK_RADIO.read(ackbuf, ACK_LEN); len = NETSTACK_RADIO.read(ackbuf, ACK_LEN);
if(len == ACK_LEN && ackbuf[2] == dsn) { if(len == ACK_LEN && ackbuf[2] == dsn) {
/* Ack received */ /* Ack received */
RIMESTATS_ADD(ackrx);
ret = MAC_TX_OK; ret = MAC_TX_OK;
} else { } else {
/* Not an ack or ack not for us: collision */ /* Not an ack or ack not for us: collision */
ret = MAC_TX_COLLISION; ret = MAC_TX_COLLISION;
} }
} }
} } else {
PRINTF("nullrdc tx noack\n");
}
} }
break; break;
case RADIO_TX_COLLISION: case RADIO_TX_COLLISION:
@ -224,7 +250,7 @@ packet_input(void)
#if NULLRDC_802154_AUTOACK #if NULLRDC_802154_AUTOACK
if(packetbuf_datalen() == ACK_LEN) { if(packetbuf_datalen() == ACK_LEN) {
/* Ignore ack packets */ /* Ignore ack packets */
/* PRINTF("nullrdc: ignored ack\n"); */ PRINTF("nullrdc: ignored ack\n");
} else } else
#endif /* NULLRDC_802154_AUTOACK */ #endif /* NULLRDC_802154_AUTOACK */
if(NETSTACK_FRAMER.parse() < 0) { if(NETSTACK_FRAMER.parse() < 0) {
@ -259,6 +285,24 @@ packet_input(void)
rimeaddr_copy(&received_seqnos[0].sender, rimeaddr_copy(&received_seqnos[0].sender,
packetbuf_addr(PACKETBUF_ADDR_SENDER)); packetbuf_addr(PACKETBUF_ADDR_SENDER));
#endif /* NULLRDC_802154_AUTOACK */ #endif /* NULLRDC_802154_AUTOACK */
#if NULLRDC_SEND_802154_ACK
{
frame802154_t info154;
frame802154_parse(original_dataptr, original_datalen, &info154);
if(info154.fcf.frame_type == FRAME802154_DATAFRAME &&
info154.fcf.ack_required != 0 &&
rimeaddr_cmp((rimeaddr_t *)&info154.dest_addr,
&rimeaddr_node_addr)) {
uint8_t ackdata[ACK_LEN] = {0, 0, 0};
ackdata[0] = FRAME802154_ACKFRAME;
ackdata[1] = 0;
ackdata[2] = info154.seq;
NETSTACK_RADIO.send(ackdata, ACK_LEN);
}
}
#endif /* NULLRDC_SEND_ACK */
NETSTACK_MAC.input(); NETSTACK_MAC.input();
} }
} }