From f401c7cc607882082ef6219fe2bbf76ef9e9b034 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-os.org>
Date: Sun, 1 Nov 2015 20:48:53 +0000
Subject: [PATCH] Save new TX power setting even if the RFC is powered off.

The current logic attempts to send `CMD_SET_TX_POWER` before saving the new power setting. If `CMD_SET_TX_POWER` fails the power setting will not get saved. As a result, when the RFC is powered off, all attempts to change TX power will fail.

This commit changes this logic to always save the new TX setting as requested by the user. If the RFC is powered up, we apply it immediately. If it is powered down, the new setting will automatically be applied next time we send `CMD_RADIO_SETUP`.

Fixes #1340
---
 cpu/cc26xx-cc13xx/rf-core/ieee-mode.c | 39 ++++++++++++++++-----------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
index b5b5cf4c1..4cfeb3a3e 100644
--- a/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
+++ b/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
@@ -401,26 +401,33 @@ set_tx_power(radio_value_t power)
   int i;
   rfc_CMD_SET_TX_POWER_t cmd;
 
-  /* Send a CMD_SET_TX_POWER command to the RF */
-  memset(&cmd, 0x00, sizeof(cmd));
-
-  cmd.commandNo = CMD_SET_TX_POWER;
-
+  /* First, find the correct setting and save it */
   for(i = OUTPUT_CONFIG_COUNT - 1; i >= 0; --i) {
     if(power <= output_power[i].dbm) {
-      cmd.txPower.IB = output_power[i].register_ib;
-      cmd.txPower.GC = output_power[i].register_gc;
-      cmd.txPower.tempCoeff = output_power[i].temp_coeff;
-
-      if(rf_core_send_cmd((uint32_t)&cmd, &cmd_status) == RF_CORE_CMD_OK) {
-        /* Success: Remember the new setting */
-        tx_power_current = &output_power[i];
-      } else {
-        PRINTF("set_tx_power: CMDSTA=0x%08lx\n", cmd_status);
-      }
-      return;
+      tx_power_current = &output_power[i];
+      break;
     }
   }
+
+  /*
+   * If the core is not accessible, the new setting will be applied next
+   * time we send CMD_RADIO_SETUP, so we don't need to do anything further.
+   * If the core is accessible, we can apply the new setting immediately with
+   * CMD_SET_TX_POWER
+   */
+  if(rf_core_is_accessible() == RF_CORE_NOT_ACCESSIBLE) {
+    return;
+  }
+
+  memset(&cmd, 0x00, sizeof(cmd));
+  cmd.commandNo = CMD_SET_TX_POWER;
+  cmd.txPower.IB = output_power[i].register_ib;
+  cmd.txPower.GC = output_power[i].register_gc;
+  cmd.txPower.tempCoeff = output_power[i].temp_coeff;
+
+  if(rf_core_send_cmd((uint32_t)&cmd, &cmd_status) == RF_CORE_CMD_ERROR) {
+    PRINTF("set_tx_power: CMDSTA=0x%08lx\n", cmd_status);
+  }
 }
 /*---------------------------------------------------------------------------*/
 static uint8_t