From 6c77e7491563979a3a0ba5eb8b8c6a073cb5c2cb Mon Sep 17 00:00:00 2001 From: Sandrine Bailleux Date: Wed, 11 Jul 2018 12:44:22 +0200 Subject: [PATCH] Fix some violations to MISRA rule 8.3 Wherever we use 'struct foo' and 'foo_t' interchangeably in a function's declaration and definition, use 'struct foo' consistently for both, as per the TF-A coding guidelines [1]. [1] https://github.com/ARM-software/arm-trusted-firmware/wiki/ARM-Trusted-Firmware-Coding-Guidelines#avoid-anonymous-typedefs-of-structsenums-in-header-files Change-Id: I7998eb24a26746e87e9b6425529926406745b721 Signed-off-by: Sandrine Bailleux --- bl1/bl1_main.c | 4 ++-- plat/arm/board/fvp/fvp_bl2u_setup.c | 2 +- plat/arm/common/arm_bl1_setup.c | 2 +- plat/arm/common/arm_bl2_setup.c | 3 ++- plat/arm/common/arm_bl2u_setup.c | 4 ++-- plat/arm/common/arm_bl31_setup.c | 2 +- plat/arm/common/arm_image_load.c | 4 ++-- plat/common/plat_bl1_common.c | 4 ++-- services/spd/opteed/opteed_main.c | 2 +- services/spd/opteed/opteed_private.h | 2 +- 10 files changed, 15 insertions(+), 14 deletions(-) diff --git a/bl1/bl1_main.c b/bl1/bl1_main.c index 64b363c5f..047cd6fb8 100644 --- a/bl1/bl1_main.c +++ b/bl1/bl1_main.c @@ -74,8 +74,8 @@ void bl1_calc_bl2_mem_layout(const meminfo_t *bl1_mem_layout, * populates a new memory layout for BL2 that ensures that BL1's data sections * resident in secure RAM are not visible to BL2. ******************************************************************************/ -void bl1_init_bl2_mem_layout(const meminfo_t *bl1_mem_layout, - meminfo_t *bl2_mem_layout) +void bl1_init_bl2_mem_layout(const struct meminfo *bl1_mem_layout, + struct meminfo *bl2_mem_layout) { bl1_calc_bl2_mem_layout(bl1_mem_layout, bl2_mem_layout); } diff --git a/plat/arm/board/fvp/fvp_bl2u_setup.c b/plat/arm/board/fvp/fvp_bl2u_setup.c index 361e84de2..b9ab3f36e 100644 --- a/plat/arm/board/fvp/fvp_bl2u_setup.c +++ b/plat/arm/board/fvp/fvp_bl2u_setup.c @@ -9,7 +9,7 @@ #include "fvp_def.h" #include "fvp_private.h" -void bl2u_early_platform_setup(meminfo_t *mem_layout, void *plat_info) +void bl2u_early_platform_setup(struct meminfo *mem_layout, void *plat_info) { arm_bl2u_early_platform_setup(mem_layout, plat_info); diff --git a/plat/arm/common/arm_bl1_setup.c b/plat/arm/common/arm_bl1_setup.c index d141f647e..1c900b728 100644 --- a/plat/arm/common/arm_bl1_setup.c +++ b/plat/arm/common/arm_bl1_setup.c @@ -27,7 +27,7 @@ /* Data structure which holds the extents of the trusted SRAM for BL1*/ static meminfo_t bl1_tzram_layout; -meminfo_t *bl1_plat_sec_mem_layout(void) +struct meminfo *bl1_plat_sec_mem_layout(void) { return &bl1_tzram_layout; } diff --git a/plat/arm/common/arm_bl2_setup.c b/plat/arm/common/arm_bl2_setup.c index 3aa99f805..33c2fe85e 100644 --- a/plat/arm/common/arm_bl2_setup.c +++ b/plat/arm/common/arm_bl2_setup.c @@ -172,7 +172,8 @@ struct entry_point_info *bl2_plat_get_bl31_ep_info(void) * in x0. This memory layout is sitting at the base of the free trusted SRAM. * Copy it to a safe location before its reclaimed by later BL2 functionality. ******************************************************************************/ -void arm_bl2_early_platform_setup(uintptr_t tb_fw_config, meminfo_t *mem_layout) +void arm_bl2_early_platform_setup(uintptr_t tb_fw_config, + struct meminfo *mem_layout) { /* Initialize the console to provide early debug support */ arm_console_boot_init(); diff --git a/plat/arm/common/arm_bl2u_setup.c b/plat/arm/common/arm_bl2u_setup.c index cd691e5c3..dce00e5bd 100644 --- a/plat/arm/common/arm_bl2u_setup.c +++ b/plat/arm/common/arm_bl2u_setup.c @@ -32,7 +32,7 @@ void bl2u_platform_setup(void) arm_bl2u_platform_setup(); } -void arm_bl2u_early_platform_setup(meminfo_t *mem_layout, void *plat_info) +void arm_bl2u_early_platform_setup(struct meminfo *mem_layout, void *plat_info) { /* Initialize the console to provide early debug support */ arm_console_boot_init(); @@ -46,7 +46,7 @@ void arm_bl2u_early_platform_setup(meminfo_t *mem_layout, void *plat_info) * In case of ARM FVP platforms x1 is not used. * In both cases, x0 contains the extents of the memory available to BL2U ******************************************************************************/ -void bl2u_early_platform_setup(meminfo_t *mem_layout, void *plat_info) +void bl2u_early_platform_setup(struct meminfo *mem_layout, void *plat_info) { arm_bl2u_early_platform_setup(mem_layout, plat_info); } diff --git a/plat/arm/common/arm_bl31_setup.c b/plat/arm/common/arm_bl31_setup.c index 6346f0fff..b1f95c957 100644 --- a/plat/arm/common/arm_bl31_setup.c +++ b/plat/arm/common/arm_bl31_setup.c @@ -44,7 +44,7 @@ CASSERT(BL31_BASE >= ARM_TB_FW_CONFIG_LIMIT, assert_bl31_base_overflows); * while BL32 corresponds to the secure image type. A NULL pointer is returned * if the image does not exist. ******************************************************************************/ -entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) +struct entry_point_info *bl31_plat_get_next_image_ep_info(uint32_t type) { entry_point_info_t *next_image_info; diff --git a/plat/arm/common/arm_image_load.c b/plat/arm/common/arm_image_load.c index 916fa8dc8..4f86efdf9 100644 --- a/plat/arm/common/arm_image_load.c +++ b/plat/arm/common/arm_image_load.c @@ -28,7 +28,7 @@ void plat_flush_next_bl_params(void) /******************************************************************************* * This function returns the list of loadable images. ******************************************************************************/ -bl_load_info_t *plat_get_bl_image_load_info(void) +struct bl_load_info *plat_get_bl_image_load_info(void) { return get_bl_load_info_from_mem_params_desc(); } @@ -36,7 +36,7 @@ bl_load_info_t *plat_get_bl_image_load_info(void) /******************************************************************************* * This function returns the list of executable images. ******************************************************************************/ -bl_params_t *plat_get_next_bl_params(void) +struct bl_params *plat_get_next_bl_params(void) { bl_params_t *next_bl_params = get_next_bl_params_from_mem_params_desc(); diff --git a/plat/common/plat_bl1_common.c b/plat/common/plat_bl1_common.c index c5bbe7438..677797995 100644 --- a/plat/common/plat_bl1_common.c +++ b/plat/common/plat_bl1_common.c @@ -34,7 +34,7 @@ unsigned int bl1_plat_get_next_image_id(void) } void bl1_plat_set_ep_info(unsigned int image_id, - entry_point_info_t *ep_info) + struct entry_point_info *ep_info) { } @@ -48,7 +48,7 @@ int bl1_plat_handle_pre_image_load(unsigned int image_id) * Following is the default definition that always * returns BL2 image details. */ -image_desc_t *bl1_plat_get_image_desc(unsigned int image_id) +struct image_desc *bl1_plat_get_image_desc(unsigned int image_id) { static image_desc_t bl2_img_desc = BL2_IMAGE_DESC; return &bl2_img_desc; diff --git a/services/spd/opteed/opteed_main.c b/services/spd/opteed/opteed_main.c index 01ec2a26d..59d6ed294 100644 --- a/services/spd/opteed/opteed_main.c +++ b/services/spd/opteed/opteed_main.c @@ -34,7 +34,7 @@ * Address of the entrypoint vector table in OPTEE. It is * initialised once on the primary core after a cold boot. ******************************************************************************/ -optee_vectors_t *optee_vector_table; +struct optee_vectors *optee_vector_table; /******************************************************************************* * Array to keep track of per-cpu OPTEE state diff --git a/services/spd/opteed/opteed_private.h b/services/spd/opteed/opteed_private.h index b77b6d342..a5f0a4168 100644 --- a/services/spd/opteed/opteed_private.h +++ b/services/spd/opteed/opteed_private.h @@ -144,7 +144,7 @@ uint64_t opteed_enter_sp(uint64_t *c_rt_ctx); void __dead2 opteed_exit_sp(uint64_t c_rt_ctx, uint64_t ret); uint64_t opteed_synchronous_sp_entry(optee_context_t *optee_ctx); void __dead2 opteed_synchronous_sp_exit(optee_context_t *optee_ctx, uint64_t ret); -void opteed_init_optee_ep_state(struct entry_point_info *optee_ep, +void opteed_init_optee_ep_state(struct entry_point_info *optee_entry_point, uint32_t rw, uint64_t pc, uint64_t pageable_part,