Merge pull request RIOT-OS#13166 from jeandudey/2020_01_19-cc26x2-cc13x2

cpu/cc13x2: rename cpu to cc26x2_cc13x2.
bosmoment · Feb 4, 2020 · cc90a89 · cc90a89
2 parents 8e85c2d + a73f380
commit cc90a89
Show file tree

Hide file tree

Showing 17 changed files with 46 additions and 46 deletions.
diff --git 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
@@ -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
diff --git a/cpu/cc13x2/Makefile → cpu/cc26x2_cc13x2/Makefile b/cpu/cc13x2/Makefile → cpu/cc26x2_cc13x2/Makefile
diff --git a/cpu/cc13x2/Makefile.features → cpu/cc26x2_cc13x2/Makefile.features b/cpu/cc13x2/Makefile.features → cpu/cc26x2_cc13x2/Makefile.features
diff --git a/cpu/cc13x2/Makefile.include → cpu/cc26x2_cc13x2/Makefile.include b/cpu/cc13x2/Makefile.include → cpu/cc26x2_cc13x2/Makefile.include
diff --git a/cpu/cc13x2/cpu.c → cpu/cc26x2_cc13x2/cpu.c b/cpu/cc13x2/cpu.c → 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
@@ -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 → ...cc26x2_cc13x2/include/cc26x2_cc13x2_aux.h b/cpu/cc13x2/include/cc13x2_aux.h → ...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 <stdbool.h>
 
@@ -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 → ...c26x2_cc13x2/include/cc26x2_cc13x2_fcfg.h b/cpu/cc13x2/include/cc13x2_fcfg.h → ...c26x2_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 <cc26xx_cc13xx.h>
 
@@ -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 → ...c26x2_cc13x2/include/cc26x2_cc13x2_prcm.h b/cpu/cc13x2/include/cc13x2_prcm.h → ...c26x2_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 <cc26xx_cc13xx.h>
 
@@ -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 → cpu/cc26x2_cc13x2/include/cpu_conf.h b/cpu/cc13x2/include/cpu_conf.h → 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 → cpu/cc26x2_cc13x2/include/periph_cpu.h b/cpu/cc13x2/include/periph_cpu.h → 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 → cpu/cc26x2_cc13x2/periph/Makefile b/cpu/cc13x2/periph/Makefile → cpu/cc26x2_cc13x2/periph/Makefile
diff --git a/cpu/cc13x2/pm.c → cpu/cc26x2_cc13x2/pm.c b/cpu/cc13x2/pm.c → cpu/cc26x2_cc13x2/pm.c
diff --git 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
@@ -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 <[email protected]>
  * @author          Anton Gerasimov <[email protected]>
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
      */
     /**
-     * @ingroup         cpu_cc13x2
+     * @ingroup         cpu_cc26x2_cc13x2
      * @{
      *
      * @file
@@ Expand Down @@