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

Simplify MODESEL value determination

Browse source
This commit is contained in:
George Oikonomou 2016-06-26 01:02:10 +01:00
parent 9839b91be5
commit dc1f9fe010
1 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
cpu/cc26xx-cc13xx/rf-core/rf-core.c
View file

@ -371,26 +371,17 @@ uint8_t
rf_core_set_modesel() rf_core_set_modesel()
{ {
uint8_t rv = RF_CORE_CMD_ERROR; uint8_t rv = RF_CORE_CMD_ERROR;
ChipType_t chip_type = ti_lib_chipinfo_get_chip_type();
if(ti_lib_chipinfo_chip_family_is_cc26xx()) { if(chip_type == CHIP_TYPE_CC2650) {
if(ti_lib_chipinfo_supports_ble() == true && HWREG(PRCM_BASE + PRCM_O_RFCMODESEL) = PRCM_RFCMODESEL_CURR_MODE5;
ti_lib_chipinfo_supports_ieee_802_15_4() == true) { rv = RF_CORE_CMD_OK;
/* CC2650 */ } else if(chip_type == CHIP_TYPE_CC2630) {
HWREG(PRCM_BASE + PRCM_O_RFCMODESEL) = PRCM_RFCMODESEL_CURR_MODE5; HWREG(PRCM_BASE + PRCM_O_RFCMODESEL) = PRCM_RFCMODESEL_CURR_MODE2;
rv = RF_CORE_CMD_OK; rv = RF_CORE_CMD_OK;
} else if(ti_lib_chipinfo_supports_ble() == false && } else if(chip_type == CHIP_TYPE_CC1310) {
ti_lib_chipinfo_supports_ieee_802_15_4() == true) { HWREG(PRCM_BASE + PRCM_O_RFCMODESEL) = PRCM_RFCMODESEL_CURR_MODE3;
/* CC2630 */ rv = RF_CORE_CMD_OK;
HWREG(PRCM_BASE + PRCM_O_RFCMODESEL) = PRCM_RFCMODESEL_CURR_MODE2;
rv = RF_CORE_CMD_OK;
}
} else if(ti_lib_chipinfo_chip_family_is_cc13xx()) {
if(ti_lib_chipinfo_supports_ble() == false &&
ti_lib_chipinfo_supports_ieee_802_15_4() == false) {
/* CC1310 */
HWREG(PRCM_BASE + PRCM_O_RFCMODESEL) = PRCM_RFCMODESEL_CURR_MODE3;
rv = RF_CORE_CMD_OK;
}
} }
return rv; return rv;