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

Rime sniffers must be called for all transmissions, even if they failed, to get energy attribution right. This means that rime output sniffers now also must take the MAC transmission status as an argument.

Browse source
This commit is contained in:
Adam Dunkels 2011-05-02 15:06:34 +02:00
parent cae8ef206a
commit dfaf4afc8e
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/net/rime.h
View file

@ -94,7 +94,7 @@ extern const struct mac_driver *rime_mac;
struct rime_sniffer {
struct rime_sniffer *next;
void (* input_callback)(void);
void (* output_callback)(void);
void (* output_callback)(int mac_status);
};
#define RIME_SNIFFER(name, input_callback, output_callback) \

17
core/net/rime/rime.c
View file

@ -151,7 +151,7 @@ static void
packet_sent(void *ptr, int status, int num_tx)
{
struct channel *c = ptr;
struct rime_sniffer *s;
switch(status) {
case MAC_TX_COLLISION:
@ -166,17 +166,14 @@ packet_sent(void *ptr, int status, int num_tx)
default:
PRINTF("rime: error %d after %d tx\n", status, num_tx);
}
if(status == MAC_TX_OK) {
struct rime_sniffer *s;
/* Call sniffers, but only if the packet was sent. */
for(s = list_head(sniffers); s != NULL; s = list_item_next(s)) {
if(s->output_callback != NULL) {
s->output_callback();
}
/* Call sniffers, pass along the MAC status code. */
for(s = list_head(sniffers); s != NULL; s = list_item_next(s)) {
if(s->output_callback != NULL) {
s->output_callback(status);
}
}
abc_sent(c, status, num_tx);
}
/*---------------------------------------------------------------------------*/