diff options
| author | Daniel Boulby <daniel.boulby@arm.com> | 2018-05-04 14:04:07 +0100 |
|---|---|---|
| committer | Daniel Boulby <daniel.boulby@arm.com> | 2018-06-12 13:21:36 +0100 |
| commit | 896a5902ecd9f8ffd1ad7cfd75ea646351c79fc1 (patch) | |
| tree | e1f93b3a46470ea85d66e072c7c02353e4357d6d /include | |
| parent | d3775d46a43a47c521193229cfcb1c0d6cb4878b (diff) | |
| download | platform_external_arm-trusted-firmware-896a5902ecd9f8ffd1ad7cfd75ea646351c79fc1.tar.gz platform_external_arm-trusted-firmware-896a5902ecd9f8ffd1ad7cfd75ea646351c79fc1.tar.bz2 platform_external_arm-trusted-firmware-896a5902ecd9f8ffd1ad7cfd75ea646351c79fc1.zip | |
Fix MISRA Rule 5.3 Part 2
Use a _ prefix for Macro arguments to prevent that argument from
hiding variables of the same name in the outer scope
Rule 5.3: An identifier declared in an inner scope shall not
hide an identifier declared in an outer scope
Fixed For:
make LOG_LEVEL=50 PLAT=fvp
Change-Id: I67b6b05cbad4aeca65ce52981b4679b340604708
Signed-off-by: Daniel Boulby <daniel.boulby@arm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/lib/xlat_tables/aarch32/xlat_tables_aarch32.h | 6 | ||||
| -rw-r--r-- | include/lib/xlat_tables/aarch64/xlat_tables_aarch64.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/lib/xlat_tables/aarch32/xlat_tables_aarch32.h b/include/lib/xlat_tables/aarch32/xlat_tables_aarch32.h index a418d2dd6..808589ac3 100644 --- a/include/lib/xlat_tables/aarch32/xlat_tables_aarch32.h +++ b/include/lib/xlat_tables/aarch32/xlat_tables_aarch32.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -66,7 +66,7 @@ * valid. Therefore, the caller is expected to check it is the case using the * CHECK_VIRT_ADDR_SPACE_SIZE() macro first. */ -#define GET_XLAT_TABLE_LEVEL_BASE(virt_addr_space_size) \ - (((virt_addr_space_size) > (ULL(1) << L1_XLAT_ADDRESS_SHIFT)) ? 1 : 2) +#define GET_XLAT_TABLE_LEVEL_BASE(_virt_addr_space_size) \ + (((_virt_addr_space_size) > (ULL(1) << L1_XLAT_ADDRESS_SHIFT)) ? 1 : 2) #endif /* __XLAT_TABLES_AARCH32_H__ */ diff --git a/include/lib/xlat_tables/aarch64/xlat_tables_aarch64.h b/include/lib/xlat_tables/aarch64/xlat_tables_aarch64.h index 6021e4070..ad48a358a 100644 --- a/include/lib/xlat_tables/aarch64/xlat_tables_aarch64.h +++ b/include/lib/xlat_tables/aarch64/xlat_tables_aarch64.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -74,10 +74,10 @@ unsigned long long tcr_physical_addr_size_bits(unsigned long long max_addr); * valid. Therefore, the caller is expected to check it is the case using the * CHECK_VIRT_ADDR_SPACE_SIZE() macro first. */ -#define GET_XLAT_TABLE_LEVEL_BASE(virt_addr_space_size) \ - (((virt_addr_space_size) > (ULL(1) << L0_XLAT_ADDRESS_SHIFT)) \ +#define GET_XLAT_TABLE_LEVEL_BASE(_virt_addr_space_size) \ + (((_virt_addr_space_size) > (ULL(1) << L0_XLAT_ADDRESS_SHIFT)) \ ? 0 \ - : (((virt_addr_space_size) > (ULL(1) << L1_XLAT_ADDRESS_SHIFT)) \ + : (((_virt_addr_space_size) > (ULL(1) << L1_XLAT_ADDRESS_SHIFT)) \ ? 1 : 2)) #endif /* __XLAT_TABLES_AARCH64_H__ */ |