riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15636 from jia200x/pr/nrf802154/fix_rssi

Browse Source 
radio/nrf802154: fix set_cca_threshold range
This commit is contained in:
Marian Buschsieweke 2021-01-14 15:28:29 +01:00 committed by GitHub
commit 253a634b85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cpu/nrf52/radio/nrf802154/nrf802154_radio.c
View File

@ -279,15 +279,6 @@ static int _request_cca(ieee802154_dev_t *dev)
return 0; return 0;
} }
/**
* @brief Set CCA threshold value in internal represetion
*/
static void _set_cca_thresh(uint8_t thresh)
{
NRF_RADIO->CCACTRL &= ~RADIO_CCACTRL_CCAEDTHRES_Msk;
NRF_RADIO->CCACTRL |= thresh << RADIO_CCACTRL_CCAEDTHRES_Pos;
}
/** /**
* @brief Convert from dBm to the internal representation, when the * @brief Convert from dBm to the internal representation, when the
* radio operates as a IEEE802.15.4 transceiver. * radio operates as a IEEE802.15.4 transceiver.
@ -300,7 +291,15 @@ static inline uint8_t _dbm_to_ieee802154_hwval(int8_t dbm)
static int set_cca_threshold(ieee802154_dev_t *dev, int8_t threshold) static int set_cca_threshold(ieee802154_dev_t *dev, int8_t threshold)
{ {
(void) dev; (void) dev;
_set_cca_thresh(_dbm_to_ieee802154_hwval(threshold));
if (threshold < ED_RSSIOFFS) {
return -EINVAL;
}
uint8_t hw_val = _dbm_to_ieee802154_hwval(threshold);
NRF_RADIO->CCACTRL &= ~RADIO_CCACTRL_CCAEDTHRES_Msk;
NRF_RADIO->CCACTRL |= hw_val << RADIO_CCACTRL_CCAEDTHRES_Pos;
return 0; return 0;
} }