summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid Cunado <david.cunado@arm.com>2018-02-16 21:12:58 +0000
committerDavid Cunado <david.cunado@arm.com>2018-02-27 17:05:51 +0000
commit5724481fdda01067d3bf4386a3dd07a541d16044 (patch)
treed9261376986d6cc968c9daf8c38e9f9a46cc0103 /include
parent322a98b6322f1b566a5c4ec65fe481dc204b3eb0 (diff)
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 <david.cunado@arm.com>
Diffstat (limited to 'include')
-rw-r--r--include/lib/utils_def.h4
-rw-r--r--include/plat/arm/common/arm_def.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/include/lib/utils_def.h b/include/lib/utils_def.h
index ecb261a1..4a5c3e0b 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 9e6c7d27..95e986bf 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