Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tiva/cc13x2_cc26x2: Fix nxstyle errors #2067

Merged
merged 1 commit into from
Oct 22, 2020
Merged

tiva/cc13x2_cc26x2: Fix nxstyle errors #2067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_ccfg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/************************************************************************************************************
/****************************************************************************
* arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_ccfg.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <[email protected]>
*
* 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.
Expand Down Expand Up @@ -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_CCFG_H
#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_CCFG_H

/************************************************************************************************************
/****************************************************************************
* Included Files
************************************************************************************************************/
****************************************************************************/

#include <nuttx/config.h>
#include "hardware/tiva_memorymap.h"

/************************************************************************************************************
/****************************************************************************
* Pre-processor Definitions
************************************************************************************************************/
****************************************************************************/

/* CCFG Register Offsets ************************************************************************************/
/* CCFG Register Offsets ****************************************************/

#define TIVA_CCFG_EXT_LF_CLK_OFFSET 0x1fa8 /* Extern LF clock configuration */
#define TIVA_CCFG_MODE_CONF_1_OFFSET 0x1fac /* Mode Configuration 1 */
Expand All @@ -77,7 +78,7 @@
#define TIVA_CCFG_CCFG_PROT_95_64_OFFSET 0x1ff8 /* Protect Sectors 64-95 */
#define TIVA_CCFG_CCFG_PROT_127_96_OFFSET 0x1ffc /* Protect Sectors 96-127 */

/* CCFG Register Addresses **********************************************************************************/
/* CCFG Register Addresses **************************************************/

#define TIVA_CCFG_EXT_LF_CLK (TIVA_CCFG_BASE + TIVA_CCFG_EXT_LF_CLK_OFFSET)
#define TIVA_CCFG_MODE_CONF_1 (TIVA_CCFG_BASE + TIVA_CCFG_MODE_CONF_1_OFFSET)
Expand All @@ -102,7 +103,7 @@
#define TIVA_CCFG_CCFG_PROT_95_64 (TIVA_CCFG_BASE + TIVA_CCFG_CCFG_PROT_95_64_OFFSET)
#define TIVA_CCFG_CCFG_PROT_127_96 (TIVA_CCFG_BASE + TIVA_CCFG_CCFG_PROT_127_96_OFFSET)

/* CCFG Bifield Definitions *********************************************************************************/
/* CCFG Bifield Definitions *************************************************/

/* TIVA_CCFG_EXT_LF_CLK */

Expand Down Expand Up @@ -217,8 +218,11 @@
#define CCFG_FREQ_OFFSET_HF_COMP_P0_MASK (0xffff << CCFG_FREQ_OFFSET_HF_COMP_P0_SHIFT)

/* TIVA_CCFG_IEEE_MAC_0 (32-bit value) */

/* TIVA_CCFG_IEEE_MAC_1 (32-bit value) */

/* TIVA_CCFG_IEEE_BLE_0 (32-bit value) */

/* TIVA_CCFG_IEEE_BLE_1 (32-bit value) */

/* TIVA_CCFG_BL_CONFIG */
Expand Down
47 changes: 24 additions & 23 deletions arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_vims.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/********************************************************************************************************************
/****************************************************************************
* arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_vims.h
*
* Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <[email protected]>
*
* 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.
Expand Down Expand Up @@ -36,61 +37,61 @@
* 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_VIMS_H
#define __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_VIMS_H

/********************************************************************************************************************
/****************************************************************************
* Included Files
********************************************************************************************************************/
****************************************************************************/

#include <nuttx/config.h>
#include "hardware/tiva_memorymap.h"

/********************************************************************************************************************
/****************************************************************************
* Pre-processor Definitions
********************************************************************************************************************/
****************************************************************************/

/* VIMS Register Offsets ********************************************************************************************/
/* VIMS Register Offsets ****************************************************/

#define TIVA_VIMS_STAT_OFFSET 0x0000 /* Status */
#define TIVA_VIMS_CTL_OFFSET 0x0004 /* Control */

/* VIMS Register Addresses ******************************************************************************************/
/* VIMS Register Addresses **************************************************/

#define TIVA_VIMS_STAT (TIVA_VIMS_BASE + TIVA_VIMS_STAT_OFFSET)
#define TIVA_VIMS_CTL (TIVA_VIMS_BASE + TIVA_VIMS_CTL_OFFSET)

/* VIMS Bitfield Definitions ****************************************************************************************/
/* VIMS Bitfield Definitions ************************************************/

/* VIMS_STAT */

