From 5d5544151f3a7bf993c0692778a1583ec918f78c Mon Sep 17 00:00:00 2001
From: Phil Rhinehart <phil@jaloo.us>
Date: Mon, 18 Apr 2016 16:36:33 +0800
Subject: [PATCH] Fixed bug in cc26xx-cc13xx rf-core. When running BLE in
 conjunction with ContikiMAC, oscillators were modified from an interrupt
 state causing occasional bus faults and infinite loops. We now check if BLE
 is active prior to modifiying the oscillators to avoid these conditions.

---
 cpu/cc26xx-cc13xx/rf-core/ieee-mode.c | 12 ++++++------
 cpu/cc26xx-cc13xx/rf-core/prop-mode.c | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
index fc0ef7cbb..f26d57939 100644
--- a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
+++ b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
@@ -1048,12 +1048,6 @@ pending_packet(void)
 static int
 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
    * from within an interrupt context. Abort, but pretend everything is OK.
@@ -1063,6 +1057,12 @@ on(void)
     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()) {
     PRINTF("on: We were on. PD=%u, RX=0x%04x \n", rf_core_is_accessible(),
            RF_RADIO_OP_GET_STATUS(cmd_ieee_rx_buf));
diff --git a/cpu/cc26xx-cc13xx/rf-core/prop-mode.c b/cpu/cc26xx-cc13xx/rf-core/prop-mode.c
index 7515d79b4..419a7b9d2 100644
--- a/cpu/cc26xx-cc13xx/rf-core/prop-mode.c
+++ b/cpu/cc26xx-cc13xx/rf-core/prop-mode.c
@@ -893,12 +893,6 @@ pending_packet(void)
 static int
 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
    * from within an interrupt context. Abort, but pretend everything is OK.
@@ -907,6 +901,12 @@ on(void)
     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()) {
     PRINTF("on: We were on. PD=%u, RX=0x%04x \n", rf_core_is_accessible(),
            smartrf_settings_cmd_prop_rx_adv.status);