From 0bcdd39cc60b81a7c3390a40e54f7b7cbfb08532 Mon Sep 17 00:00:00 2001 From: Yasuyuki Tanaka Date: Fri, 12 Oct 2018 19:38:18 +0200 Subject: [PATCH] Rename 'arch/cpu/cc26xx-cc13xx' to 'arch/cpu/cc26x0-cc13x0' --- .gitmodules | 6 +++--- .../Makefile.cc13xx => cc26x0-cc13x0/Makefile.cc13x0} | 2 +- .../Makefile.cc26xx => cc26x0-cc13x0/Makefile.cc26x0} | 2 +- .../Makefile.cc26x0-cc13x0} | 2 +- .../cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/Makefile.cc26x0r2f | 2 +- arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/ble-addr.c | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/ble-addr.h | 0 .../{cc26xx-cc13xx => cc26x0-cc13x0}/cc13x0-cc26x0-cm3.h | 0 .../{cc26xx-cc13xx => cc26x0-cc13x0}/cc13xx-cc26xx-conf.h | 0 .../{cc26xx-cc13xx => cc26x0-cc13x0}/cc13xx-cc26xx-def.h | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/cc26xx.ld | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/ccxxware-conf.h | 2 +- arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/clock.c | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dbg.c | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/adc-sensor.c | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/adc-sensor.h | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/aux-ctrl.c | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/aux-ctrl.h | 0 .../{cc26xx-cc13xx => cc26x0-cc13x0}/dev/batmon-sensor.c | 0 .../{cc26xx-cc13xx => cc26x0-cc13x0}/dev/batmon-sensor.h | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/cc26xx-uart.c | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/cc26xx-uart.h | 0 .../{cc26xx-cc13xx => cc26x0-cc13x0}/dev/contiki-watchdog.c | 0 .../{cc26xx-cc13xx => cc26x0-cc13x0}/dev/gpio-hal-arch.c | 0 .../{cc26xx-cc13xx => cc26x0-cc13x0}/dev/gpio-hal-arch.h | 0 .../{cc26xx-cc13xx => cc26x0-cc13x0}/dev/gpio-interrupt.c | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/oscillators.c | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/oscillators.h | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/soc-rtc.c | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/soc-rtc.h | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/soc-trng.c | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/soc-trng.h | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/spi-arch.c | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/doxygen-group.txt | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/fault-handlers.c | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/ieee-addr.c | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/ieee-addr.h | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/int-master.c | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/lib/cc13xxware | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/lib/cc2640r2-sdk | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/lib/cc26xxware | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/lpm.c | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/lpm.h | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/random.c | 0 .../{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/api/ieee_cmd.h | 0 .../rf-core/api/ieee_mailbox.h | 0 .../{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/ble-cc2650.c | 0 .../rf-core/ble-hal/ble-hal-cc26xx.c | 0 .../rf-core/ble-hal/ble-hal-cc26xx.h | 0 .../rf-core/ble-hal/rf-ble-cmd.c | 0 .../rf-core/ble-hal/rf-ble-cmd.h | 0 .../rf-core/cc13xx-50kbps-tsch.c | 0 .../rf-core/cc13xx-50kbps-tsch.h | 0 .../{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/dot-15-4g.h | 0 .../{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/ieee-mode.c | 0 .../rf-core/prop-mode-tx-power.c | 0 .../{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/prop-mode.c | 0 .../{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/prop-mode.h | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/rf-ble.c | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/rf-ble.h | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/rf-core.c | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/rf-core.h | 0 .../{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/rf-switch.h | 0 .../rf-core/smartrf-settings.c | 0 .../rf-core/smartrf-settings.h | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rtimer-arch.c | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rtimer-arch.h | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/slip-arch.c | 0 arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/ti-lib.h | 0 arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0 | 2 +- .../platform/cc26x0-cc13x0/launchpad/cc1310/Makefile.cc1310 | 2 +- .../platform/cc26x0-cc13x0/launchpad/cc1350/Makefile.cc1350 | 2 +- .../platform/cc26x0-cc13x0/launchpad/cc2650/Makefile.cc2650 | 2 +- .../platform/cc26x0-cc13x0/sensortag/cc1350/Makefile.cc1350 | 2 +- .../platform/cc26x0-cc13x0/sensortag/cc2650/Makefile.cc2650 | 2 +- arch/platform/cc26x0-cc13x0/srf06/cc13x0/Makefile.cc13x0 | 2 +- arch/platform/cc26x0-cc13x0/srf06/cc26x0/Makefile.cc26x0 | 2 +- .../cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/builtin-sensors.c | 0 .../cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/builtin-sensors.h | 0 .../arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0 | 2 +- examples/platform-specific/cc26x0-cc13x0/ble-ipv6/README.md | 6 +++--- tools/doxygen/Doxyfile | 4 ++-- 82 files changed, 22 insertions(+), 22 deletions(-) rename arch/cpu/{cc26xx-cc13xx/Makefile.cc13xx => cc26x0-cc13x0/Makefile.cc13x0} (80%) rename arch/cpu/{cc26xx-cc13xx/Makefile.cc26xx => cc26x0-cc13x0/Makefile.cc26x0} (65%) rename arch/cpu/{cc26xx-cc13xx/Makefile.cc26xx-cc13xx => cc26x0-cc13x0/Makefile.cc26x0-cc13x0} (98%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/Makefile.cc26x0r2f (67%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/ble-addr.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/ble-addr.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/cc13x0-cc26x0-cm3.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/cc13xx-cc26xx-conf.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/cc13xx-cc26xx-def.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/cc26xx.ld (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/ccxxware-conf.h (98%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/clock.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dbg.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/adc-sensor.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/adc-sensor.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/aux-ctrl.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/aux-ctrl.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/batmon-sensor.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/batmon-sensor.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/cc26xx-uart.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/cc26xx-uart.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/contiki-watchdog.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/gpio-hal-arch.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/gpio-hal-arch.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/gpio-interrupt.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/oscillators.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/oscillators.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/soc-rtc.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/soc-rtc.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/soc-trng.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/soc-trng.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/dev/spi-arch.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/doxygen-group.txt (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/fault-handlers.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/ieee-addr.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/ieee-addr.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/int-master.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/lib/cc13xxware (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/lib/cc2640r2-sdk (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/lib/cc26xxware (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/lpm.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/lpm.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/random.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/api/ieee_cmd.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/api/ieee_mailbox.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/ble-cc2650.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/ble-hal/ble-hal-cc26xx.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/ble-hal/ble-hal-cc26xx.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/ble-hal/rf-ble-cmd.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/ble-hal/rf-ble-cmd.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/cc13xx-50kbps-tsch.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/cc13xx-50kbps-tsch.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/dot-15-4g.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/ieee-mode.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/prop-mode-tx-power.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/prop-mode.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/prop-mode.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/rf-ble.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/rf-ble.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/rf-core.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/rf-core.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/rf-switch.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/smartrf-settings.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rf-core/smartrf-settings.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rtimer-arch.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/rtimer-arch.h (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/slip-arch.c (100%) rename arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/ti-lib.h (100%) rename examples/mqtt-client/arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/builtin-sensors.c (100%) rename examples/mqtt-client/arch/cpu/{cc26xx-cc13xx => cc26x0-cc13x0}/builtin-sensors.h (100%) diff --git a/.gitmodules b/.gitmodules index ed5ea056d..6481bbb93 100644 --- a/.gitmodules +++ b/.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 diff --git a/arch/cpu/cc26xx-cc13xx/Makefile.cc13xx b/arch/cpu/cc26x0-cc13x0/Makefile.cc13x0 similarity index 80% rename from arch/cpu/cc26xx-cc13xx/Makefile.cc13xx rename to arch/cpu/cc26x0-cc13x0/Makefile.cc13x0 index 5ea92e30c..c29ee7270 100644 --- a/arch/cpu/cc26xx-cc13xx/Makefile.cc13xx +++ b/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 diff --git a/arch/cpu/cc26xx-cc13xx/Makefile.cc26xx b/arch/cpu/cc26x0-cc13x0/Makefile.cc26x0 similarity index 65% rename from arch/cpu/cc26xx-cc13xx/Makefile.cc26xx rename to arch/cpu/cc26x0-cc13x0/Makefile.cc26x0 index 34a147f7b..51db3f205 100644 --- a/arch/cpu/cc26xx-cc13xx/Makefile.cc26xx +++ b/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 diff --git a/arch/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx b/arch/cpu/cc26x0-cc13x0/Makefile.cc26x0-cc13x0 similarity index 98% rename from arch/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx rename to arch/cpu/cc26x0-cc13x0/Makefile.cc26x0-cc13x0 index 592ddfbd8..e62b8be05 100644 --- a/arch/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx +++ b/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)/*)) diff --git a/arch/cpu/cc26xx-cc13xx/Makefile.cc26x0r2f b/arch/cpu/cc26x0-cc13x0/Makefile.cc26x0r2f similarity index 67% rename from arch/cpu/cc26xx-cc13xx/Makefile.cc26x0r2f rename to arch/cpu/cc26x0-cc13x0/Makefile.cc26x0r2f index 56d041516..5118cd6a8 100644 --- a/arch/cpu/cc26xx-cc13xx/Makefile.cc26x0r2f +++ b/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 diff --git a/arch/cpu/cc26xx-cc13xx/ble-addr.c b/arch/cpu/cc26x0-cc13x0/ble-addr.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/ble-addr.c rename to arch/cpu/cc26x0-cc13x0/ble-addr.c diff --git a/arch/cpu/cc26xx-cc13xx/ble-addr.h b/arch/cpu/cc26x0-cc13x0/ble-addr.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/ble-addr.h rename to arch/cpu/cc26x0-cc13x0/ble-addr.h diff --git a/arch/cpu/cc26xx-cc13xx/cc13x0-cc26x0-cm3.h b/arch/cpu/cc26x0-cc13x0/cc13x0-cc26x0-cm3.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/cc13x0-cc26x0-cm3.h rename to arch/cpu/cc26x0-cc13x0/cc13x0-cc26x0-cm3.h diff --git a/arch/cpu/cc26xx-cc13xx/cc13xx-cc26xx-conf.h b/arch/cpu/cc26x0-cc13x0/cc13xx-cc26xx-conf.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/cc13xx-cc26xx-conf.h rename to arch/cpu/cc26x0-cc13x0/cc13xx-cc26xx-conf.h diff --git a/arch/cpu/cc26xx-cc13xx/cc13xx-cc26xx-def.h b/arch/cpu/cc26x0-cc13x0/cc13xx-cc26xx-def.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/cc13xx-cc26xx-def.h rename to arch/cpu/cc26x0-cc13x0/cc13xx-cc26xx-def.h diff --git a/arch/cpu/cc26xx-cc13xx/cc26xx.ld b/arch/cpu/cc26x0-cc13x0/cc26xx.ld similarity index 100% rename from arch/cpu/cc26xx-cc13xx/cc26xx.ld rename to arch/cpu/cc26x0-cc13x0/cc26xx.ld diff --git a/arch/cpu/cc26xx-cc13xx/ccxxware-conf.h b/arch/cpu/cc26x0-cc13x0/ccxxware-conf.h similarity index 98% rename from arch/cpu/cc26xx-cc13xx/ccxxware-conf.h rename to arch/cpu/cc26x0-cc13x0/ccxxware-conf.h index bc26f1171..c101deb08 100644 --- a/arch/cpu/cc26xx-cc13xx/ccxxware-conf.h +++ b/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_ diff --git a/arch/cpu/cc26xx-cc13xx/clock.c b/arch/cpu/cc26x0-cc13x0/clock.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/clock.c rename to arch/cpu/cc26x0-cc13x0/clock.c diff --git a/arch/cpu/cc26xx-cc13xx/dbg.c b/arch/cpu/cc26x0-cc13x0/dbg.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dbg.c rename to arch/cpu/cc26x0-cc13x0/dbg.c diff --git a/arch/cpu/cc26xx-cc13xx/dev/adc-sensor.c b/arch/cpu/cc26x0-cc13x0/dev/adc-sensor.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dev/adc-sensor.c rename to arch/cpu/cc26x0-cc13x0/dev/adc-sensor.c diff --git a/arch/cpu/cc26xx-cc13xx/dev/adc-sensor.h b/arch/cpu/cc26x0-cc13x0/dev/adc-sensor.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dev/adc-sensor.h rename to arch/cpu/cc26x0-cc13x0/dev/adc-sensor.h diff --git a/arch/cpu/cc26xx-cc13xx/dev/aux-ctrl.c b/arch/cpu/cc26x0-cc13x0/dev/aux-ctrl.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dev/aux-ctrl.c rename to arch/cpu/cc26x0-cc13x0/dev/aux-ctrl.c diff --git a/arch/cpu/cc26xx-cc13xx/dev/aux-ctrl.h b/arch/cpu/cc26x0-cc13x0/dev/aux-ctrl.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dev/aux-ctrl.h rename to arch/cpu/cc26x0-cc13x0/dev/aux-ctrl.h diff --git a/arch/cpu/cc26xx-cc13xx/dev/batmon-sensor.c b/arch/cpu/cc26x0-cc13x0/dev/batmon-sensor.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dev/batmon-sensor.c rename to arch/cpu/cc26x0-cc13x0/dev/batmon-sensor.c diff --git a/arch/cpu/cc26xx-cc13xx/dev/batmon-sensor.h b/arch/cpu/cc26x0-cc13x0/dev/batmon-sensor.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dev/batmon-sensor.h rename to arch/cpu/cc26x0-cc13x0/dev/batmon-sensor.h diff --git a/arch/cpu/cc26xx-cc13xx/dev/cc26xx-uart.c b/arch/cpu/cc26x0-cc13x0/dev/cc26xx-uart.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dev/cc26xx-uart.c rename to arch/cpu/cc26x0-cc13x0/dev/cc26xx-uart.c diff --git a/arch/cpu/cc26xx-cc13xx/dev/cc26xx-uart.h b/arch/cpu/cc26x0-cc13x0/dev/cc26xx-uart.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dev/cc26xx-uart.h rename to arch/cpu/cc26x0-cc13x0/dev/cc26xx-uart.h diff --git a/arch/cpu/cc26xx-cc13xx/dev/contiki-watchdog.c b/arch/cpu/cc26x0-cc13x0/dev/contiki-watchdog.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dev/contiki-watchdog.c rename to arch/cpu/cc26x0-cc13x0/dev/contiki-watchdog.c diff --git a/arch/cpu/cc26xx-cc13xx/dev/gpio-hal-arch.c b/arch/cpu/cc26x0-cc13x0/dev/gpio-hal-arch.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dev/gpio-hal-arch.c rename to arch/cpu/cc26x0-cc13x0/dev/gpio-hal-arch.c diff --git a/arch/cpu/cc26xx-cc13xx/dev/gpio-hal-arch.h b/arch/cpu/cc26x0-cc13x0/dev/gpio-hal-arch.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dev/gpio-hal-arch.h rename to arch/cpu/cc26x0-cc13x0/dev/gpio-hal-arch.h diff --git a/arch/cpu/cc26xx-cc13xx/dev/gpio-interrupt.c b/arch/cpu/cc26x0-cc13x0/dev/gpio-interrupt.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dev/gpio-interrupt.c rename to arch/cpu/cc26x0-cc13x0/dev/gpio-interrupt.c diff --git a/arch/cpu/cc26xx-cc13xx/dev/oscillators.c b/arch/cpu/cc26x0-cc13x0/dev/oscillators.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dev/oscillators.c rename to arch/cpu/cc26x0-cc13x0/dev/oscillators.c diff --git a/arch/cpu/cc26xx-cc13xx/dev/oscillators.h b/arch/cpu/cc26x0-cc13x0/dev/oscillators.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dev/oscillators.h rename to arch/cpu/cc26x0-cc13x0/dev/oscillators.h diff --git a/arch/cpu/cc26xx-cc13xx/dev/soc-rtc.c b/arch/cpu/cc26x0-cc13x0/dev/soc-rtc.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dev/soc-rtc.c rename to arch/cpu/cc26x0-cc13x0/dev/soc-rtc.c diff --git a/arch/cpu/cc26xx-cc13xx/dev/soc-rtc.h b/arch/cpu/cc26x0-cc13x0/dev/soc-rtc.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dev/soc-rtc.h rename to arch/cpu/cc26x0-cc13x0/dev/soc-rtc.h diff --git a/arch/cpu/cc26xx-cc13xx/dev/soc-trng.c b/arch/cpu/cc26x0-cc13x0/dev/soc-trng.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dev/soc-trng.c rename to arch/cpu/cc26x0-cc13x0/dev/soc-trng.c diff --git a/arch/cpu/cc26xx-cc13xx/dev/soc-trng.h b/arch/cpu/cc26x0-cc13x0/dev/soc-trng.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dev/soc-trng.h rename to arch/cpu/cc26x0-cc13x0/dev/soc-trng.h diff --git a/arch/cpu/cc26xx-cc13xx/dev/spi-arch.c b/arch/cpu/cc26x0-cc13x0/dev/spi-arch.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/dev/spi-arch.c rename to arch/cpu/cc26x0-cc13x0/dev/spi-arch.c diff --git a/arch/cpu/cc26xx-cc13xx/doxygen-group.txt b/arch/cpu/cc26x0-cc13x0/doxygen-group.txt similarity index 100% rename from arch/cpu/cc26xx-cc13xx/doxygen-group.txt rename to arch/cpu/cc26x0-cc13x0/doxygen-group.txt diff --git a/arch/cpu/cc26xx-cc13xx/fault-handlers.c b/arch/cpu/cc26x0-cc13x0/fault-handlers.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/fault-handlers.c rename to arch/cpu/cc26x0-cc13x0/fault-handlers.c diff --git a/arch/cpu/cc26xx-cc13xx/ieee-addr.c b/arch/cpu/cc26x0-cc13x0/ieee-addr.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/ieee-addr.c rename to arch/cpu/cc26x0-cc13x0/ieee-addr.c diff --git a/arch/cpu/cc26xx-cc13xx/ieee-addr.h b/arch/cpu/cc26x0-cc13x0/ieee-addr.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/ieee-addr.h rename to arch/cpu/cc26x0-cc13x0/ieee-addr.h diff --git a/arch/cpu/cc26xx-cc13xx/int-master.c b/arch/cpu/cc26x0-cc13x0/int-master.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/int-master.c rename to arch/cpu/cc26x0-cc13x0/int-master.c diff --git a/arch/cpu/cc26xx-cc13xx/lib/cc13xxware b/arch/cpu/cc26x0-cc13x0/lib/cc13xxware similarity index 100% rename from arch/cpu/cc26xx-cc13xx/lib/cc13xxware rename to arch/cpu/cc26x0-cc13x0/lib/cc13xxware diff --git a/arch/cpu/cc26xx-cc13xx/lib/cc2640r2-sdk b/arch/cpu/cc26x0-cc13x0/lib/cc2640r2-sdk similarity index 100% rename from arch/cpu/cc26xx-cc13xx/lib/cc2640r2-sdk rename to arch/cpu/cc26x0-cc13x0/lib/cc2640r2-sdk diff --git a/arch/cpu/cc26xx-cc13xx/lib/cc26xxware b/arch/cpu/cc26x0-cc13x0/lib/cc26xxware similarity index 100% rename from arch/cpu/cc26xx-cc13xx/lib/cc26xxware rename to arch/cpu/cc26x0-cc13x0/lib/cc26xxware diff --git a/arch/cpu/cc26xx-cc13xx/lpm.c b/arch/cpu/cc26x0-cc13x0/lpm.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/lpm.c rename to arch/cpu/cc26x0-cc13x0/lpm.c diff --git a/arch/cpu/cc26xx-cc13xx/lpm.h b/arch/cpu/cc26x0-cc13x0/lpm.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/lpm.h rename to arch/cpu/cc26x0-cc13x0/lpm.h diff --git a/arch/cpu/cc26xx-cc13xx/random.c b/arch/cpu/cc26x0-cc13x0/random.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/random.c rename to arch/cpu/cc26x0-cc13x0/random.c diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/api/ieee_cmd.h b/arch/cpu/cc26x0-cc13x0/rf-core/api/ieee_cmd.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/api/ieee_cmd.h rename to arch/cpu/cc26x0-cc13x0/rf-core/api/ieee_cmd.h diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/api/ieee_mailbox.h b/arch/cpu/cc26x0-cc13x0/rf-core/api/ieee_mailbox.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/api/ieee_mailbox.h rename to arch/cpu/cc26x0-cc13x0/rf-core/api/ieee_mailbox.h diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/ble-cc2650.c b/arch/cpu/cc26x0-cc13x0/rf-core/ble-cc2650.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/ble-cc2650.c rename to arch/cpu/cc26x0-cc13x0/rf-core/ble-cc2650.c diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/ble-hal-cc26xx.c b/arch/cpu/cc26x0-cc13x0/rf-core/ble-hal/ble-hal-cc26xx.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/ble-hal-cc26xx.c rename to arch/cpu/cc26x0-cc13x0/rf-core/ble-hal/ble-hal-cc26xx.c diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/ble-hal-cc26xx.h b/arch/cpu/cc26x0-cc13x0/rf-core/ble-hal/ble-hal-cc26xx.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/ble-hal-cc26xx.h rename to arch/cpu/cc26x0-cc13x0/rf-core/ble-hal/ble-hal-cc26xx.h diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/rf-ble-cmd.c b/arch/cpu/cc26x0-cc13x0/rf-core/ble-hal/rf-ble-cmd.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/rf-ble-cmd.c rename to arch/cpu/cc26x0-cc13x0/rf-core/ble-hal/rf-ble-cmd.c diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/rf-ble-cmd.h b/arch/cpu/cc26x0-cc13x0/rf-core/ble-hal/rf-ble-cmd.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/rf-ble-cmd.h rename to arch/cpu/cc26x0-cc13x0/rf-core/ble-hal/rf-ble-cmd.h diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/cc13xx-50kbps-tsch.c b/arch/cpu/cc26x0-cc13x0/rf-core/cc13xx-50kbps-tsch.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/cc13xx-50kbps-tsch.c rename to arch/cpu/cc26x0-cc13x0/rf-core/cc13xx-50kbps-tsch.c diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/cc13xx-50kbps-tsch.h b/arch/cpu/cc26x0-cc13x0/rf-core/cc13xx-50kbps-tsch.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/cc13xx-50kbps-tsch.h rename to arch/cpu/cc26x0-cc13x0/rf-core/cc13xx-50kbps-tsch.h diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/dot-15-4g.h b/arch/cpu/cc26x0-cc13x0/rf-core/dot-15-4g.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/dot-15-4g.h rename to arch/cpu/cc26x0-cc13x0/rf-core/dot-15-4g.h diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c b/arch/cpu/cc26x0-cc13x0/rf-core/ieee-mode.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c rename to arch/cpu/cc26x0-cc13x0/rf-core/ieee-mode.c diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/prop-mode-tx-power.c b/arch/cpu/cc26x0-cc13x0/rf-core/prop-mode-tx-power.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/prop-mode-tx-power.c rename to arch/cpu/cc26x0-cc13x0/rf-core/prop-mode-tx-power.c diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/prop-mode.c b/arch/cpu/cc26x0-cc13x0/rf-core/prop-mode.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/prop-mode.c rename to arch/cpu/cc26x0-cc13x0/rf-core/prop-mode.c diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/prop-mode.h b/arch/cpu/cc26x0-cc13x0/rf-core/prop-mode.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/prop-mode.h rename to arch/cpu/cc26x0-cc13x0/rf-core/prop-mode.h diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/rf-ble.c b/arch/cpu/cc26x0-cc13x0/rf-core/rf-ble.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/rf-ble.c rename to arch/cpu/cc26x0-cc13x0/rf-core/rf-ble.c diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/rf-ble.h b/arch/cpu/cc26x0-cc13x0/rf-core/rf-ble.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/rf-ble.h rename to arch/cpu/cc26x0-cc13x0/rf-core/rf-ble.h diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/rf-core.c b/arch/cpu/cc26x0-cc13x0/rf-core/rf-core.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/rf-core.c rename to arch/cpu/cc26x0-cc13x0/rf-core/rf-core.c diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/rf-core.h b/arch/cpu/cc26x0-cc13x0/rf-core/rf-core.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/rf-core.h rename to arch/cpu/cc26x0-cc13x0/rf-core/rf-core.h diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/rf-switch.h b/arch/cpu/cc26x0-cc13x0/rf-core/rf-switch.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/rf-switch.h rename to arch/cpu/cc26x0-cc13x0/rf-core/rf-switch.h diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.c b/arch/cpu/cc26x0-cc13x0/rf-core/smartrf-settings.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.c rename to arch/cpu/cc26x0-cc13x0/rf-core/smartrf-settings.c diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.h b/arch/cpu/cc26x0-cc13x0/rf-core/smartrf-settings.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rf-core/smartrf-settings.h rename to arch/cpu/cc26x0-cc13x0/rf-core/smartrf-settings.h diff --git a/arch/cpu/cc26xx-cc13xx/rtimer-arch.c b/arch/cpu/cc26x0-cc13x0/rtimer-arch.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rtimer-arch.c rename to arch/cpu/cc26x0-cc13x0/rtimer-arch.c diff --git a/arch/cpu/cc26xx-cc13xx/rtimer-arch.h b/arch/cpu/cc26x0-cc13x0/rtimer-arch.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/rtimer-arch.h rename to arch/cpu/cc26x0-cc13x0/rtimer-arch.h diff --git a/arch/cpu/cc26xx-cc13xx/slip-arch.c b/arch/cpu/cc26x0-cc13x0/slip-arch.c similarity index 100% rename from arch/cpu/cc26xx-cc13xx/slip-arch.c rename to arch/cpu/cc26x0-cc13x0/slip-arch.c diff --git a/arch/cpu/cc26xx-cc13xx/ti-lib.h b/arch/cpu/cc26x0-cc13x0/ti-lib.h similarity index 100% rename from arch/cpu/cc26xx-cc13xx/ti-lib.h rename to arch/cpu/cc26x0-cc13x0/ti-lib.h diff --git a/arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0 b/arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0 index 0c7557ab1..43cc7ea3f 100644 --- a/arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0 +++ b/arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0 @@ -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) diff --git a/arch/platform/cc26x0-cc13x0/launchpad/cc1310/Makefile.cc1310 b/arch/platform/cc26x0-cc13x0/launchpad/cc1310/Makefile.cc1310 index 8d3d2abd4..e9f7bab91 100644 --- a/arch/platform/cc26x0-cc13x0/launchpad/cc1310/Makefile.cc1310 +++ b/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 diff --git a/arch/platform/cc26x0-cc13x0/launchpad/cc1350/Makefile.cc1350 b/arch/platform/cc26x0-cc13x0/launchpad/cc1350/Makefile.cc1350 index 0d1f65359..811a3f61b 100644 --- a/arch/platform/cc26x0-cc13x0/launchpad/cc1350/Makefile.cc1350 +++ b/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 diff --git a/arch/platform/cc26x0-cc13x0/launchpad/cc2650/Makefile.cc2650 b/arch/platform/cc26x0-cc13x0/launchpad/cc2650/Makefile.cc2650 index 72e50de3a..399cd79e5 100644 --- a/arch/platform/cc26x0-cc13x0/launchpad/cc2650/Makefile.cc2650 +++ b/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 diff --git a/arch/platform/cc26x0-cc13x0/sensortag/cc1350/Makefile.cc1350 b/arch/platform/cc26x0-cc13x0/sensortag/cc1350/Makefile.cc1350 index cdae4c2b1..f0f924e97 100644 --- a/arch/platform/cc26x0-cc13x0/sensortag/cc1350/Makefile.cc1350 +++ b/arch/platform/cc26x0-cc13x0/sensortag/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 += sensortag/cc1350 diff --git a/arch/platform/cc26x0-cc13x0/sensortag/cc2650/Makefile.cc2650 b/arch/platform/cc26x0-cc13x0/sensortag/cc2650/Makefile.cc2650 index e91cabda4..4aa83e352 100644 --- a/arch/platform/cc26x0-cc13x0/sensortag/cc2650/Makefile.cc2650 +++ b/arch/platform/cc26x0-cc13x0/sensortag/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 += sensortag/cc2650 diff --git a/arch/platform/cc26x0-cc13x0/srf06/cc13x0/Makefile.cc13x0 b/arch/platform/cc26x0-cc13x0/srf06/cc13x0/Makefile.cc13x0 index 2d92d9113..ec20fcb63 100644 --- a/arch/platform/cc26x0-cc13x0/srf06/cc13x0/Makefile.cc13x0 +++ b/arch/platform/cc26x0-cc13x0/srf06/cc13x0/Makefile.cc13x0 @@ -1,5 +1,5 @@ ### Will allow the inclusion of the correct CPU makefile -CPU_FAMILY = cc13xx +CPU_FAMILY = cc13x0 ### Include the common sensortag makefile include $(PLATFORM_ROOT_DIR)/srf06/Makefile.srf06 diff --git a/arch/platform/cc26x0-cc13x0/srf06/cc26x0/Makefile.cc26x0 b/arch/platform/cc26x0-cc13x0/srf06/cc26x0/Makefile.cc26x0 index 6e4a09629..84ef217a8 100644 --- a/arch/platform/cc26x0-cc13x0/srf06/cc26x0/Makefile.cc26x0 +++ b/arch/platform/cc26x0-cc13x0/srf06/cc26x0/Makefile.cc26x0 @@ -1,5 +1,5 @@ ### Will allow the inclusion of the correct CPU makefile -CPU_FAMILY = cc26xx +CPU_FAMILY = cc26x0 ### Include the common makefile include $(PLATFORM_ROOT_DIR)/srf06/Makefile.srf06 diff --git a/examples/mqtt-client/arch/cpu/cc26xx-cc13xx/builtin-sensors.c b/examples/mqtt-client/arch/cpu/cc26x0-cc13x0/builtin-sensors.c similarity index 100% rename from examples/mqtt-client/arch/cpu/cc26xx-cc13xx/builtin-sensors.c rename to examples/mqtt-client/arch/cpu/cc26x0-cc13x0/builtin-sensors.c diff --git a/examples/mqtt-client/arch/cpu/cc26xx-cc13xx/builtin-sensors.h b/examples/mqtt-client/arch/cpu/cc26x0-cc13x0/builtin-sensors.h similarity index 100% rename from examples/mqtt-client/arch/cpu/cc26xx-cc13xx/builtin-sensors.h rename to examples/mqtt-client/arch/cpu/cc26x0-cc13x0/builtin-sensors.h diff --git a/examples/mqtt-client/arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0 b/examples/mqtt-client/arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0 index dcec87bad..7c74123c6 100644 --- a/examples/mqtt-client/arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0 +++ b/examples/mqtt-client/arch/platform/cc26x0-cc13x0/Makefile.cc26x0-cc13x0 @@ -1 +1 @@ -MODULES_REL += arch/cpu/cc26xx-cc13xx +MODULES_REL += arch/cpu/cc26x0-cc13x0 diff --git a/examples/platform-specific/cc26x0-cc13x0/ble-ipv6/README.md b/examples/platform-specific/cc26x0-cc13x0/ble-ipv6/README.md index d33c7329f..078667264 100644 --- a/examples/platform-specific/cc26x0-cc13x0/ble-ipv6/README.md +++ b/examples/platform-specific/cc26x0-cc13x0/ble-ipv6/README.md @@ -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: ### 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` -and `arch/cpu/cc26xx-cc13xx/rf-core/ble-hal/*.[ch]`. +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/cc26x0-cc13x0/rf-core/ble-hal/*.[ch]`. These files contain all the hardware specific code for supporting BLE as a link 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. ## Using BLEach diff --git a/tools/doxygen/Doxyfile b/tools/doxygen/Doxyfile index dab2c18e3..2cd7dba72 100644 --- a/tools/doxygen/Doxyfile +++ b/tools/doxygen/Doxyfile @@ -807,8 +807,8 @@ EXCLUDE_SYMLINKS = NO # 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_PATTERNS = */cpu/cc26xx-cc13xx/lib/* \ - */cpu/cc26xx-cc13xx/rf-core/api/* \ +EXCLUDE_PATTERNS = */cpu/cc26x0-cc13x0/lib/* \ + */cpu/cc26x0-cc13x0/rf-core/api/* \ */cpu/simplelink-cc13xx-cc26xx/lib/* \ */cpu/simplelink-cc13xx-cc26xx/rf-settings/* \ */cpu/simplelink-cc13xx-cc26xx/cc13x0-cc26x0/driverlib/* \