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

Merge pull request #1602 from philrhinehart/bugfix-cc26xx-rf-oscillators

Browse source 
cc26xx-cc13xx oscillator control issue
This commit is contained in:
George Oikonomou 2016-04-18 12:00:44 +01:00
commit cd6d76230d
2 changed files with 12 additions and 12 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

@ -1048,12 +1048,6 @@ pending_packet(void)
static int static int
on(void) on(void)
{ {
/*
* Request the HF XOSC as the source for the HF clock. Needed before we can
* use the FS. This will only request, it will _not_ perform the switch.
*/
oscillators_request_hf_xosc();
/* /*
* If we are in the middle of a BLE operation, we got called by ContikiMAC * If we are in the middle of a BLE operation, we got called by ContikiMAC
* from within an interrupt context. Abort, but pretend everything is OK. * from within an interrupt context. Abort, but pretend everything is OK.
@ -1063,6 +1057,12 @@ on(void)
return RF_CORE_CMD_OK; return RF_CORE_CMD_OK;
} }
/*
* Request the HF XOSC as the source for the HF clock. Needed before we can
* use the FS. This will only request, it will _not_ perform the switch.
*/
oscillators_request_hf_xosc();
if(rf_is_on()) { if(rf_is_on()) {
PRINTF("on: We were on. PD=%u, RX=0x%04x \n", rf_core_is_accessible(), PRINTF("on: We were on. PD=%u, RX=0x%04x \n", rf_core_is_accessible(),
RF_RADIO_OP_GET_STATUS(cmd_ieee_rx_buf)); RF_RADIO_OP_GET_STATUS(cmd_ieee_rx_buf));

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

@ -893,12 +893,6 @@ pending_packet(void)
static int static int
on(void) on(void)
{ {
/*
* Request the HF XOSC as the source for the HF clock. Needed before we can
* use the FS. This will only request, it will _not_ perform the switch.
*/
oscillators_request_hf_xosc();
/* /*
* If we are in the middle of a BLE operation, we got called by ContikiMAC * If we are in the middle of a BLE operation, we got called by ContikiMAC
* from within an interrupt context. Abort, but pretend everything is OK. * from within an interrupt context. Abort, but pretend everything is OK.
@ -907,6 +901,12 @@ on(void)
return RF_CORE_CMD_OK; return RF_CORE_CMD_OK;
} }
/*
* Request the HF XOSC as the source for the HF clock. Needed before we can
* use the FS. This will only request, it will _not_ perform the switch.
*/
oscillators_request_hf_xosc();
if(rf_is_on()) { if(rf_is_on()) {
PRINTF("on: We were on. PD=%u, RX=0x%04x \n", rf_core_is_accessible(), PRINTF("on: We were on. PD=%u, RX=0x%04x \n", rf_core_is_accessible(),
smartrf_settings_cmd_prop_rx_adv.status); smartrf_settings_cmd_prop_rx_adv.status);