#define VIMS_STAT_MODE_SHIFT (0) /* Bits 0-1: Current VMS mode */
#define VIMS_STAT_MODE_SHIFT (0) /* Bits 0-1: Current VMS mode */
#define VIMS_STAT_MODE_MASK (3 << VIMS_STAT_MODE_SHIFT)
# define VIMS_STAT_MODE_GPRAM (0 << VIMS_STAT_MODE_SHIFT) /* VIMS GPRAM mode */
# define VIMS_STAT_MODE_CACHE (1 << VIMS_STAT_MODE_SHIFT) /* VIMS Cache mode */
# define VIMS_STAT_MODE_OFF (3 << VIMS_STAT_MODE_SHIFT) /* VIMS Off mode */
#define VIMS_STAT_INV (1 << 2) /* Bit 2: Invalidation of caching memory in-progress */
#define VIMS_STAT_MODE_CHANGING (1 << 3) /* Bit 3: VIMS mode change status */
#define VIMS_STAT_SYSBUS_LB_DIS (1 << 4) /* Bit 4: Sysbus flash line buffer control */
#define VIMS_STAT_IDCODE_LB_DIS (1 << 5) /* Bit 5: Icode/Dcode flash line buffer status */
#define VIMS_STAT_INV (1 << 2) /* Bit 2: Invalidation of caching memory in-progress */
#define VIMS_STAT_MODE_CHANGING (1 << 3) /* Bit 3: VIMS mode change status */
#define VIMS_STAT_SYSBUS_LB_DIS (1 << 4) /* Bit 4: Sysbus flash line buffer control */
#define VIMS_STAT_IDCODE_LB_DIS (1 << 5) /* Bit 5: Icode/Dcode flash line buffer status */

/* VIMS_CTL */

#define VIMS_CTL_MODE_SHIFT (0) /* Bits 0-1: Current VMS mode */
#define VIMS_CTL_MODE_SHIFT (0) /* Bits 0-1: Current VMS mode */
#define VIMS_CTL_MODE_MASK (3 << VIMS_CTL_MODE_SHIFT)
# define VIMS_CTL_MODE_GPRAM (0 << VIMS_CTL_MODE_SHIFT) /* VIMS GPRAM mode */
# define VIMS_CTL_MODE_CACHE (1 << VIMS_CTL_MODE_SHIFT) /* VIMS Cache mode */
# define VIMS_CTL_MODE_OFF (3 << VIMS_CTL_MODE_SHIFT) /* VIMS Off mode */
#define VIMS_CTL_PREF_EN (1 << 2) /* Bit 2: Tag prefetch control */
#define VIMS_CTL_ARB_CFG (1 << 3) /* Bit 3: Icode/Dcode and sysbus arbitation scheme */
#define VIMS_CTL_PREF_EN (1 << 2) /* Bit 2: Tag prefetch control */
#define VIMS_CTL_ARB_CFG (1 << 3) /* Bit 3: Icode/Dcode and sysbus arbitation scheme */
# define VIMS_CTL_ARB_STATIC (0)
# define VIMS_CTL_ARB_ROUNDROBIN VIMS_CTL_ARB_CFG
#define VIMS_CTL_SYSBUS_LB_DIS (1 << 4) /* Bit 4: Sysbus flash line buffer control */
#define VIMS_CTL_IDCODE_LB_DIS (1 << 5) /* Bit 5: Icode/Dcode flash line buffer control */
#define VIMS_CTL_DYN_CG_EN (1 << 29) /* Bit 29: Enable in-built clock gate */
#define VIMS_CTL_STATS_EN (1 << 30) /* Bit 30: Enable statistic counters */
#define VIMS_CTL_STATS_CLR (1 << 31) /* Bit 31: Clear statistics counters */
#define VIMS_CTL_SYSBUS_LB_DIS (1 << 4) /* Bit 4: Sysbus flash line buffer control */
#define VIMS_CTL_IDCODE_LB_DIS (1 << 5) /* Bit 5: Icode/Dcode flash line buffer control */
#define VIMS_CTL_DYN_CG_EN (1 << 29) /* Bit 29: Enable in-built clock gate */
#define VIMS_CTL_STATS_EN (1 << 30) /* Bit 30: Enable statistic counters */
#define VIMS_CTL_STATS_CLR (1 << 31) /* Bit 31: Clear statistics counters */

#endif /* __ARCH_ARM_SRC_TIVA_HARDWARE_CC13X2_CC26X2_CC13X2_CC26X2_VIMS_H */