You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by bt...@apache.org on 2020/11/08 21:40:06 UTC
[incubator-nuttx] branch master updated: tiva/cc13x2_cc26x2: Merge
related comments
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 8e00110 tiva/cc13x2_cc26x2: Merge related comments
8e00110 is described below
commit 8e00110449dc65aaee1bebd75be6fadc4a95c932
Author: Nathan Hartman <59...@users.noreply.github.com>
AuthorDate: Sun Nov 8 16:06:15 2020 -0500
tiva/cc13x2_cc26x2: Merge related comments
arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_flash.h:
* Merge comments when they are section separators for
similar/related registers:
- TIVA_FLASH_FWPWRITE*
- TIVA_FLASH_FSM_SECTOR1*
- TIVA_FLASH_FSM_BSLE*
- TIVA_FLASH_FSM_BSLP*
---
.../hardware/cc13x2_cc26x2/cc13x2_cc26x2_flash.h | 42 ++++++++++------------
1 file changed, 18 insertions(+), 24 deletions(-)
diff --git a/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_flash.h b/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_flash.h
index f3dea1c..e68b86b 100644
--- a/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_flash.h
+++ b/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_flash.h
@@ -729,21 +729,15 @@
#define FLASH_FTCTL_TEST_EN (1 << 1) /* Bit 1 */
#define FLASH_FTCTL_WDATA_BLK_CLR (1 << 16) /* Bit 16 */
-/* TIVA_FLASH_FWPWRITE0 (32-bit value) */
-
-/* TIVA_FLASH_FWPWRITE1 (32-bit value) */
-
-/* TIVA_FLASH_FWPWRITE2 (32-bit value) */
-
-/* TIVA_FLASH_FWPWRITE3 (32-bit value) */
-
-/* TIVA_FLASH_FWPWRITE4 (32-bit value) */
-
-/* TIVA_FLASH_FWPWRITE5 (32-bit value) */
-
-/* TIVA_FLASH_FWPWRITE6 (32-bit value) */
-
-/* TIVA_FLASH_FWPWRITE7 (32-bit value) */
+/* TIVA_FLASH_FWPWRITE0 (32-bit value)
+ * TIVA_FLASH_FWPWRITE1 (32-bit value)
+ * TIVA_FLASH_FWPWRITE2 (32-bit value)
+ * TIVA_FLASH_FWPWRITE3 (32-bit value)
+ * TIVA_FLASH_FWPWRITE4 (32-bit value)
+ * TIVA_FLASH_FWPWRITE5 (32-bit value)
+ * TIVA_FLASH_FWPWRITE6 (32-bit value)
+ * TIVA_FLASH_FWPWRITE7 (32-bit value)
+ */
/* TIVA_FLASH_FWPWRITE_ECC */
@@ -1001,17 +995,17 @@
#define FLASH_FSM_EXECUTE_SUSPEND_NOW_SHIFT (16) /* Bits 16-19 */
#define FLASH_FSM_EXECUTE_SUSPEND_NOW_MASK (15 << FLASH_FSM_EXECUTE_SUSPEND_NOW_SHIFT)
-/* TIVA_FLASH_FSM_SECTOR1 (32-bit value) */
-
-/* TIVA_FLASH_FSM_SECTOR2 (32-bit value) */
-
-/* TIVA_FLASH_FSM_BSLE0 (32-bit value) */
-
-/* TIVA_FLASH_FSM_BSLE1 (32-bit value) */
+/* TIVA_FLASH_FSM_SECTOR1 (32-bit value)
+ * TIVA_FLASH_FSM_SECTOR2 (32-bit value)
+ */
-/* TIVA_FLASH_FSM_BSLP0 (32-bit value) */
+/* TIVA_FLASH_FSM_BSLE0 (32-bit value)
+ * TIVA_FLASH_FSM_BSLE1 (32-bit value)
+ */
-/* TIVA_FLASH_FSM_BSLP1 (32-bit value) */
+/* TIVA_FLASH_FSM_BSLP0 (32-bit value)
+ * TIVA_FLASH_FSM_BSLP1 (32-bit value)
+ */
/* TIVA_FLASH_FSM_PGM128 */