From 5724481fdda01067d3bf4386a3dd07a541d16044 Mon Sep 17 00:00:00 2001 From: David Cunado Date: Fri, 16 Feb 2018 21:12:58 +0000 Subject: Update ULL() macro and instances of ull to comply with MISRA MISRA C-2012 Rule 7.3 violation: lowercase l shall not be used as literal suffixes. This patch resolves this for the ULL() macro by using ULL suffix instead of the ull suffix. Change-Id: Ia8183c399e74677e676956e8653e82375d0e0a01 Signed-off-by: David Cunado --- include/lib/utils_def.h | 4 ++-- include/plat/arm/common/arm_def.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/lib/utils_def.h b/include/lib/utils_def.h index ecb261a1d..4a5c3e0bc 100644 --- a/include/lib/utils_def.h +++ b/include/lib/utils_def.h @@ -80,8 +80,8 @@ # define U(_x) (_x) # define ULL(_x) (_x) #else -# define U(_x) (_x##u) -# define ULL(_x) (_x##ull) +# define U(_x) (_x##U) +# define ULL(_x) (_x##ULL) #endif /* Register size of the current architecture. */ diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index 9e6c7d27a..95e986bf2 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -279,11 +279,11 @@ * AArch64 builds */ #ifdef AARCH64 -#define PLAT_PHY_ADDR_SPACE_SIZE (1ull << 36) -#define PLAT_VIRT_ADDR_SPACE_SIZE (1ull << 36) +#define PLAT_PHY_ADDR_SPACE_SIZE (1ULL << 36) +#define PLAT_VIRT_ADDR_SPACE_SIZE (1ULL << 36) #else -#define PLAT_PHY_ADDR_SPACE_SIZE (1ull << 32) -#define PLAT_VIRT_ADDR_SPACE_SIZE (1ull << 32) +#define PLAT_PHY_ADDR_SPACE_SIZE (1ULL << 32) +#define PLAT_VIRT_ADDR_SPACE_SIZE (1ULL << 32) #endif -- cgit v1.2.3