michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arm: cmsis: cleanup use of _SCS_CPACR_CP1{0,1}_Pos define

Browse source 
_SCS_CPACR_CP10_Pos and _SCS_CPACR_CP11_Pos come from scs.h, we have
versions defined in cmsis.h we should be using instead.

Change-Id: Icd8db02000bbc9ef8b2cf89d359e008f62a7d5e9
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2017-01-28 14:54:40 -06:00 • committed by Maureen Helm
commit 3a7cc31e08
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
include/arch/arm/cortex_m/cmsis.h
View file

@ -22,19 +22,19 @@ extern "C" {
/* CP10 Access Bits */ /* CP10 Access Bits */
#define CPACR_CP10_Pos 20U #define CPACR_CP10_Pos 20U
#define CPACR_CP10_Msk (3UL << _SCS_CPACR_CP10_Pos) #define CPACR_CP10_Msk (3UL << CPACR_CP10_Pos)
#define CPACR_CP10_NO_ACCESS (0UL << _SCS_CPACR_CP10_Pos) #define CPACR_CP10_NO_ACCESS (0UL << CPACR_CP10_Pos)
#define CPACR_CP10_PRIV_ACCESS (1UL << _SCS_CPACR_CP10_Pos) #define CPACR_CP10_PRIV_ACCESS (1UL << CPACR_CP10_Pos)
#define CPACR_CP10_RESERVED (2UL << _SCS_CPACR_CP10_Pos) #define CPACR_CP10_RESERVED (2UL << CPACR_CP10_Pos)
#define CPACR_CP10_FULL_ACCESS (3UL << _SCS_CPACR_CP10_Pos) #define CPACR_CP10_FULL_ACCESS (3UL << CPACR_CP10_Pos)
/* CP11 Access Bits */ /* CP11 Access Bits */
#define CPACR_CP11_Pos 22U #define CPACR_CP11_Pos 22U
#define CPACR_CP11_Msk (3UL << _SCS_CPACR_CP11_Pos) #define CPACR_CP11_Msk (3UL << CPACR_CP11_Pos)
#define CPACR_CP11_NO_ACCESS (0UL << _SCS_CPACR_CP11_Pos) #define CPACR_CP11_NO_ACCESS (0UL << CPACR_CP11_Pos)
#define CPACR_CP11_PRIV_ACCESS (1UL << _SCS_CPACR_CP11_Pos) #define CPACR_CP11_PRIV_ACCESS (1UL << CPACR_CP11_Pos)
#define CPACR_CP11_RESERVED (2UL << _SCS_CPACR_CP11_Pos) #define CPACR_CP11_RESERVED (2UL << CPACR_CP11_Pos)
#define CPACR_CP11_FULL_ACCESS (3UL << _SCS_CPACR_CP11_Pos) #define CPACR_CP11_FULL_ACCESS (3UL << CPACR_CP11_Pos)
#define SCB_UFSR (*((__IOM uint16_t *) &SCB->CFSR + 2)) #define SCB_UFSR (*((__IOM uint16_t *) &SCB->CFSR + 2))
#define SCB_BFSR (*((__IOM uint8_t *) &SCB->CFSR + 1)) #define SCB_BFSR (*((__IOM uint8_t *) &SCB->CFSR + 1))