Added individual configuration of front-end mode for each RF path

arch/cpu/simplelink-cc13xx-cc26xx/cc13xx-cc26xx-conf.h

@@ -133,16 +133,30 @@
 #define RF_MODE                      RF_CONF_MODE
 #endif /* RF_CONF_MODE */
 
-#ifdef RF_CONF_FRONT_END_MODE
+/* Sub-1 GHz path front-end mode configuration */
-#define RF_FRONT_END_MODE           RF_CONF_FRONT_END_MODE
+#ifdef RF_SUB_1_GHZ_CONF_FRONT_END_MODE
+#define RF_SUB_1_GHZ_FRONT_END_MODE     RF_SUB_1_GHZ_CONF_FRONT_END_MODE
 #else
-#define RF_FRONT_END_MODE           RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_SUB_1_GHZ_FRONT_END_MODE     RF_FRONT_END_MODE_DIFFERENTIAL
 #endif
 
-#ifdef RF_CONF_BIAS_MODE
+#ifdef RF_SUB_1_GHZ_CONF_BIAS_MODE
-#define RF_BIAS_MODE           RF_CONF_BIAS_MODE
+#define RF_SUB_1_GHZ_BIAS_MODE          RF_SUB_1_GHZ_CONF_BIAS_MODE
 #else
-#define RF_BIAS_MODE           RF_BIAS_MODE_INTERNAL
+#define RF_SUB_1_GHZ_BIAS_MODE          RF_BIAS_MODE_INTERNAL
+#endif
+
+/* 2.4 GHz path front-end mode configuration */
+#ifdef RF_2_4_GHZ_CONF_FRONT_END_MODE
+#define RF_2_4_GHZ_FRONT_END_MODE       RF_2_4_GHZ_CONF_FRONT_END_MODE
+#else
+#define RF_2_4_GHZ_FRONT_END_MODE       RF_FRONT_END_MODE_DIFFERENTIAL
+#endif
+
+#ifdef RF_2_4_GHZ_CONF_BIAS_MODE
+#define RF_2_4_GHZ_BIAS_MODE            RF_2_4_GHZ_CONF_BIAS_MODE
+#else
+#define RF_2_4_GHZ_BIAS_MODE            RF_BIAS_MODE_INTERNAL
 #endif
 
 /* Number of RX buffers. */

arch/cpu/simplelink-cc13xx-cc26xx/rf/ble-beacond.c

