Merge branch 'develop' into fix/global/ip-addr/removed

.gitignore

@@ -36,7 +36,7 @@ COOJA.testlog
 *.simplelink
 *.sky
 *.firmware
-*.srf06-cc26xx
+*.cc26x0-cc13x0
 *.zoul
 
 # do not ignore platform makefiles
@@ -47,7 +47,7 @@ COOJA.testlog
 !Makefile.nrf52dk
 !Makefile.openmote-cc2538
 !Makefile.sky
-!Makefile.srf06-cc26xx
+!Makefile.cc26x0-cc13x0
 !Makefile.zoul
 
 # other nRF52 build artifacts

.gitmodules

@@ -2,10 +2,10 @@
 	path = tools/cc2538-bsl
 	url = https://github.com/JelmerT/cc2538-bsl.git
 [submodule "arch/cpu/cc26xx-cc13xx/lib/cc26xxware"]
-	path = arch/cpu/cc26xx-cc13xx/lib/cc26xxware
+	path = arch/cpu/cc26x0-cc13x0/lib/cc26xxware
 	url = https://github.com/contiki-ng/cc26xxware.git
 [submodule "arch/cpu/cc26xx-cc13xx/lib/cc13xxware"]
-	path = arch/cpu/cc26xx-cc13xx/lib/cc13xxware
+	path = arch/cpu/cc26x0-cc13x0/lib/cc13xxware
 	url = https://github.com/contiki-ng/cc13xxware.git
 [submodule "tools/sensniff"]
 	path = tools/sensniff
@@ -26,5 +26,5 @@
 	path = arch/cpu/simplelink-cc13xx-cc26xx/lib/coresdk_cc13xx_cc26xx
 	url = https://github.com/contiki-ng/coresdk_cc13xx_cc26xx.git
 [submodule "arch/cpu/cc26xx-cc13xx/lib/cc2640r2-sdk"]
-	path = arch/cpu/cc26xx-cc13xx/lib/cc2640r2-sdk
+	path = arch/cpu/cc26x0-cc13x0/lib/cc2640r2-sdk
 	url = https://github.com/contiki-ng/cc2640r2-sdk.git

.travis.yml

@@ -68,3 +68,4 @@ env:
     - TEST_NAME='compile-tools'
     - TEST_NAME='native-runs'
     - TEST_NAME='ipv6' BUILD_COOJA=true
+    - TEST_NAME='ipv6-nbr' BUILD_COOJA=true

arch/cpu/cc26x0-cc13x0/Makefile.cc13x0

@@ -4,4 +4,4 @@ CONTIKI_CPU_SOURCEFILES += smartrf-settings.c prop-mode.c prop-mode-tx-power.c c
 
 CFLAGS += -DCPU_FAMILY_CC13X0=1 -DCPU_FAMILY_CC13XX=1
 
-include $(CONTIKI_CPU)/Makefile.cc26xx-cc13xx
+include $(CONTIKI_CPU)/Makefile.cc26x0-cc13x0

arch/cpu/cc26x0-cc13x0/Makefile.cc26x0

@@ -2,4 +2,4 @@ TI_XXWARE_PATH = lib/cc26xxware
 
 CFLAGS += -DCPU_FAMILY_CC26X0=1 -DCPU_FAMILY_CC26XX=1
 
-include $(CONTIKI_CPU)/Makefile.cc26xx-cc13xx
+include $(CONTIKI_CPU)/Makefile.cc26x0-cc13x0

arch/cpu/cc26x0-cc13x0/Makefile.cc26x0-cc13x0

