Merge pull request #1074 from g-oikonomou/cc26xx/contrib/new-cc26xxware

Update to latest CC26xxware and add it as a submodule

Author: alignan

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "tools/cc2538-bsl"]
 	path = tools/cc2538-bsl
 	url = https://github.com/JelmerT/cc2538-bsl.git
+[submodule "cpu/cc26xx/lib/cc26xxware"]
+	path = cpu/cc26xx/lib/cc26xxware
+	url = https://github.com/g-oikonomou/cc26xxware.git

.travis.yml

@@ -49,13 +49,6 @@ before_script:
       arm-none-eabi-gcc --version ;
     fi
 
-  ## Download and extract cc26xxware
-  - if [ ${BUILD_ARCH:-0} = arm-aapcs ] ; then
-      wget http://www.ti.com/lit/sw/swrc296/swrc296.zip &&
-      unzip swrc296.zip &&
-      export TI_CC26XXWARE=cc26xxware_2_20_06_14829 ;
-    fi
-
   ## Install RL78 GCC toolchain
   - sudo apt-get install libncurses5:i386 zlib1g:i386
   - $WGET http://adamdunkels.github.io/contiki-fork/gnurl78-v13.02-elf_1-2_i386.deb &&

cpu/cc26xx/Makefile.cc26xx

@@ -8,33 +8,24 @@ NM      = arm-none-eabi-nm
 SIZE    = arm-none-eabi-size
 SREC_CAT = srec_cat
 
-### TI CC26xxware out-of-tree
-### TI_CC26XXWARE is the home directory of the cc26xxware
-### It MUST be provided as a path relative to $(CONTIKI)
-### For example, if
-### CONTIKI = /home/user/contiki
-### and TI_CC26XXWARE is stored in
-### /home/user/cc26xxware
-### then set
-### TI_CC26XXWARE = ../cc26xxware
-ifndef TI_CC26XXWARE
-  $(error TI_CC26XXWARE not defined. Please see the README)
-endif
+CPU_ABS_PATH       = cpu/cc26xx
+TI_CC26XXWARE_PATH = lib/cc26xxware
+TI_CC26XXWARE = $(CONTIKI_CPU)/$(TI_CC26XXWARE_PATH)
 
-### cc26xxware sources will be added to the MODULES list
-TI_CC26XXWARE_SRC = $(TI_CC26XXWARE)/driverlib
+### cc26xxware sources under driverlib will be added to the MODULES list
+TI_CC26XXWARE_SRC = $(CPU_ABS_PATH)/$(TI_CC26XXWARE_PATH)/driverlib
 
 ### The directory with startup sources will be added to the CONTIKI_CPU_DIRS
 ### and the sources therein are added to the sources list explicitly. They are
 ### also listed explicitly in the linker command (through TARGET_STARTFILES),
 ### to make sure they always get linked in the image
-TI_CC26XXWARE_STARTUP = ../../$(TI_CC26XXWARE)/startup_files
+TI_CC26XXWARE_STARTUP_DIR = $(TI_CC26XXWARE_PATH)/startup_files
 TI_CC26XXWARE_STARTUP_SRCS = ccfg.c startup_gcc.c
 
-### MODULES will add some of these to the include pach, but we need to add
+### MODULES will add some of these to the include path, but we need to add
 ### them earlier to prevent filename clashes with Contiki core files
-CFLAGS += -I$(CONTIKI)/$(TI_CC26XXWARE) -I$(CONTIKI)/$(TI_CC26XXWARE_SRC) 
-CFLAGS += -I$(CONTIKI)/$(TI_CC26XXWARE)/inc
+CFLAGS += -I$(TI_CC26XXWARE) -I$(CONTIKI)/$(TI_CC26XXWARE_SRC)
+CFLAGS += -I$(TI_CC26XXWARE)/inc
 MODULES += $(TI_CC26XXWARE_SRC)
 
 LDSCRIPT = $(CONTIKI_CPU)/cc26xx.ld
@@ -71,7 +62,7 @@ endif
 CLEAN += symbols.c symbols.h *.d *.elf *.hex
 
 ### CPU-dependent directories
