Rename 'arch/cpu/cc26xx-cc13xx' to 'arch/cpu/cc26x0-cc13x0'

This commit is contained in:
Yasuyuki Tanaka 2018-10-12 19:38:18 +02:00
parent 7a6cbff5f6
commit 0bcdd39cc6
82 changed files with 22 additions and 22 deletions

6
.gitmodules vendored
View File

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

View File

@ -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 CFLAGS += -DCPU_FAMILY_CC13X0=1 -DCPU_FAMILY_CC13XX=1
include $(CONTIKI_CPU)/Makefile.cc26xx-cc13xx include $(CONTIKI_CPU)/Makefile.cc26x0-cc13x0

View File

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

View File

@ -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) TI_XXWARE = $(CONTIKI_CPU)/$(TI_XXWARE_PATH)
ifeq (,$(wildcard $(TI_XXWARE)/*)) ifeq (,$(wildcard $(TI_XXWARE)/*))

View File

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

View File

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

View File

@ -25,5 +25,5 @@ SMALL ?= 0
### Define the CPU directory and pull in the correct CPU makefile. This will ### 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 ### be defined by one of the makefiles included above and it can be either
### Makefile.cc26xx or Makefile.cc13xx ### 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) include $(CONTIKI_CPU)/Makefile.$(CPU_FAMILY)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,5 +1,5 @@
### Will allow the inclusion of the correct CPU makefile ### Will allow the inclusion of the correct CPU makefile
CPU_FAMILY = cc13xx CPU_FAMILY = cc13x0
### Include the common sensortag makefile ### Include the common sensortag makefile
include $(PLATFORM_ROOT_DIR)/srf06/Makefile.srf06 include $(PLATFORM_ROOT_DIR)/srf06/Makefile.srf06

View File

@ -1,5 +1,5 @@
### Will allow the inclusion of the correct CPU makefile ### Will allow the inclusion of the correct CPU makefile
CPU_FAMILY = cc26xx CPU_FAMILY = cc26x0
### Include the common makefile ### Include the common makefile
include $(PLATFORM_ROOT_DIR)/srf06/Makefile.srf06 include $(PLATFORM_ROOT_DIR)/srf06/Makefile.srf06

View File

@ -1 +1 @@
MODULES_REL += arch/cpu/cc26xx-cc13xx MODULES_REL += arch/cpu/cc26x0-cc13x0

View File

@ -28,12 +28,12 @@ It has been tested on the TI CC2650 SensorTag and the TI CC2650 LaunchPad hardwa
The IPv6-over-BLE stack comes with the following modules: The IPv6-over-BLE stack comes with the following modules:
### BLE radio ### BLE radio
The implementation of the BLE radio for the TI CC26xx platform is implemented in `arch/cpu/cc26xx-cc13xx/rf-core/ble-cc2650.c` The implementation of the BLE radio for the TI CC26xx platform is implemented in `arch/cpu/cc26x0-cc13x0/rf-core/ble-cc2650.c`
and `arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/*.[ch]`. and `arch/cpu/cc26x0-cc13x0/rf-core/ble-hal/*.[ch]`.
These files contain all the hardware specific code for supporting BLE as a link layer. These files contain all the hardware specific code for supporting BLE as a link layer.
### BLE L2CAP layer ### BLE L2CAP layer
The L2CAP LE credit-based flow control support is implemented in `arch/cpu/cc26xx-cc13xx/rf-core/ble-l2cap.c`. The L2CAP LE credit-based flow control support is implemented in `arch/cpu/cc26x0-cc13x0/rf-core/ble-l2cap.c`.
Besides implementing rudimentary L2CAP support, this module handles fragmentation of large IPv6 packets. Besides implementing rudimentary L2CAP support, this module handles fragmentation of large IPv6 packets.
## Using BLEach ## Using BLEach

View File

@ -807,8 +807,8 @@ EXCLUDE_SYMLINKS = NO
# Note that the wildcards are matched against the file with absolute path, so to # Note that the wildcards are matched against the file with absolute path, so to
# exclude all test directories for example use the pattern */test/* # exclude all test directories for example use the pattern */test/*
EXCLUDE_PATTERNS = */cpu/cc26xx-cc13xx/lib/* \ EXCLUDE_PATTERNS = */cpu/cc26x0-cc13x0/lib/* \
*/cpu/cc26xx-cc13xx/rf-core/api/* \ */cpu/cc26x0-cc13x0/rf-core/api/* \
*/cpu/simplelink-cc13xx-cc26xx/lib/* \ */cpu/simplelink-cc13xx-cc26xx/lib/* \
*/cpu/simplelink-cc13xx-cc26xx/rf-settings/* \ */cpu/simplelink-cc13xx-cc26xx/rf-settings/* \
*/cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/driverlib/* \ */cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/driverlib/* \