Renamed cpu dir to simplelink-cc13xx-cc26xx

.gitmodules

@@ -22,6 +22,7 @@
 [submodule "tools/motelist"]
 	path = tools/motelist
 	url = https://github.com/contiki-ng/motelist
-[submodule "arch/cpu/cc13xx-cc26xx/lib/coresdk_cc13xx_cc26xx"]
+[submodule "arch/cpu/simplelink-cc13xx-cc26xx/lib/coresdk_cc13xx_cc26xx"]
-	path = arch/cpu/cc13xx-cc26xx/lib/coresdk_cc13xx_cc26xx
+	path = arch/cpu/simplelink-cc13xx-cc26xx/lib/coresdk_cc13xx_cc26xx
 	url = https://github.com/tiepettersen/coresdk_cc13xx_cc26xx.git
+

arch/cpu/simplelink-cc13xx-cc26xx/dev/startup_cc13xx_cc26xx_gcc.c

@@ -129,13 +129,6 @@ localProgramStart(void)
   uint32_t count;
   uint32_t i;
 
-#if defined(__ARM_ARCH_7EM__) && defined(__VFP_FP__) && !defined(__SOFTFP__)
-  volatile uint32_t *pui32Cpacr = (uint32_t *)0xE000ED88;
-
-  /* Enable Coprocessor Access Control (CPAC) */
-  *pui32Cpacr |= (0xF << 20);
-#endif
-
   IntMasterDisable();
 
   /* Final trim of device */
@@ -193,7 +186,10 @@ resetISR(void)
     "movt r0, #:upper16:resetVectors  \n"
     "ldr r0, [r0]                     \n"
     "mov sp, r0                       \n"
-    "bl localProgramStart             \n"
+    "bx %0                            \n"
+    : /* output */
+    : /* input */
+    "r"(localProgramStart)
   );
 }
 /*---------------------------------------------------------------------------*/
@@ -217,7 +213,7 @@ nmiISR(void)
  *
  * Provide a view into the CPU state from the provided stack pointer.
  */
-void
+static void
 debugHardfault(uint32_t *sp)
 {
   volatile uint32_t r0;  /**< R0 register */
@@ -259,7 +255,10 @@ faultISR(void)
     "ite eq            \n"
     "mrseq r0, msp     \n"
     "mrsne r0, psp     \n"
-    "b debugHardfault  \n"
+    "bx %0             \n"
+    : /* output */
+    : /* input */
+    "r"(debugHardfault)
   );
 }
 /*---------------------------------------------------------------------------*/

arch/cpu/simplelink-cc13xx-cc26xx/dev/trng-arch.c

@@ -46,7 +46,8 @@
 /*---------------------------------------------------------------------------*/
 /*
  * Very dirty workaround because the pre-compiled TI drivers library for
- * CC13x0/CC26x0 is missing the CryptoKey object file.
+ * CC13x0/CC26x0 is missing the CryptoKey object file. This can be removed
+ * when the pre-compiled library includes the missing object file.
  */
 #include <ti/devices/DeviceFamily.h>
 #if (DeviceFamily_PARENT == DeviceFamily_PARENT_CC13X0_CC26X0)

arch/cpu/simplelink-cc13xx-cc26xx/dev/uart0-arch.c

@@ -112,6 +112,15 @@ uart0_write(const void *buf, size_t buf_size)
 }
 /*---------------------------------------------------------------------------*/
 int_fast32_t
+uart0_write_byte(uint8_t byte)
+{
+  if(!initialized) {
+    return UART_STATUS_ERROR;
+  }
+  return UART_write(uart_handle, &byte, 1);
+}
+/*---------------------------------------------------------------------------*/
+int_fast32_t
 uart0_set_callback(uart0_input_fxn_t input_cb)
 {
   if(!initialized) {

arch/cpu/simplelink-cc13xx-cc26xx/dev/uart0-arch.h

@@ -65,6 +65,14 @@ void uart0_init(void);
  */
 int_fast32_t uart0_write(const void *buf, size_t buf_size);
 
+/**
+ * \brief           Writes a single byte to the UART interface.
+ * \param byte      Byte to write.
+ * \return          Number of bytes that has been written to the UART. If an
+ *                  error occurs, a negative value is returned.
+ */
+int_fast32_t uart0_write_byte(uint8_t byte);
+
 /**
  * \brief           Set the callback function for when bytes are received
  *                  on UART0.

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

@@ -78,6 +78,9 @@
 #define LOG_MODULE "Radio"
 #define LOG_LEVEL LOG_LEVEL_NONE
 /*---------------------------------------------------------------------------*/
+#undef CLAMP
+#define CLAMP(v, vmin, vmax)  (MAX(MIN(v, vmax), vmin))
+/*---------------------------------------------------------------------------*/
 /* Configuration parameters */
 #define PROP_MODE_DYN_WHITENER        PROP_MODE_CONF_DW
 #define PROP_MODE_USE_CRC16           PROP_MODE_CONF_USE_CRC16

arch/platform/simplelink/cc13xx-cc26xx/Makefile.cc13xx-cc26xx

@@ -6,7 +6,7 @@
 BOARD_PLATFORMS = launchpad sensortag srf06
 
 # All supported boards for this SimpleLink family
-BOARDS := $(foreach BOARD, $(BOARD_PLATFORMS), \
+BOARDS = $(foreach BOARD, $(BOARD_PLATFORMS), \
   $(shell cd $(FAMILY_PATH); find $(BOARD)/* -type d -print))
 
 ################################################################################
@@ -34,7 +34,7 @@ DEFINES += SUPPORTS_IEEE_MODE=$(SUPPORTS_IEEE_MODE)
 DEFINES += SUPPORTS_BLE_BEACON=$(SUPPORTS_BLE_BEACON)
 DEFINES += SUPPORTS_HIGH_PA=$(SUPPORTS_HIGH_PA)
 
-### If the user-specified a Node ID, pass a define
+# If the user-specified a Node ID, pass a define
 ifdef NODEID
   DEFINES += IEEE_ADDR_NODE_ID=$(NODEID)
 endif
@@ -49,7 +49,7 @@ CONTIKI_SOURCEFILES += $(CONTIKI_TARGET_SOURCEFILES)
 CPU_FAMILY = cc13xx-cc26xx
 
 # Define the CPU directory and pull in the correct CPU Makefile
-CONTIKI_CPU := $(realpath $(CONTIKI)/arch/cpu/$(CPU_FAMILY))
+CONTIKI_CPU := $(realpath $(CONTIKI)/arch/cpu/simplelink-$(CPU_FAMILY))
 include $(CONTIKI_CPU)/Makefile.$(CPU_FAMILY)
 
 MODULES += os/net os/net/mac os/net/mac/framer