-CONTIKI_CPU_DIRS = . dev dev/rfc-api $(TI_CC26XXWARE_STARTUP)
+CONTIKI_CPU_DIRS = . dev dev/rfc-api $(TI_CC26XXWARE_STARTUP_DIR)
 
 ### Use the existing debug I/O in cpu/arm/common
 CONTIKI_CPU_DIRS += ../arm/common/dbg-io

cpu/cc26xx/cc26xx.ld

@@ -35,14 +35,14 @@ ENTRY(ResetISR)
 
 MEMORY
 {
-    /* Flash Size 128 KB minus the CCA area below (76 bytes) */
-    FLASH (RX) : ORIGIN = 0x00000000, LENGTH = 0x0001FFAC
+    /* Flash Size 128 KB minus the CCA area below (88 bytes) */
+    FLASH (RX) : ORIGIN = 0x00000000, LENGTH = 0x0001FFA8
 
     /*
      * Customer Configuration Area and Bootloader Backdoor configuration
-     * in flash, up to 80 bytes
+     * in flash, up to 88 bytes
      */
-    FLASH_CCFG (RX) : ORIGIN = 0x0001FFAC, LENGTH = 84
+    FLASH_CCFG (RX) : ORIGIN = 0x0001FFA8, LENGTH = 88
 
     /* RAM Size 20KB (PG2.1) */
     SRAM (RWX) : ORIGIN = 0x20000000, LENGTH = 0x00005000

cpu/cc26xx/dev/batmon-sensor.c

@@ -61,28 +61,25 @@ static int enabled = SENSOR_STATUS_DISABLED;
  * \brief Returns a reading from the sensor
  * \param type BATMON_SENSOR_TYPE_TEMP or BATMON_SENSOR_TYPE_VOLT
  *
- * \return The raw sensor reading, not converted to human-readable form
+ * \return The value as returned by the respective CC26xxware function
  */
 static int
 value(int type)
 {
-  uint32_t tmp_value;
-
   if(enabled == SENSOR_STATUS_DISABLED) {
     PRINTF("Sensor Disabled\n");
     return 0;
   }
 
   if(type == BATMON_SENSOR_TYPE_TEMP) {
-    tmp_value = ti_lib_aon_batmon_temperature_get();
+    return (int)ti_lib_aon_batmon_temperature_get_deg_c();
   } else if(type == BATMON_SENSOR_TYPE_VOLT) {
-    tmp_value = ti_lib_aon_batmon_battery_voltage_get();
+    return (int)ti_lib_aon_batmon_battery_voltage_get();
   } else {
     PRINTF("Invalid type\n");
-    return 0;
   }
 
-  return (int)tmp_value;
+  return 0;
 }
 /*---------------------------------------------------------------------------*/
 /**
@@ -101,7 +98,6 @@ configure(int type, int enable)
   switch(type) {
   case SENSORS_HW_INIT:
     ti_lib_aon_batmon_enable();
-    ti_lib_aon_batmon_measurement_cycle_set(AON_BATMON_CYCLE_32);
     enabled = SENSOR_STATUS_ENABLED;
     break;
   case SENSORS_ACTIVE:

cpu/cc26xx/dev/cc26xx-uart.c

@@ -154,10 +154,7 @@ configure(void)
                            BOARD_IOID_UART_CTS, BOARD_IOID_UART_RTS);
 
   /* Configure the UART for 115,200, 8-N-1 operation. */
-  ti_lib_uart_config_set_exp_clk(UART0_BASE,
-                                 ti_lib_sys_ctrl_peripheral_clock_get(
-                                   PRCM_PERIPH_UART0,
-                                   SYSCTRL_SYSBUS_ON),
+  ti_lib_uart_config_set_exp_clk(UART0_BASE, ti_lib_sys_ctrl_clock_get(),
                                  CC26XX_UART_CONF_BAUD_RATE,
                                  (UART_CONFIG_WLEN_8 | UART_CONFIG_STOP_ONE |
                                   UART_CONFIG_PAR_NONE));

cpu/cc26xx/lib/cc26xxware

@@ -141,11 +141,9 @@ lpm_shutdown(uint32_t wakeup_pin, uint32_t io_pull, uint32_t wake_on)
   ti_lib_aon_wuc_mcu_power_down_config(AONWUC_NO_CLOCK);
   ti_lib_aon_wuc_aux_power_down_config(AONWUC_NO_CLOCK);
 
-  /* Disable retentions: SRAM, CPU, AUX, RFCORE - possibly not required */
+  /* Disable SRAM and AUX retentions */
   ti_lib_aon_wuc_mcu_sram_config(0);
-  ti_lib_prcm_retention_disable(PRCM_DOMAIN_CPU);
   ti_lib_aon_wuc_aux_sram_config(false);
-  ti_lib_prcm_retention_disable(PRCM_DOMAIN_RFCORE);
 
   /*
    * Request CPU, SYSBYS and VIMS PD off.
@@ -160,7 +158,7 @@ lpm_shutdown(uint32_t wakeup_pin, uint32_t io_pull, uint32_t wake_on)
   /* Turn off AUX */
   ti_lib_aux_wuc_power_ctrl(AUX_WUC_POWER_OFF);
   ti_lib_aon_wuc_domain_power_down_enable();
-  while(ti_lib_aon_wuc_power_status() & AONWUC_AUX_POWER_ON);
+  while(ti_lib_aon_wuc_power_status_get() & AONWUC_AUX_POWER_ON);
 
   /*
    * Request MCU VD power off.
@@ -176,7 +174,7 @@ lpm_shutdown(uint32_t wakeup_pin, uint32_t io_pull, uint32_t wake_on)
   ti_lib_pwr_ctrl_io_freeze_enable();
 
   /* Turn off VIMS cache, CRAM and TRAM - possibly not required */
-  ti_lib_prcm_retention_disable(PRCM_DOMAIN_VIMS);
+  ti_lib_prcm_cache_retention_disable();
   ti_lib_vims_mode_set(VIMS_BASE, VIMS_MODE_OFF);
 
   /* Enable shutdown and sync AON */
@@ -216,7 +214,7 @@ wake_up(void)
 
   /* Turn on cache again */
   ti_lib_vims_mode_set(VIMS_BASE, VIMS_MODE_ENABLED);
-  ti_lib_prcm_retention_enable(PRCM_DOMAIN_VIMS);
+  ti_lib_prcm_cache_retention_enable();
 
   ti_lib_aon_ioc_freeze_disable();
   ti_lib_sys_ctrl_aon_sync();
@@ -340,15 +338,9 @@ lpm_drop()
     ti_lib_aon_wuc_mcu_sram_config(MCU_RAM0_RETENTION | MCU_RAM1_RETENTION |
                                    MCU_RAM2_RETENTION | MCU_RAM3_RETENTION);
 
-    /* Enable retention on the CPU domain */
-    ti_lib_prcm_retention_enable(PRCM_DOMAIN_CPU);
-
     /* Disable retention of AUX RAM */
     ti_lib_aon_wuc_aux_sram_config(false);
 
-    /* Disable retention in the RFCORE RAM */
-    ti_lib_prcm_retention_disable(PRCM_DOMAIN_RFCORE);
-
     /*
      * Always turn off RFCORE, CPU, SYSBUS and VIMS. RFCORE should be off
      * already
@@ -362,7 +354,7 @@ lpm_drop()
     /* Turn off AUX */
     ti_lib_aux_wuc_power_ctrl(AUX_WUC_POWER_OFF);
     ti_lib_aon_wuc_domain_power_down_enable();
-    while(ti_lib_aon_wuc_power_status() & AONWUC_AUX_POWER_ON);
+    while(ti_lib_aon_wuc_power_status_get() & AONWUC_AUX_POWER_ON);
 
     /* Configure the recharge controller */
     ti_lib_sys_ctrl_set_recharge_before_power_down(false);
@@ -389,7 +381,7 @@ lpm_drop()
      * until right before deep sleep to be able to use the cache for as long
      * as possible.
      */
-    ti_lib_prcm_retention_disable(PRCM_DOMAIN_VIMS);
+    ti_lib_prcm_cache_retention_disable();
     ti_lib_vims_mode_set(VIMS_BASE, VIMS_MODE_OFF);
 
     /* Deep Sleep */