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

change how prepare and transmit work --- Contiki expects to call

Browse source 
prepare once and then transmit many times to repeat the same packet
over and over. This didn't work like that, but now it does.
This commit is contained in:
maralvira 2010-11-07 20:07:42 +00:00
parent 24b6071234
commit 3b515587c5
1 changed files with 42 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
cpu/mc1322x/contiki-maca.c
View file

@ -30,7 +30,7 @@
* *
* This file is part of the Contiki OS. * This file is part of the Contiki OS.
* *
* $Id: contiki-maca.c,v 1.5 2010/11/07 18:34:52 maralvira Exp $ * $Id: contiki-maca.c,v 1.6 2010/11/07 20:07:42 maralvira Exp $
*/ */
#include <stdint.h> #include <stdint.h>
@ -95,10 +95,9 @@ static volatile uint8_t contiki_maca_request_off = 0;
static process_event_t event_data_ready; static process_event_t event_data_ready;
volatile packet_t *prepped_p; static volatile packet_t prepped_p;
int contiki_maca_init(void) { int contiki_maca_init(void) {
prepped_p = 0;
trim_xtal(); trim_xtal();
vreg_init(); vreg_init();
contiki_maca_init(); contiki_maca_init();
@ -169,51 +168,62 @@ int contiki_maca_read(void *buf, unsigned short bufsize) {
} }
} }
/* copies a payload into the prepped packet */
/* transmit sends the prepped packet everytime it is called */
/* Contiki may call prepare once and then transmit several times to send */
/* the same packet repeatedly */
int contiki_maca_prepare(const void *payload, unsigned short payload_len) { int contiki_maca_prepare(const void *payload, unsigned short payload_len) {
volatile int i; volatile int i;
volatile packet_t *p;
PRINTF("contiki maca prepare");
if ((prepped_p == 0)
&& (p = get_free_packet())) {
PRINTF("contiki maca prepare");
#if CONTIKI_MACA_RAW_MODE #if CONTIKI_MACA_RAW_MODE
p->offset = 1; prepped_p.offset = 1;
p->length = payload_len + 1; prepped_p.length = payload_len + 1;
#else #else
p->offset = 0; prepped_p.offset = 0;
p->length = payload_len; prepped_p.length = payload_len;
#endif #endif
if(payload_len > MAX_PACKET_SIZE) return RADIO_TX_ERR; if(payload_len > MAX_PACKET_SIZE) return RADIO_TX_ERR;
memcpy((uint8_t *)(p->data + p->offset), payload, payload_len); memcpy((uint8_t *)(prepped_p.data + prepped_p.offset), payload, payload_len);
#if CONTIKI_MACA_RAW_MODE #if CONTIKI_MACA_RAW_MODE
p->offset = 0; prepped_p.offset = 0;
p->data[0] = CONTIKI_MACA_PREPEND_BYTE; prepped_p.data[0] = CONTIKI_MACA_PREPEND_BYTE;
PRINTF(" raw mode"); PRINTF(" raw mode");
#endif #endif
#if CONTIKI_MACA_DEBUG #if CONTIKI_MACA_DEBUG
PRINTF(": sending %d bytes\n\r", payload_len); PRINTF(": sending %d bytes\n\r", payload_len);
for(i = p->offset ; i < (p->length + p->offset); i++) { for(i = prepped_p.offset ; i < (prepped_p.length + prepped_p.offset); i++) {
PRINTF(" %02x",p->data[i]); PRINTF(" %02x",prepped_p.data[i]);
}
PRINTF("\n\r");
#endif
prepped_p = p;
return RADIO_TX_OK;
} else {
PRINTF("couldn't get free packet for contiki_maca_send\n\r");
return RADIO_TX_ERR;
} }
PRINTF("\n\r");
#endif
return RADIO_TX_OK;
} }
/* gets a packet from the radio (if available), */
/* copies the prepared packet prepped_p */
/* and transmits it */
int contiki_maca_transmit(unsigned short transmit_len) { int contiki_maca_transmit(unsigned short transmit_len) {
volatile packet_t *p;
PRINTF("contiki maca transmit\n\r"); PRINTF("contiki maca transmit\n\r");
#if BLOCKING_TX #if BLOCKING_TX
tx_complete = 0; tx_complete = 0;
#endif #endif
tx_packet(prepped_p); if(p = get_free_packet()) {
prepped_p = 0; p->offset = prepped_p.offset;
p->length = prepped_p.length;
memcpy((uint8_t *)(p->data + p->offset),
(const uint8_t *)(prepped_p.data + prepped_p.offset),
prepped_p.length);
tx_packet(p);
} else {
PRINTF("couldn't get free packet for transmit\n\r");
return RADIO_TX_ERR;
}
#if BLOCKING_TX #if BLOCKING_TX
/* block until tx_complete, set by contiki_maca_tx_callback */ /* block until tx_complete, set by contiki_maca_tx_callback */
/* there are many places in contiki that rely on the */ /* there are many places in contiki that rely on the */