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

Autoenable RX after TX + removed exception check

Browse source
This commit is contained in:
Niclas Finne 2011-10-07 15:29:43 +02:00
parent f4f35973d1
commit 8e59df78e2
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/dev/cc2520.c
View file

@ -321,7 +321,8 @@ cc2520_init(void)
/* Disable filter on @ (remove if you want to address specific wismote) */ /* Disable filter on @ (remove if you want to address specific wismote) */
setreg(CC2520_FRMFILT0, 0x00); setreg(CC2520_FRMFILT0, 0x00);
#endif /* CC2520_CONF_AUTOACK */ #endif /* CC2520_CONF_AUTOACK */
/* SET_RXENMASK_ON_TX */
setreg(CC2520_FRMCTRL1, 1);
/* Set FIFOP threshold to maximum .*/ /* Set FIFOP threshold to maximum .*/
setreg(CC2520_FIFOPCTRL, FIFOP_THR(0x7F)); setreg(CC2520_FIFOPCTRL, FIFOP_THR(0x7F));
@ -338,7 +339,6 @@ static int
cc2520_transmit(unsigned short payload_len) cc2520_transmit(unsigned short payload_len)
{ {
int i, txpower; int i, txpower;
uint8_t reg;
GET_LOCK(); GET_LOCK();
@ -415,14 +415,9 @@ cc2520_transmit(unsigned short payload_len)
set_txpower(txpower & 0xff); set_txpower(txpower & 0xff);
} }
reg = getreg(CC2520_EXCFLAG0);
RELEASE_LOCK(); RELEASE_LOCK();
if (reg & TX_FRM_DONE) { return RADIO_TX_OK;
return RADIO_TX_OK;
} else {
return RADIO_TX_COLLISION;
}
} }
} }