diff options
author | Zelalem <zelalem.aweke@arm.com> | 2020-02-12 10:37:03 -0600 |
---|---|---|
committer | Zelalem <zelalem.aweke@arm.com> | 2020-02-18 10:47:46 -0600 |
commit | 2fe75a2de087ec23162c5fd25ba439bd330ea50c (patch) | |
tree | 8fdfe111e09b5de4d7495c03ea4cde6ba29ee2af /bl1 | |
parent | 572fcdd547753d668ca1146ca420664ccc3ac6fb (diff) | |
download | arm-trusted-firmware-2fe75a2de087ec23162c5fd25ba439bd330ea50c.tar.gz |
coverity: fix MISRA violations
Fixes for the following MISRA violations:
- Missing explicit parentheses on sub-expression
- An identifier or macro name beginning with an
underscore, shall not be declared
- Type mismatch in BL1 SMC handlers and tspd_main.c
Change-Id: I7a92abf260da95acb0846b27c2997b59b059efc4
Signed-off-by: Zelalem <zelalem.aweke@arm.com>
Diffstat (limited to 'bl1')
-rw-r--r-- | bl1/bl1_fwu.c | 14 | ||||
-rw-r--r-- | bl1/bl1_main.c | 14 | ||||
-rw-r--r-- | bl1/bl1_private.h | 12 |
3 files changed, 20 insertions, 20 deletions
diff --git a/bl1/bl1_fwu.c b/bl1/bl1_fwu.c index 48f08d2ca..42a3ded5b 100644 --- a/bl1/bl1_fwu.c +++ b/bl1/bl1_fwu.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -55,11 +55,11 @@ static unsigned int sec_exec_image_id = INVALID_IMAGE_ID; /******************************************************************************* * Top level handler for servicing FWU SMCs. ******************************************************************************/ -register_t bl1_fwu_smc_handler(unsigned int smc_fid, - register_t x1, - register_t x2, - register_t x3, - register_t x4, +u_register_t bl1_fwu_smc_handler(unsigned int smc_fid, + u_register_t x1, + u_register_t x2, + u_register_t x3, + u_register_t x4, void *cookie, void *handle, unsigned int flags) @@ -76,7 +76,7 @@ register_t bl1_fwu_smc_handler(unsigned int smc_fid, SMC_RET1(handle, bl1_fwu_image_execute(x1, &handle, flags)); case FWU_SMC_IMAGE_RESUME: - SMC_RET1(handle, bl1_fwu_image_resume(x1, &handle, flags)); + SMC_RET1(handle, bl1_fwu_image_resume((register_t)x1, &handle, flags)); case FWU_SMC_SEC_IMAGE_DONE: SMC_RET1(handle, bl1_fwu_sec_image_done(&handle, flags)); diff --git a/bl1/bl1_main.c b/bl1/bl1_main.c index bff8d22f5..e11ead608 100644 --- a/bl1/bl1_main.c +++ b/bl1/bl1_main.c @@ -226,11 +226,11 @@ void print_debug_loop_message(void) /******************************************************************************* * Top level handler for servicing BL1 SMCs. ******************************************************************************/ -register_t bl1_smc_handler(unsigned int smc_fid, - register_t x1, - register_t x2, - register_t x3, - register_t x4, +u_register_t bl1_smc_handler(unsigned int smc_fid, + u_register_t x1, + u_register_t x2, + u_register_t x3, + u_register_t x4, void *cookie, void *handle, unsigned int flags) @@ -269,12 +269,12 @@ register_t bl1_smc_handler(unsigned int smc_fid, * BL1 SMC wrapper. This function is only used in AArch32 mode to ensure ABI * compliance when invoking bl1_smc_handler. ******************************************************************************/ -register_t bl1_smc_wrapper(uint32_t smc_fid, +u_register_t bl1_smc_wrapper(uint32_t smc_fid, void *cookie, void *handle, unsigned int flags) { - register_t x1, x2, x3, x4; + u_register_t x1, x2, x3, x4; assert(handle != NULL); diff --git a/bl1/bl1_private.h b/bl1/bl1_private.h index 927c7b8a2..2cfeeea28 100644 --- a/bl1/bl1_private.h +++ b/bl1/bl1_private.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -19,11 +19,11 @@ void bl1_arch_next_el_setup(void); void bl1_prepare_next_image(unsigned int image_id); -register_t bl1_fwu_smc_handler(unsigned int smc_fid, - register_t x1, - register_t x2, - register_t x3, - register_t x4, +u_register_t bl1_fwu_smc_handler(unsigned int smc_fid, + u_register_t x1, + u_register_t x2, + u_register_t x3, + u_register_t x4, void *cookie, void *handle, unsigned int flags); |