@@ -158,8 +158,8 @@ PROCESS(ble_beacond_process, "RF BLE Beacon Daemon Process");
 rf_ble_beacond_result_t
 rf_ble_beacond_init(void)
 {
-  ble_cmd_radio_setup.config.frontEndMode = RF_FRONT_END_MODE;
+  ble_cmd_radio_setup.config.frontEndMode = RF_2_4_GHZ_FRONT_END_MODE;
-  ble_cmd_radio_setup.config.biasMode = RF_BIAS_MODE;
+  ble_cmd_radio_setup.config.biasMode = RF_2_4_GHZ_BIAS_MODE;
 
   RF_Params rf_params;
   RF_Params_init(&rf_params);

arch/cpu/simplelink-cc13xx-cc26xx/rf/ieee-mode.c

@@ -217,8 +217,8 @@ rat_overflow_cb(void *arg)
 static void
 init_rf_params(void)
 {
-  cmd_radio_setup.config.frontEndMode = RF_FRONT_END_MODE;
+  cmd_radio_setup.config.frontEndMode = RF_2_4_GHZ_FRONT_END_MODE;
-  cmd_radio_setup.config.biasMode = RF_BIAS_MODE;
+  cmd_radio_setup.config.biasMode = RF_2_4_GHZ_BIAS_MODE;
 
   data_queue_t *rx_q = data_queue_init(sizeof(lensz_t));
 

arch/cpu/simplelink-cc13xx-cc26xx/rf/prop-mode.c

@@ -194,8 +194,8 @@ static int off(void);
 static void
 init_rf_params(void)
 {
-  cmd_radio_setup.config.frontEndMode = RF_FRONT_END_MODE;
+  cmd_radio_setup.config.frontEndMode = RF_SUB_1_GHZ_FRONT_END_MODE;
-  cmd_radio_setup.config.biasMode = RF_BIAS_MODE;
+  cmd_radio_setup.config.biasMode = RF_SUB_1_GHZ_BIAS_MODE;
   cmd_radio_setup.centerFreq = PROP_MODE_CENTER_FREQ;
   cmd_radio_setup.loDivider = PROP_MODE_LO_DIVIDER;
 

arch/cpu/simplelink-cc13xx-cc26xx/rf/sched.c

@@ -608,7 +608,7 @@ ble_sched_beacons(uint8_t bm_channel)
   initial_adv = init_ble_adv_array(ble_cmd_adv_nc_array, bm_channel);
 
   if(initial_adv == NULL) {
-    LOG_ERR("Initializing BLE Advertismenet chain failed\n");
+    LOG_ERR("Initializing BLE Advertisement chain failed\n");
     return RF_RESULT_ERROR;
   }
 

arch/platform/simplelink/cc13xx-cc26xx/contiki-conf.h

@@ -31,6 +31,10 @@
  * \addtogroup cc13xx-cc26xx-platform
  * @{
  *
+ * The order of which these header files are included is important in order
+ * for the configurations to be correctly set. This has to do with some
+ * slight unfortunate configuration dependencies of the board file.
+ *
  * \file
  *        Configuration for the SimpleLink CC13xx/CC26xx platform.
  * \author
@@ -40,18 +44,16 @@
 #ifndef CONTIKI_CONF_H_
 #define CONTIKI_CONF_H_
 /*---------------------------------------------------------------------------*/
-#include "board-conf.h"
+/* Include project-specific configurations */
-/*---------------------------------------------------------------------------*/
-/* Include Project Specific conf */
 #ifdef PROJECT_CONF_PATH
 #include PROJECT_CONF_PATH
 #endif
 /*---------------------------------------------------------------------------*/
-/* Include CPU-related configuration */
+/* Include board-specific configurations */
-#include "cc13xx-cc26xx-conf.h"
+#include "board-conf.h"
 /*---------------------------------------------------------------------------*/
-/* Must be included after cc13xx-cc26xx-conf.h */
+/* Include CPU-related configurations */
-#include <Board.h>
+#include "cc13xx-cc26xx-conf.h"
 /*---------------------------------------------------------------------------*/
 #endif /* CONTIKI_CONF_H_ */
 /*---------------------------------------------------------------------------*/

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1310/rf-conf.h

@@ -45,12 +45,17 @@
 #include "rf/rf.h"
 /*---------------------------------------------------------------------------*/
 /**
- * \name  Board-specific front-end configurations for the radio.
+ * \name  Board-specific front-end mode configurations for the Sub-1 GHz path
+ *        on the radio.
+ *
+ * These are the following front-end mode configurations for the
+ * CC1310-LAUNCHXL board:
+ *  - Sub-1 GHz: differential and external bias
  *
  * @{
  */
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_SUB_1_GHZ_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
+#define RF_SUB_1_GHZ_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
 /** @} */
 /*---------------------------------------------------------------------------*/
 #endif /* RF_CONF_H_ */

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/Board.h

@@ -33,18 +33,15 @@
 #ifndef __BOARD_H
 #define __BOARD_H
 
-#define Board_CC1312R1_LAUNCHXL
-#define BOARD_STRING    "TI CC1312R1 LaunchPad"
-
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "CC1312R1_LAUNCHXL.h"
 
+#define Board_CC1312R1_LAUNCHXL
+#define BOARD_STRING            "TI CC1312R1 LaunchPad"
+
 #define Board_initGeneral()      CC1312R1_LAUNCHXL_initGeneral()
 #define Board_shutDownExtFlash() CC1312R1_LAUNCHXL_shutDownExtFlash()
 #define Board_wakeUpExtFlash()   CC1312R1_LAUNCHXL_wakeUpExtFlash()

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1312r1/rf-conf.h

@@ -45,12 +45,17 @@
 #include "rf/rf.h"
 /*---------------------------------------------------------------------------*/
 /**
- * \name  Board-specific front-end configurations for the radio.
+ * \name  Board-specific front-end mode configurations for the Sub-1 GHz path
+ *        on the radio.
+ *
+ * These are the following front-end mode configurations for the
+ * CC1312R1-LAUNCHXL board:
+ *  - Sub-1 GHz: differential and external bias
  *
  * @{
  */
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_SUB_1_GHZ_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
+#define RF_SUB_1_GHZ_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
 /** @} */
 /*---------------------------------------------------------------------------*/
 #endif /* RF_CONF_H_ */

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/Board.h

@@ -33,18 +33,15 @@
 #ifndef __BOARD_H
 #define __BOARD_H
 
-#define Board_CC1350_LAUNCHXL_433
-#define BOARD_STRING    "TI CC1350-433 LaunchPad"
-
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "CC1350_LAUNCHXL_433.h"
 
+#define Board_CC1350_LAUNCHXL_433
+#define BOARD_STRING            "TI CC1350-433 LaunchPad"
+
 #define Board_initGeneral()      CC1350_LAUNCHXL_433_initGeneral()
 #define Board_shutDownExtFlash() CC1350_LAUNCHXL_433_shutDownExtFlash()
 #define Board_wakeUpExtFlash()   CC1350_LAUNCHXL_433_wakeUpExtFlash()

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350-4/rf-conf.h

@@ -45,12 +45,21 @@
 #include "rf/rf.h"
 /*---------------------------------------------------------------------------*/
 /**
- * \name  Board-specific front-end configurations for the radio.
+ * \name  Board-specific front-end mode configurations for both the Sub-1 GHz
+ *        path and the 2.4 GHz path on the radio.
+ *
+ * These are the following front-end mode configurations for the
+ * CC1350-4-LAUNCHXL board:
+ *  - Sub-1 GHz: differential and external bias
+ *  - 2.4 GHz: differential and external bias
  *
  * @{
  */
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_SUB_1_GHZ_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
+#define RF_SUB_1_GHZ_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
+
+#define RF_2_4_GHZ_CONF_FRONT_END_MODE    RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_2_4_GHZ_CONF_BIAS_MODE         RF_BIAS_MODE_EXTERNAL
 /** @} */
 /*---------------------------------------------------------------------------*/
 #endif /* RF_CONF_H_ */

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/Board.h

@@ -33,15 +33,15 @@
 #ifndef __BOARD_H
 #define __BOARD_H
 
-#define Board_CC1350_LAUNCHXL
-#define BOARD_STRING    "TI CC1350 LaunchPad"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "CC1350_LAUNCHXL.h"
 
+#define Board_CC1350_LAUNCHXL
+#define BOARD_STRING            "TI CC1350 LaunchPad"
+
 #define Board_initGeneral()      CC1350_LAUNCHXL_initGeneral()
 #define Board_shutDownExtFlash() CC1350_LAUNCHXL_shutDownExtFlash()
 #define Board_wakeUpExtFlash()   CC1350_LAUNCHXL_wakeUpExtFlash()

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1350/rf-conf.h

@@ -45,12 +45,21 @@
 #include "rf/rf.h"
 /*---------------------------------------------------------------------------*/
 /**
- * \name  Board-specific front-end configurations for the radio.
+ * \name  Board-specific front-end mode configurations for both the Sub-1 GHz
+ *        path and the 2.4 GHz path on the radio.
+ *
+ * These are the following front-end mode configurations for the
+ * CC1350-LAUNCHXL board:
+ *  - Sub-1 GHz: differential and external bias
+ *  - 2.4 GHz: differential and external bias
  *
  * @{
  */
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_SUB_1_GHZ_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
+#define RF_SUB_1_GHZ_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
+
+#define RF_2_4_GHZ_CONF_FRONT_END_MODE    RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_2_4_GHZ_CONF_BIAS_MODE         RF_BIAS_MODE_EXTERNAL
 /** @} */
 /*---------------------------------------------------------------------------*/
 #endif /* RF_CONF_H_ */

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/Board.h

@@ -33,18 +33,15 @@
 #ifndef __BOARD_H
 #define __BOARD_H
 
-#define Board_CC1352P_2_LAUNCHXL
-#define BOARD_STRING    "TI CC1352P-2 LaunchPad"
-
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "CC1352P_2_LAUNCHXL.h"
 
+#define Board_CC1352P_2_LAUNCHXL
+#define BOARD_STRING            "TI CC1352P-2 LaunchPad"
+
 #define Board_initGeneral()      CC1352P_2_LAUNCHXL_initGeneral()
 #define Board_shutDownExtFlash() CC1352P_2_LAUNCHXL_shutDownExtFlash()
 #define Board_wakeUpExtFlash()   CC1352P_2_LAUNCHXL_wakeUpExtFlash()

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-2/rf-conf.h

@@ -45,12 +45,21 @@
 #include "rf/rf.h"
 /*---------------------------------------------------------------------------*/
 /**
- * \name  Board-specific front-end configurations for the radio.
+ * \name  Board-specific front-end mode configurations for both the Sub-1 GHz
+ *        path and the 2.4 GHz path on the radio.
+ *
+ * These are the following front-end mode configurations for the
+ * CC1352P-2-LAUNCHXL board:
+ *  - Sub-1 GHz: differential and external bias
+ *  - 2.4 GHz: differential and external bias
  *
  * @{
  */
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_SUB_1_GHZ_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
+#define RF_SUB_1_GHZ_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
+
+#define RF_2_4_GHZ_CONF_FRONT_END_MODE    RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_2_4_GHZ_CONF_BIAS_MODE         RF_BIAS_MODE_EXTERNAL
 /** @} */
 /*---------------------------------------------------------------------------*/
 #endif /* RF_CONF_H_ */

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/Board.h

@@ -33,18 +33,15 @@
 #ifndef __BOARD_H
 #define __BOARD_H
 
-#define Board_CC1352P_4_LAUNCHXL
-#define BOARD_STRING    "TI CC1352P-4 LaunchPad"
-
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "CC1352P_4_LAUNCHXL.h"
 
+#define Board_CC1352P_4_LAUNCHXL
+#define BOARD_STRING            "TI CC1352P-4 LaunchPad"
+
 #define Board_initGeneral()      CC1352P_4_LAUNCHXL_initGeneral()
 #define Board_shutDownExtFlash() CC1352P_4_LAUNCHXL_shutDownExtFlash()
 #define Board_wakeUpExtFlash()   CC1352P_4_LAUNCHXL_wakeUpExtFlash()

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p-4/rf-conf.h

@@ -45,12 +45,21 @@
 #include "rf/rf.h"
 /*---------------------------------------------------------------------------*/
 /**
- * \name  Board-specific front-end configurations for the radio.
+ * \name  Board-specific front-end mode configurations for both the Sub-1 GHz
+ *        path and the 2.4 GHz path on the radio.
+ *
+ * These are the following front-end mode configurations for the
+ * CC1352P-4-LAUNCHXL board:
+ *  - Sub-1 GHz: differential and external bias
+ *  - 2.4 GHz: differential and external bias
  *
  * @{
  */
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_SUB_1_GHZ_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
+#define RF_SUB_1_GHZ_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
+
+#define RF_2_4_GHZ_CONF_FRONT_END_MODE    RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_2_4_GHZ_CONF_BIAS_MODE         RF_BIAS_MODE_EXTERNAL
 /** @} */
 /*---------------------------------------------------------------------------*/
 #endif /* RF_CONF_H_ */

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/Board.h

@@ -33,18 +33,15 @@
 #ifndef __BOARD_H
 #define __BOARD_H
 
-#define Board_CC1352P1_LAUNCHXL
-#define BOARD_STRING    "TI CC1352P1 LaunchPad"
-
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "CC1352P1_LAUNCHXL.h"
 
+#define Board_CC1352P1_LAUNCHXL
+#define BOARD_STRING            "TI CC1352P1 LaunchPad"
+
 #define Board_initGeneral()      CC1352P1_LAUNCHXL_initGeneral()
 #define Board_shutDownExtFlash() CC1352P1_LAUNCHXL_shutDownExtFlash()
 #define Board_wakeUpExtFlash()   CC1352P1_LAUNCHXL_wakeUpExtFlash()

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352p1/rf-conf.h

@@ -45,12 +45,21 @@
 #include "rf/rf.h"
 /*---------------------------------------------------------------------------*/
 /**
- * \name  Board-specific front-end configurations for the radio.
+ * \name  Board-specific front-end mode configurations for both the Sub-1 GHz
+ *        path and the 2.4 GHz path on the radio.
+ *
+ * These are the following front-end mode configurations for the
+ * CC1352P1-LAUNCHXL board:
+ *  - Sub-1 GHz: differential and external bias
+ *  - 2.4 GHz: differential and external bias
  *
  * @{
  */
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_SUB_1_GHZ_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
+#define RF_SUB_1_GHZ_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
+
+#define RF_2_4_GHZ_CONF_FRONT_END_MODE    RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_2_4_GHZ_CONF_BIAS_MODE         RF_BIAS_MODE_EXTERNAL
 /** @} */
 /*---------------------------------------------------------------------------*/
 #endif /* RF_CONF_H_ */

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/Board.h

@@ -33,18 +33,15 @@
 #ifndef __BOARD_H
 #define __BOARD_H
 
-#define Board_CC1352R1_LAUNCHXL
-#define BOARD_STRING    "TI CC1352R1 LaunchPad"
-
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "CC1352R1_LAUNCHXL.h"
 
+#define Board_CC1352R1_LAUNCHXL
+#define BOARD_STRING            "TI CC1352R1 LaunchPad"
+
 #define Board_initGeneral()      CC1352R1_LAUNCHXL_initGeneral()
 #define Board_shutDownExtFlash() CC1352R1_LAUNCHXL_shutDownExtFlash()
 #define Board_wakeUpExtFlash()   CC1352R1_LAUNCHXL_wakeUpExtFlash()

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/CC1352R1_LAUNCHXL.c

@@ -36,8 +36,6 @@
  *  CC1352R1_LAUNCHXL board.
  */
 
-#include "contiki.h"
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc1352r1/rf-conf.h

@@ -45,12 +45,21 @@
 #include "rf/rf.h"
 /*---------------------------------------------------------------------------*/
 /**
- * \name  Board-specific front-end configurations for the radio.
+ * \name  Board-specific front-end mode configurations for both the Sub-1 GHz
+ *        path and the 2.4 GHz path on the radio.
+ *
+ * These are the following front-end mode configurations for the
+ * CC1352R1-LAUNCHXL board:
+ *  - Sub-1 GHz: differential and external bias
+ *  - 2.4 GHz: differential and external bias
  *
  * @{
  */
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_SUB_1_GHZ_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
+#define RF_SUB_1_GHZ_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
+
+#define RF_2_4_GHZ_CONF_FRONT_END_MODE    RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_2_4_GHZ_CONF_BIAS_MODE         RF_BIAS_MODE_EXTERNAL
 /** @} */
 /*---------------------------------------------------------------------------*/
 #endif /* RF_CONF_H_ */

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/Board.h

@@ -33,15 +33,15 @@
 #ifndef __BOARD_H
 #define __BOARD_H
 
-#define Board_CC2650_LAUNCHXL
-#define BOARD_STRING    "TI CC2650 LaunchPad"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "CC2650_LAUNCHXL.h"
 
+#define Board_CC2650_LAUNCHXL
+#define BOARD_STRING            "TI CC2650 LaunchPad"
+
 #define Board_initGeneral()      CC2650_LAUNCHXL_initGeneral()
 #define Board_shutDownExtFlash() CC2650_LAUNCHXL_shutDownExtFlash()
 #define Board_wakeUpExtFlash()   CC2650_LAUNCHXL_wakeUpExtFlash()

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc2650/rf-conf.h

@@ -45,12 +45,17 @@
 #include "rf/rf.h"
 /*---------------------------------------------------------------------------*/
 /**
- * \name  Board-specific front-end configurations for the radio.
+ * \name  Board-specific front-end mode configurations for the 2.4 GHz path
+ *        on the radio.
+ *
+ * These are the following front-end mode configurations for the
+ * CC2650-LAUNCHXL board:
+ *  - 2.4 GHz: differential and internal bias
  *
  * @{
  */
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_2_4_GHZ_CONF_FRONT_END_MODE    RF_FRONT_END_MODE_DIFFERENTIAL
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_INTERNAL
+#define RF_2_4_GHZ_CONF_BIAS_MODE         RF_BIAS_MODE_INTERNAL
 /** @} */
 /*---------------------------------------------------------------------------*/
 #endif /* RF_CONF_H_ */

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/Board.h

@@ -33,19 +33,17 @@
 #ifndef __BOARD_H
 #define __BOARD_H
 
-#define Board_CC26X2R1_LAUNCHXL
-#define BOARD_STRING    "TI CC26x2R1 LaunchPad"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "CC26X2R1_LAUNCHXL.h"
 
+#define Board_CC26X2R1_LAUNCHXL
+#define BOARD_STRING            "TI CC26x2R1 LaunchPad"
+
 #define Board_initGeneral()      CC26X2R1_LAUNCHXL_initGeneral()
-
 #define Board_shutDownExtFlash() CC26X2R1_LAUNCHXL_shutDownExtFlash()
-
 #define Board_wakeUpExtFlash()   CC26X2R1_LAUNCHXL_wakeUpExtFlash()
 
 /* These #defines allow us to reuse TI-RTOS across other device families */

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/CC26X2R1_LAUNCHXL.c

@@ -35,7 +35,6 @@
  *  This file is responsible for setting up the board specific items for the
  *  CC26X2R1_LAUNCHXL board.
  */
-#include "contiki.h"
 
 #include <stdbool.h>
 #include <stddef.h>

arch/platform/simplelink/cc13xx-cc26xx/launchpad/cc26x2r1/rf-conf.h

@@ -45,12 +45,17 @@
 #include "rf/rf.h"
 /*---------------------------------------------------------------------------*/
 /**
- * \name  Board-specific front-end configurations for the radio.
+ * \name  Board-specific front-end mode configurations for the 2.4 GHz path
+ *        on the radio.
+ *
+ * These are the following front-end mode configurations for the
+ * CC26X2R1-LAUNCHXL board:
+ *  - 2.4 GHz: differential and internal bias
  *
  * @{
  */
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_2_4_GHZ_CONF_FRONT_END_MODE    RF_FRONT_END_MODE_DIFFERENTIAL
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_INTERNAL
+#define RF_2_4_GHZ_CONF_BIAS_MODE         RF_BIAS_MODE_INTERNAL
 /** @} */
 /*---------------------------------------------------------------------------*/
 #endif /* RF_CONF_H_ */

arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc1350/Board.h

@@ -33,15 +33,15 @@
 #ifndef __BOARD_H
 #define __BOARD_H
 
-#define Board_CC1350STK
-#define BOARD_STRING    "TI CC1350 SensorTag"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "CC1350STK.h"
 
+#define Board_CC1350STK
+#define BOARD_STRING            "TI CC1350 SensorTag"
+
 #define Board_initGeneral()      CC1350STK_initGeneral()
 #define Board_shutDownExtFlash() CC1350STK_shutDownExtFlash()
 #define Board_wakeUpExtFlash()   CC1350STK_wakeUpExtFlash()

arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc1350/rf-conf.h

@@ -45,12 +45,21 @@
 #include "rf/rf.h"
 /*---------------------------------------------------------------------------*/
 /**
- * \name  Board-specific front-end configurations for the radio.
+ * \name  Board-specific front-end mode configurations for both the Sub-1 GHz
+ *        path and the 2.4 GHz path on the radio.
+ *
+ * These are the following front-end mode configurations for the
+ * CC1350STK board:
+ *  - Sub-1 GHz: single-ended RFN and external bias
+ *  - 2.4 GHz: single-ended RFP and external bias
  *
  * @{
  */
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_SINGLE_ENDED_RFP
+#define RF_SUB_1_GHZ_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_SINGLE_ENDED_RFN
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
+#define RF_SUB_1_GHZ_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
+
+#define RF_2_4_GHZ_CONF_FRONT_END_MODE    RF_FRONT_END_MODE_SINGLE_ENDED_RFP
+#define RF_2_4_GHZ_CONF_BIAS_MODE         RF_BIAS_MODE_EXTERNAL
 /** @} */
 /*---------------------------------------------------------------------------*/
 #endif /* RF_CONF_H_ */

arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc2650/Board.h

@@ -33,15 +33,15 @@
 #ifndef __BOARD_H
 #define __BOARD_H
 
-#define Board_CC2650STK
-#define BOARD_STRING    "TI CC2650 SensorTag"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "CC2650STK.h"
 
+#define Board_CC2650STK
+#define BOARD_STRING            "TI CC2650 SensorTag"
+
 #define Board_initGeneral()      CC2650STK_initGeneral()
 #define Board_shutDownExtFlash() CC2650STK_shutDownExtFlash()
 #define Board_wakeUpExtFlash()   CC2650STK_wakeUpExtFlash()

arch/platform/simplelink/cc13xx-cc26xx/sensortag/cc2650/rf-conf.h

@@ -45,12 +45,17 @@
 #include "rf/rf.h"
 /*---------------------------------------------------------------------------*/
 /**
- * \name  Board-specific front-end configurations for the radio.
+ * \name  Board-specific front-end mode configurations for the 2.4 GHz path
+ *        on the radio.
+ *
+ * These are the following front-end mode configurations for the
+ * CC2650STK board:
+ *  - 2.4 GHz: differential and internal bias
  *
  * @{
  */
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_2_4_GHZ_CONF_FRONT_END_MODE    RF_FRONT_END_MODE_DIFFERENTIAL
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_INTERNAL
+#define RF_2_4_GHZ_CONF_BIAS_MODE         RF_BIAS_MODE_INTERNAL
 /** @} */
 /*---------------------------------------------------------------------------*/
 #endif /* RF_CONF_H_ */

arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/Board.h

@@ -33,15 +33,15 @@
 #ifndef __BOARD_H
 #define __BOARD_H
 
-#define Board_CC1350DK_7XD
-#define BOARD_STRING    "TI SmartRF06EB + CC13x0 EM"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "CC1350DK_7XD.h"
 
+#define Board_CC1350DK_7XD
+#define BOARD_STRING            "TI SmartRF06EB + CC13x0 EM"
+
 #define Board_initGeneral()      CC1350DK_7XD_initGeneral()
 #define Board_shutDownExtFlash() CC1350DK_7XD_shutDownExtFlash()
 #define Board_wakeUpExtFlash()   CC1350DK_7XD_wakeUpExtFlash()

arch/platform/simplelink/cc13xx-cc26xx/srf06/cc13x0/rf-conf.h

@@ -45,12 +45,21 @@
 #include "rf/rf.h"
 /*---------------------------------------------------------------------------*/
 /**
- * \name  Board-specific front-end configurations for the radio.
+ * \name  Board-specific front-end mode configurations for both the Sub-1 GHz
+ *        path and the 2.4 GHz path on the radio.
+ *
+ * These are the following front-end mode configurations for the
+ * CC1350DK-7XD board:
+ *  - Sub-1 GHz: differential and external bias
+ *  - 2.4 GHz: differential and external bias
  *
  * @{
  */
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_SUB_1_GHZ_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_INTERNAL
+#define RF_SUB_1_GHZ_CONF_BIAS_MODE       RF_BIAS_MODE_EXTERNAL
+
+#define RF_2_4_GHZ_CONF_FRONT_END_MODE    RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_2_4_GHZ_CONF_BIAS_MODE         RF_BIAS_MODE_EXTERNAL
 /** @} */
 /*---------------------------------------------------------------------------*/
 #endif /* RF_CONF_H_ */

arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/Board.h

@@ -33,15 +33,15 @@
 #ifndef __BOARD_H
 #define __BOARD_H
 
-#define Board_CC2650DK_7ID
-#define BOARD_STRING    "TI SmartRF06EB + CC26x0 EM"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #include "CC2650DK_7ID.h"
 
+#define Board_CC2650DK_7ID
+#define BOARD_STRING            "TI SmartRF06EB + CC26x0 EM"
+
 #define Board_initGeneral()      CC2650DK_7ID_initGeneral()
 #define Board_shutDownExtFlash() CC2650DK_7ID_shutDownExtFlash()
 #define Board_wakeUpExtFlash()   CC2650DK_7ID_wakeUpExtFlash()

arch/platform/simplelink/cc13xx-cc26xx/srf06/cc26x0/rf-conf.h

@@ -45,12 +45,17 @@
 #include "rf/rf.h"
 /*---------------------------------------------------------------------------*/
 /**
- * \name  Board-specific front-end configurations for the radio.
+ * \name  Board-specific front-end mode configurations for the 2.4 GHz path
+ *        on the radio.
+ *
+ * These are the following front-end mode configurations for the
+ * CC2650DK-7ID board:
+ *  - 2.4 GHz: differential and internal bias
  *
  * @{
  */
-#define RF_CONF_FRONT_END_MODE  RF_FRONT_END_MODE_DIFFERENTIAL
+#define RF_2_4_GHZ_CONF_FRONT_END_MODE    RF_FRONT_END_MODE_DIFFERENTIAL
-#define RF_CONF_BIAS_MODE       RF_BIAS_MODE_INTERNAL
+#define RF_2_4_GHZ_CONF_BIAS_MODE         RF_BIAS_MODE_INTERNAL
 /** @} */
 /*---------------------------------------------------------------------------*/
 #endif /* RF_CONF_H_ */