diff options
author | Mark Dykes <mardyk01@review.trustedfirmware.org> | 2020-04-04 19:58:56 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-04-04 19:58:56 +0000 |
commit | 37d56d3829f86ee5808b5f4a5a6b4dbdbb1bab67 (patch) | |
tree | 56e9ee11ce969bc2b8e728ac512be7189b636ad5 /include/lib | |
parent | 083e123afaca7efb484086f947849d14aa381463 (diff) | |
parent | 3443a7027d78a9ccebc6940f0a69300ec7c1ed44 (diff) | |
download | trusted-firmware-a-37d56d3829f86ee5808b5f4a5a6b4dbdbb1bab67.tar.gz |
Merge "Fix MISRA C issues in BL1/BL2/BL31" into integration
Diffstat (limited to 'include/lib')
-rw-r--r-- | include/lib/smccc.h | 22 | ||||
-rw-r--r-- | include/lib/utils_def.h | 4 |
2 files changed, 13 insertions, 13 deletions
diff --git a/include/lib/smccc.h b/include/lib/smccc.h index 5e13e6f0a5..26509aeca9 100644 --- a/include/lib/smccc.h +++ b/include/lib/smccc.h @@ -122,18 +122,18 @@ */ #define DEFINE_SVC_UUID2(_name, _tl, _tm, _th, _cl, _ch, \ _n0, _n1, _n2, _n3, _n4, _n5) \ - CASSERT((uint32_t)(_tl) != (uint32_t) SMC_UNK, invalid_svc_uuid);\ + CASSERT((uint32_t)(_tl) != (uint32_t)SMC_UNK, invalid_svc_uuid);\ static const uuid_t _name = { \ - {(_tl >> 24) & 0xFF, \ - (_tl >> 16) & 0xFF, \ - (_tl >> 8) & 0xFF, \ - (_tl & 0xFF)}, \ - {(_tm >> 8) & 0xFF, \ - (_tm & 0xFF)}, \ - {(_th >> 8) & 0xFF, \ - (_th & 0xFF)}, \ - _cl, _ch, \ - { _n0, _n1, _n2, _n3, _n4, _n5 } \ + {((_tl) >> 24) & 0xFF, \ + ((_tl) >> 16) & 0xFF, \ + ((_tl) >> 8) & 0xFF, \ + ((_tl) & 0xFF)}, \ + {((_tm) >> 8) & 0xFF, \ + ((_tm) & 0xFF)}, \ + {((_th) >> 8) & 0xFF, \ + ((_th) & 0xFF)}, \ + (_cl), (_ch), \ + { (_n0), (_n1), (_n2), (_n3), (_n4), (_n5) } \ } /* diff --git a/include/lib/utils_def.h b/include/lib/utils_def.h index 09ae3999db..2d0e9c08eb 100644 --- a/include/lib/utils_def.h +++ b/include/lib/utils_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2020, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2020, NVIDIA Corporation. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -17,7 +17,7 @@ #define IS_POWER_OF_TWO(x) \ (((x) & ((x) - 1)) == 0) -#define SIZE_FROM_LOG2_WORDS(n) (4 << (n)) +#define SIZE_FROM_LOG2_WORDS(n) (U(4) << (n)) #define BIT_32(nr) (U(1) << (nr)) #define BIT_64(nr) (ULL(1) << (nr)) |