From a73f3809cc0b2cc371c479db426b6106407b90c0 Mon Sep 17 00:00:00 2001 From: Jean Pierre Dudey Date: Mon, 20 Jan 2020 09:31:48 -0500 Subject: [PATCH] cpu/cc13x2: rename `cc13x2` cpu to `cc26x2_cc13x2` The CC26x2 and CC13x2 share the same register definitions, and both are treated equally in the TI's technical reference manual. [1] - To avoid confusions in the future I renamed it to `cc26x2_cc13x2`. - Documentation was updated. - The `cc1312-launchpad` board that uses the `cc13x2` MCU was updated. - The `cc1352-launchpad` board that uses the `cc13x2` MCU was updated. [1]: https://www.ti.com/lit/ug/swcu185d/swcu185d.pdf Signed-off-by: Jean Pierre Dudey --- boards/cc1312-launchpad/Makefile.features | 2 +- boards/cc1352-launchpad/Makefile.features | 2 +- cpu/cc13x2/doc.txt | 17 ----------------- cpu/{cc13x2 => cc26x2_cc13x2}/Makefile | 0 cpu/{cc13x2 => cc26x2_cc13x2}/Makefile.features | 0 cpu/{cc13x2 => cc26x2_cc13x2}/Makefile.include | 0 cpu/{cc13x2 => cc26x2_cc13x2}/cpu.c | 4 ++-- cpu/cc26x2_cc13x2/doc.txt | 17 +++++++++++++++++ .../include/cc26x2_cc13x2_aux.h} | 10 +++++----- .../include/cc26x2_cc13x2_fcfg.h} | 10 +++++----- .../include/cc26x2_cc13x2_prcm.h} | 12 ++++++------ .../include/cpu_conf.h | 8 ++++---- .../include/periph_cpu.h | 2 +- cpu/{cc13x2 => cc26x2_cc13x2}/periph/Makefile | 0 cpu/{cc13x2 => cc26x2_cc13x2}/pm.c | 0 cpu/cc26xx_cc13xx/doc.txt | 4 ++-- cpu/cc26xx_cc13xx/include/cc26xx_cc13xx.h | 4 ++-- 17 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 cpu/cc13x2/doc.txt rename cpu/{cc13x2 => cc26x2_cc13x2}/Makefile (100%) rename cpu/{cc13x2 => cc26x2_cc13x2}/Makefile.features (100%) rename cpu/{cc13x2 => cc26x2_cc13x2}/Makefile.include (100%) rename cpu/{cc13x2 => cc26x2_cc13x2}/cpu.c (92%) create mode 100644 cpu/cc26x2_cc13x2/doc.txt rename cpu/{cc13x2/include/cc13x2_aux.h => cc26x2_cc13x2/include/cc26x2_cc13x2_aux.h} (98%) rename cpu/{cc13x2/include/cc13x2_fcfg.h => cc26x2_cc13x2/include/cc26x2_cc13x2_fcfg.h} (96%) rename cpu/{cc13x2/include/cc13x2_prcm.h => cc26x2_cc13x2/include/cc26x2_cc13x2_prcm.h} (97%) rename cpu/{cc13x2 => cc26x2_cc13x2}/include/cpu_conf.h (83%) rename cpu/{cc13x2 => cc26x2_cc13x2}/include/periph_cpu.h (93%) rename cpu/{cc13x2 => cc26x2_cc13x2}/periph/Makefile (100%) rename cpu/{cc13x2 => cc26x2_cc13x2}/pm.c (100%) diff --git a/boards/cc1312-launchpad/Makefile.features b/boards/cc1312-launchpad/Makefile.features index a71fcfaa72..f580605253 100644 --- a/boards/cc1312-launchpad/Makefile.features +++ b/boards/cc1312-launchpad/Makefile.features @@ -1,4 +1,4 @@ -CPU = cc13x2 +CPU = cc26x2_cc13x2 CPU_MODEL = cc1312r1f3 # Put defined MCU peripherals here (in alphabetical order) diff --git a/boards/cc1352-launchpad/Makefile.features b/boards/cc1352-launchpad/Makefile.features index a161b5aff6..43ebf336b6 100644 --- a/boards/cc1352-launchpad/Makefile.features +++ b/boards/cc1352-launchpad/Makefile.features @@ -1,4 +1,4 @@ -CPU = cc13x2 +CPU = cc26x2_cc13x2 CPU_MODEL = cc1352r1 # Put defined MCU peripherals here (in alphabetical order) diff --git a/cpu/cc13x2/doc.txt b/cpu/cc13x2/doc.txt deleted file mode 100644 index a6cf885893..0000000000 --- a/cpu/cc13x2/doc.txt +++ /dev/null @@ -1,17 +0,0 @@ -/** - * @defgroup cpu_cc13x2 TI CC13x2 - * @ingroup cpu - * @brief Texas Instruments CC13x2 Cortex-M4F MCU specific code - */ - -/** - * @defgroup cpu_cc13x2_peripheral_memory_map TI CC13x2 peripheral memory map - * @ingroup cpu - * @brief Texas Instruments CC13x2 memory mappings for peripherals - */ - -/** - * @defgroup cpu_cc13x2_definitions TI CC13x2 definitions - * @ingroup cpu_cc13x2 - * @brief Texas Instruments CC13x2 specific defines - */ diff --git a/cpu/cc13x2/Makefile b/cpu/cc26x2_cc13x2/Makefile similarity index 100% rename from cpu/cc13x2/Makefile rename to cpu/cc26x2_cc13x2/Makefile diff --git a/cpu/cc13x2/Makefile.features b/cpu/cc26x2_cc13x2/Makefile.features similarity index 100% rename from cpu/cc13x2/Makefile.features rename to cpu/cc26x2_cc13x2/Makefile.features diff --git a/cpu/cc13x2/Makefile.include b/cpu/cc26x2_cc13x2/Makefile.include similarity index 100% rename from cpu/cc13x2/Makefile.include rename to cpu/cc26x2_cc13x2/Makefile.include diff --git a/cpu/cc13x2/cpu.c b/cpu/cc26x2_cc13x2/cpu.c similarity index 92% rename from cpu/cc13x2/cpu.c rename to cpu/cc26x2_cc13x2/cpu.c index 6a29a35bb1..50fa72cc3b 100644 --- a/cpu/cc13x2/cpu.c +++ b/cpu/cc26x2_cc13x2/cpu.c @@ -8,7 +8,7 @@ */ /** - * @ingroup cpu_cc13x2 + * @ingroup cpu_cc26x2_cc13x2 * @{ * * @file @@ -23,7 +23,7 @@ #include "periph/init.h" #include "stdio_base.h" -#include "cc13x2_prcm.h" +#include "cc26x2_cc13x2_prcm.h" /** * @brief Initialize the CPU, set IRQ priorities diff --git a/cpu/cc26x2_cc13x2/doc.txt b/cpu/cc26x2_cc13x2/doc.txt new file mode 100644 index 0000000000..7d165312c4 --- /dev/null +++ b/cpu/cc26x2_cc13x2/doc.txt @@ -0,0 +1,17 @@ +/** + * @defgroup cpu_cc26x2_cc13x2 TI CC26x2, CC13x2 + * @ingroup cpu + * @brief Texas Instruments CC26x2, CC13x2 Cortex-M4F MCU specific code + */ + +/** + * @defgroup cpu_cc26x2_cc13x2_peripheral_memory_map TI CC26x2, CC13x2 peripheral memory map + * @ingroup cpu + * @brief Texas Instruments CC26x2, CC13x2 memory mappings for peripherals + */ + +/** + * @defgroup cpu_cc26x2_cc13x2_definitions TI CC26x2, CC13x2 definitions + * @ingroup cpu_cc26x2_cc13x2 + * @brief Texas Instruments CC26x2, CC13x2 specific defines + */ diff --git a/cpu/cc13x2/include/cc13x2_aux.h b/cpu/cc26x2_cc13x2/include/cc26x2_cc13x2_aux.h similarity index 98% rename from cpu/cc13x2/include/cc13x2_aux.h rename to cpu/cc26x2_cc13x2/include/cc26x2_cc13x2_aux.h index c02adaf0e2..3307bd3581 100644 --- a/cpu/cc13x2/include/cc13x2_aux.h +++ b/cpu/cc26x2_cc13x2/include/cc26x2_cc13x2_aux.h @@ -7,15 +7,15 @@ * details. */ /** - * @ingroup cpu_cc13x2_definitions + * @ingroup cpu_cc26x2_cc13x2_definitions * @{ * * @file - * @brief CC13x2 AUX register definitions + * @brief CC26x2, CC13x2 AUX register definitions */ -#ifndef CC13X2_AUX_H -#define CC13X2_AUX_H +#ifndef CC26X2_CC13X2_AUX_H +#define CC26X2_CC13X2_AUX_H #include @@ -341,6 +341,6 @@ typedef struct { } /* end extern "C" */ #endif -#endif /* CC13X2_AUX_H */ +#endif /* CC26X2_CC13X2_AUX_H */ /** @}*/ diff --git a/cpu/cc13x2/include/cc13x2_fcfg.h b/cpu/cc26x2_cc13x2/include/cc26x2_cc13x2_fcfg.h similarity index 96% rename from cpu/cc13x2/include/cc13x2_fcfg.h rename to cpu/cc26x2_cc13x2/include/cc26x2_cc13x2_fcfg.h index 2e8d630401..a48f83cc36 100644 --- a/cpu/cc13x2/include/cc13x2_fcfg.h +++ b/cpu/cc26x2_cc13x2/include/cc26x2_cc13x2_fcfg.h @@ -6,15 +6,15 @@ * details. */ /** - * @ingroup cpu_cc13x2_definitions + * @ingroup cpu_cc26x2_cc13x2_definitions * @{ * * @file - * @brief CC13x2 FCFG register definitions + * @brief CC26x2, CC13x2 FCFG register definitions */ -#ifndef CC13X2_FCFG_H -#define CC13X2_FCFG_H +#ifndef CC26X2_CC13X2_FCFG_H +#define CC26X2_CC13X2_FCFG_H #include @@ -142,6 +142,6 @@ typedef struct { } /* end extern "C" */ #endif -#endif /* CC13X2_FCFG_H */ +#endif /* CC26X2_CC13X2_FCFG_H */ /*@}*/ diff --git a/cpu/cc13x2/include/cc13x2_prcm.h b/cpu/cc26x2_cc13x2/include/cc26x2_cc13x2_prcm.h similarity index 97% rename from cpu/cc13x2/include/cc13x2_prcm.h rename to cpu/cc26x2_cc13x2/include/cc26x2_cc13x2_prcm.h index dc67483bbe..453de6f0bb 100644 --- a/cpu/cc13x2/include/cc13x2_prcm.h +++ b/cpu/cc26x2_cc13x2/include/cc26x2_cc13x2_prcm.h @@ -7,15 +7,15 @@ */ /** - * @ingroup cpu_cc13x2_definitions + * @ingroup cpu_cc26x2_cc13x2_definitions * @{ * * @file - * @brief CC13x2 PRCM register definitions + * @brief CC26x2, CC13x2 PRCM register definitions */ -#ifndef CC13X2_PRCM_H -#define CC13X2_PRCM_H +#ifndef CC26X2_CC13X2_PRCM_H +#define CC26X2_CC13X2_PRCM_H #include @@ -67,7 +67,7 @@ typedef struct { #define DDI_0_OSC_CTL0_XTAL_IS_24M 0x80000000 /** @} */ -/** @ingroup cpu_cc13x2_peripheral_memory_map +/** @ingroup cpu_cc26x2_cc13x2_peripheral_memory_map * @{ */ #define DDI0_OSC_BASE 0x400CA000 /**< DDI0_OSC base address */ @@ -232,6 +232,6 @@ typedef struct { } /* end extern "C" */ #endif -#endif /* CC13X2_PRCM_H */ +#endif /* CC26X2_CC13X2_PRCM_H */ /*@}*/ diff --git a/cpu/cc13x2/include/cpu_conf.h b/cpu/cc26x2_cc13x2/include/cpu_conf.h similarity index 83% rename from cpu/cc13x2/include/cpu_conf.h rename to cpu/cc26x2_cc13x2/include/cpu_conf.h index f064013a43..fec3f880c0 100644 --- a/cpu/cc13x2/include/cpu_conf.h +++ b/cpu/cc26x2_cc13x2/include/cpu_conf.h @@ -7,7 +7,7 @@ */ /** - * @addtogroup cpu_cc13x2 + * @addtogroup cpu_cc26x2_cc13x2 * @{ * * @file @@ -24,9 +24,9 @@ #define __FPU_PRESENT 1U /**< Presence of FPU */ #include "cpu_conf_cc26xx_cc13xx.h" -#include "cc13x2_aux.h" -#include "cc13x2_fcfg.h" -#include "cc13x2_prcm.h" +#include "cc26x2_cc13x2_aux.h" +#include "cc26x2_cc13x2_fcfg.h" +#include "cc26x2_cc13x2_prcm.h" #ifdef __cplusplus extern "C" { diff --git a/cpu/cc13x2/include/periph_cpu.h b/cpu/cc26x2_cc13x2/include/periph_cpu.h similarity index 93% rename from cpu/cc13x2/include/periph_cpu.h rename to cpu/cc26x2_cc13x2/include/periph_cpu.h index 319f805e61..ab750f8765 100644 --- a/cpu/cc13x2/include/periph_cpu.h +++ b/cpu/cc26x2_cc13x2/include/periph_cpu.h @@ -7,7 +7,7 @@ */ /** - * @ingroup cpu_cc13x2 + * @ingroup cpu_cc26x2_cc13x2 * @{ * * @file diff --git a/cpu/cc13x2/periph/Makefile b/cpu/cc26x2_cc13x2/periph/Makefile similarity index 100% rename from cpu/cc13x2/periph/Makefile rename to cpu/cc26x2_cc13x2/periph/Makefile diff --git a/cpu/cc13x2/pm.c b/cpu/cc26x2_cc13x2/pm.c similarity index 100% rename from cpu/cc13x2/pm.c rename to cpu/cc26x2_cc13x2/pm.c diff --git a/cpu/cc26xx_cc13xx/doc.txt b/cpu/cc26xx_cc13xx/doc.txt index 9115a9bc71..fa5f56731c 100644 --- a/cpu/cc26xx_cc13xx/doc.txt +++ b/cpu/cc26xx_cc13xx/doc.txt @@ -4,7 +4,7 @@ * @brief Common code for TI cc26xx/cc13xx family * * This module contains code common to all cc26xx/cc13xx cpus - * supported by RIOT: @ref cpu_cc26x0, @ref cpu_cc13x2 + * supported by RIOT: @ref cpu_cc26x0, @ref cpu_cc26x2_cc13x2 * */ @@ -14,6 +14,6 @@ * @brief Common definitions for TI cc26xx/cc13xx family * * This module contains definitions common to all cc26xx/cc13xx cpus - * supported by RIOT: @ref cpu_cc26x0, @ref cpu_cc13x2 + * supported by RIOT: @ref cpu_cc26x0, @ref cpu_cc26x2_cc13x2 * */ diff --git a/cpu/cc26xx_cc13xx/include/cc26xx_cc13xx.h b/cpu/cc26xx_cc13xx/include/cc26xx_cc13xx.h index 2047734384..6b43769607 100644 --- a/cpu/cc26xx_cc13xx/include/cc26xx_cc13xx.h +++ b/cpu/cc26xx_cc13xx/include/cc26xx_cc13xx.h @@ -7,11 +7,11 @@ */ /** - * @ingroup cpu_cc13x2_definitions + * @ingroup cpu_cc26xx_cc13xx_definitions * @{ * * @file - * @brief CC13x2 MCU interrupt definitions + * @brief CC26xx, CC13xx definitions * * @author Leon M. George * @author Anton Gerasimov