@@ -1,4 +1,4 @@
-CPU_ABS_PATH       = arch/cpu/cc26xx-cc13xx
+CPU_ABS_PATH       = arch/cpu/cc26x0-cc13x0
 TI_XXWARE = $(CONTIKI_CPU)/$(TI_XXWARE_PATH)
 
 ifeq (,$(wildcard $(TI_XXWARE)/*))

arch/cpu/cc26x0-cc13x0/Makefile.cc26x0r2f

@@ -2,4 +2,4 @@ TI_XXWARE_PATH = lib/cc2640r2-sdk
 
 CFLAGS += -DCPU_FAMILY_CC26X0R2=1 -DCPU_FAMILY_CC26XXR2=1
 
-include $(CONTIKI_CPU)/Makefile.cc26xx-cc13xx
+include $(CONTIKI_CPU)/Makefile.cc26x0-cc13x0

arch/cpu/cc26x0-cc13x0/ccxxware-conf.h

@@ -36,7 +36,7 @@
  * @{
  *
  * \file
- *  CCxxware-specific configuration for the cc26xx-cc13xx CPU family
+ *  CCxxware-specific configuration for the cc26x0-cc13x0 CPU family
  */
 #ifndef CCXXWARE_CONF_H_
 #define CCXXWARE_CONF_H_

arch/cpu/msp430/uip-ipchksum.c

@@ -51,7 +51,7 @@ uint16_t
 uip_ipchksum(void)
 {
   /* Assumes proper alignement of uip_buf. */
-  uint16_t *p = (uint16_t *)&uip_buf[UIP_LLH_LEN];
+  uint16_t *p = (uint16_t *)UIP_IP_BUF;
   register uint16_t sum;
 
   sum = p[0];

arch/cpu/native/net/tun6-net.c

@@ -263,7 +263,7 @@ output(const linkaddr_t *localdest)
 {
   LOG_DBG("SUT: %u\n", uip_len);
   if(uip_len > 0) {
-    return tun_output(&uip_buf[UIP_LLH_LEN], uip_len);
+    return tun_output(uip_buf, uip_len);
   }
   return 0;
 }
@@ -297,7 +297,7 @@ handle_fd(fd_set *rset, fd_set *wset)
   LOG_INFO("Tun6-handle FD\n");
 
   if(FD_ISSET(tunfd, rset)) {
-    size = tun_input(&uip_buf[UIP_LLH_LEN], sizeof(uip_buf));
+    size = tun_input(uip_buf, sizeof(uip_buf));
     LOG_DBG("TUN data incoming read:%d\n", size);
     uip_len = size;
     tcpip_input();

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

@@ -3,7 +3,7 @@
 
 CC13x2_CC26x2_PRE_RTM ?= 1
 
-# Core SDK is placed as a submodule under arch/cpu/cc13xx-cc26xx/lib.
+# Core SDK is placed as a submodule under arch/cpu/simplelink-cc13xx-cc26xx/lib.
 # Do a sanity check that Core SDK submodule has been initialized.
 ifndef CORE_SDK
  CORE_SDK := $(CONTIKI_CPU)/lib/coresdk_cc13xx_cc26xx

arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0

@@ -1,12 +1,12 @@
-# srf06-cc26xx platform makefile
+# cc26x0-cc13x0 platform makefile
 
 ifndef CONTIKI
   $(error CONTIKI not defined! You must specify where CONTIKI resides!)
 endif
 
 ### Board and BSP selection
-BOARD ?= srf06/cc26xx
-BOARDS = srf06/cc26xx srf06/cc13xx launchpad/cc2640r2 launchpad/cc2650 launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350
+BOARD ?= srf06/cc26x0
+BOARDS = srf06/cc26x0 srf06/cc13x0 launchpad/cc2640r2 launchpad/cc2650 launchpad/cc1310 launchpad/cc1350 sensortag/cc2650 sensortag/cc1350
 
 CONTIKI_TARGET_DIRS += .
 
@@ -25,5 +25,5 @@ SMALL ?= 0
 ### Define the CPU directory and pull in the correct CPU makefile. This will
 ### be defined by one of the makefiles included above and it can be either
 ### Makefile.cc26xx or Makefile.cc13xx
-CONTIKI_CPU=$(CONTIKI)/arch/cpu/cc26xx-cc13xx
+CONTIKI_CPU=$(CONTIKI)/arch/cpu/cc26x0-cc13x0
 include $(CONTIKI_CPU)/Makefile.$(CPU_FAMILY)

arch/platform/cc26x0-cc13x0/contiki-conf.h

@@ -32,7 +32,7 @@
  * @{
  *
  * \file
- *  Configuration for the srf06-cc26xx platform
+ *  Configuration for the cc26x0-cc13x0 platform
  */
 #ifndef CONTIKI_CONF_H
 #define CONTIKI_CONF_H

arch/platform/cc26x0-cc13x0/launchpad/cc1310/Makefile.cc1310

@@ -1,5 +1,5 @@
 ### Will allow the inclusion of the correct CPU makefile
-CPU_FAMILY = cc13xx
+CPU_FAMILY = cc13x0
 
 ### Add to the source dirs
 CONTIKI_TARGET_DIRS += launchpad/cc1310

arch/platform/cc26x0-cc13x0/launchpad/cc1350/Makefile.cc1350

@@ -1,5 +1,5 @@
 ### Will allow the inclusion of the correct CPU makefile
-CPU_FAMILY = cc13xx
+CPU_FAMILY = cc13x0
 
 ### Add to the source dirs
 CONTIKI_TARGET_DIRS += launchpad/cc1350

arch/platform/cc26x0-cc13x0/launchpad/cc2650/Makefile.cc2650

@@ -1,5 +1,5 @@
 ### Will allow the inclusion of the correct CPU makefile
-CPU_FAMILY = cc26xx
+CPU_FAMILY = cc26x0
 
 ### Add to the source dirs
 CONTIKI_TARGET_DIRS += launchpad/cc2650