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

Use ccaInfo.ccaState to decide whether CCA is complete

Browse source 
This commit changes the logic of `get_cca_info()` in the CC26xx IEEE mode driver. We now use the command's return status bits to determine whether the radio's CCA monitoring function has concluded, instead of drawing conclusions based on RSSI readings.
This commit is contained in:
George Oikonomou 2016-07-17 17:09:09 +01:00
parent c05665a16b
commit 2039b3a552
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
View file

@ -340,13 +340,12 @@ transmitting(void)
* It is the caller's responsibility to make sure the RF is on. This function * It is the caller's responsibility to make sure the RF is on. This function
* will return RF_GET_CCA_INFO_ERROR if the RF is off * will return RF_GET_CCA_INFO_ERROR if the RF is off
* *
* This function will in fact wait for a valid RSSI signal * This function will in fact wait for a valid CCA state
*/ */
static uint8_t static uint8_t
get_cca_info(void) get_cca_info(void)
{ {
uint32_t cmd_status; uint32_t cmd_status;
int8_t rssi;
rfc_CMD_IEEE_CCA_REQ_t cmd; rfc_CMD_IEEE_CCA_REQ_t cmd;
if(!rf_is_on()) { if(!rf_is_on()) {
@ -354,9 +353,10 @@ get_cca_info(void)
return RF_GET_CCA_INFO_ERROR; return RF_GET_CCA_INFO_ERROR;
} }
rssi = RF_CMD_CCA_REQ_RSSI_UNKNOWN; memset(&cmd, 0x00, sizeof(cmd));
cmd.ccaInfo.ccaState = RF_CMD_CCA_REQ_CCA_STATE_INVALID;
while(rssi == RF_CMD_CCA_REQ_RSSI_UNKNOWN || rssi == 0) { while(cmd.ccaInfo.ccaState == RF_CMD_CCA_REQ_CCA_STATE_INVALID) {
memset(&cmd, 0x00, sizeof(cmd)); memset(&cmd, 0x00, sizeof(cmd));
cmd.commandNo = CMD_IEEE_CCA_REQ; cmd.commandNo = CMD_IEEE_CCA_REQ;
@ -365,11 +365,9 @@ get_cca_info(void)
return RF_GET_CCA_INFO_ERROR; return RF_GET_CCA_INFO_ERROR;
} }
rssi = cmd.currentRssi;
} }
/* We have a valid RSSI signal. Return the CCA Info */ /* We have a valid CCA state. Return the CCA Info */
return *((uint8_t *)&cmd.ccaInfo); return *((uint8_t *)&cmd.ccaInfo);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/