This is an automated email from the ASF dual-hosted git repository. aguettouche 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 3503098 tiva/cc13x2_cc26x2: Fix nxstyle errors 3503098 is described below commit 350309856d14aa50cc9775fc8ef879cce0137acd Author: Nathan Hartman <59230071+hartmannat...@users.noreply.github.com> AuthorDate: Sun Nov 8 10:33:03 2020 -0500 tiva/cc13x2_cc26x2: Fix nxstyle errors arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_flash.h: * Fix nxstyle errors. --- .../hardware/cc13x2_cc26x2/cc13x2_cc26x2_flash.h | 34 +++++++++++++++------- 1 file changed, 24 insertions(+), 10 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 84a18a1..f3dea1c 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 @@ -1,10 +1,11 @@ -/**************************************************************************************************** +/**************************************************************************** * arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_flash.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt <gn...@nuttx.org> * - * Technical content derives from a TI header file that has a compatible BSD license: + * Technical content derives from a TI header file that has a compatible BSD + * license: * * Copyright (c) 2015-2017, Texas Instruments Incorporated * All rights reserved. @@ -36,23 +37,23 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ****************************************************************************************************/ + ****************************************************************************/ #ifndef __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_FLASH_H #define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_FLASH_H -/**************************************************************************************************** +/**************************************************************************** * Included Files - ****************************************************************************************************/ + ****************************************************************************/ #include <nuttx/config.h> #include "hardware/tiva_memorymap.h" -/**************************************************************************************************** +/**************************************************************************** * Pre-processor Definitions - ****************************************************************************************************/ + ****************************************************************************/ -/* FLASH Register Offsets ***************************************************************************/ +/* FLASH Register Offsets ***************************************************/ #define TIVA_FLASH_STAT_OFFSET 0x001c /* FMC and Efuse Status */ #define TIVA_FLASH_CFG_OFFSET 0x0024 @@ -179,7 +180,7 @@ #define TIVA_FLASH_FCFG_B7_START_OFFSET 0x242c #define TIVA_FLASH_FCFG_B0_SSIZE0_OFFSET 0x2430 -/* FLASH Register Addresses *************************************************************************/ +/* FLASH Register Addresses *************************************************/ #define TIVA_FLASH_STAT (TIVA_FLASH_BASE + TIVA_FLASH_STAT_OFFSET) #define TIVA_FLASH_CFG (TIVA_FLASH_BASE + TIVA_FLASH_CFG_OFFSET) @@ -306,7 +307,7 @@ #define TIVA_FLASH_FCFG_B7_START (TIVA_FLASH_BASE + TIVA_FLASH_FCFG_B7_START_OFFSET) #define TIVA_FLASH_FCFG_B0_SSIZE0 (TIVA_FLASH_BASE + TIVA_FLASH_FCFG_B0_SSIZE0_OFFSET) -/* FLASH Bitfield Definitions ***********************************************************************/ +/* FLASH Bitfield Definitions ***********************************************/ /* TIVA_FLASH_STAT */ @@ -496,6 +497,7 @@ #define FLASH_TWOBIT_FROMN_MASK (0x7fffffff << FLASH_TWOBIT_FROMN_SHIFT) /* TIVA_FLASH_SELFTESTCYC (32-bit value) */ + /* TIVA_FLASH_SELFTESTSIGN (32-bit value) */ /* TIVA_FLASH_FRDCTL */ @@ -728,12 +730,19 @@ #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_FWPWRITE_ECC */ @@ -993,10 +1002,15 @@ #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_BSLP0 (32-bit value) */ + /* TIVA_FLASH_FSM_BSLP1 (32-bit value) */ /* TIVA_FLASH_FSM_PGM128 */