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

switched to new radio return values

Browse source
This commit is contained in:
nvt-se 2009-11-13 12:38:14 +00:00
parent 0034fd7bca
commit 7a9e9c72a1
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
platform/msb430/dev/cc1020.c
View file

@ -244,16 +244,16 @@ cc1020_send(const void *buf, unsigned short len)
while(cc1020_state & CC1020_RX_RECEIVING) { while(cc1020_state & CC1020_RX_RECEIVING) {
if(RTIMER_CLOCK_LT(timeout_time, RTIMER_NOW())) { if(RTIMER_CLOCK_LT(timeout_time, RTIMER_NOW())) {
PRINTF("cc1020: transmission blocked by reception in progress\n"); PRINTF("cc1020: transmission blocked by reception in progress\n");
return -3; return RADIO_TX_ERR;
} }
} }
if(cc1020_state == CC1020_OFF) { if(cc1020_state == CC1020_OFF) {
return -2; return RADIO_TX_ERR;
} }
if(len > CC1020_BUFFERSIZE) { if(len > CC1020_BUFFERSIZE) {
return -1; return RADIO_TX_ERR;
} }
/* The preamble and the sync word are already in buffer. */ /* The preamble and the sync word are already in buffer. */
@ -291,7 +291,7 @@ cc1020_send(const void *buf, unsigned short len)
} }
if(try == CC1020_CONF_CCA_TIMEOUT) { if(try == CC1020_CONF_CCA_TIMEOUT) {
PRINTF("cc1020: CCA failed (RSSI %d)\n", cc1020_get_rssi()); PRINTF("cc1020: CCA failed (RSSI %d)\n", cc1020_get_rssi());
return -3; return RADIO_TX_ERR;
} }
/* Then wait for a short pseudo-random time before sending. */ /* Then wait for a short pseudo-random time before sending. */
@ -317,7 +317,7 @@ cc1020_send(const void *buf, unsigned short len)
cc1020_set_rx(); cc1020_set_rx();
} }
return len; return RADIO_TX_OK;
} }
int int