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

mc1322x: get the tx status for a packet and return the proper response.

Browse source
This commit is contained in:
Mariano Alvira 2011-02-18 13:22:43 -05:00
parent 535b9d35d7
commit c12ab0d484
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,6 +62,7 @@
#endif #endif
static volatile uint8_t tx_complete; static volatile uint8_t tx_complete;
static volatile uint8_t tx_status;
/* contiki mac driver */ /* contiki mac driver */
@ -228,8 +229,6 @@ int contiki_maca_transmit(unsigned short transmit_len) {
#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 */
/* transmit call to block */
while(!tx_complete && (tx_head != 0)); while(!tx_complete && (tx_head != 0));
#endif #endif
} }
@ -237,7 +236,18 @@ int contiki_maca_transmit(unsigned short transmit_len) {
int contiki_maca_send(const void *payload, unsigned short payload_len) { int contiki_maca_send(const void *payload, unsigned short payload_len) {
contiki_maca_prepare(payload, payload_len); contiki_maca_prepare(payload, payload_len);
contiki_maca_transmit(payload_len); contiki_maca_transmit(payload_len);
return RADIO_TX_OK; switch(tx_status) {
case SUCCESS:
case CRC_FAILED: /* CRC_FAILED is usually an ack */
PRINTF("TXOK\n\r");
return RADIO_TX_OK;
case NO_ACK:
PRINTF("NOACK\n\r");
return RADIO_TX_NOACK;
default:
PRINTF("TXERR\n\r");
return RADIO_TX_ERR;
}
} }
PROCESS(contiki_maca_process, "maca process"); PROCESS(contiki_maca_process, "maca process");
@ -284,5 +294,6 @@ void maca_rx_callback(volatile packet_t *p __attribute((unused))) {
#if BLOCKING_TX #if BLOCKING_TX
void maca_tx_callback(volatile packet_t *p __attribute((unused))) { void maca_tx_callback(volatile packet_t *p __attribute((unused))) {
tx_complete = 1; tx_complete = 1;
tx_status = p->status;
} }
#endif #endif