andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 <sandrine.bailleux@arm.com>
This commit is contained in:
Sandrine Bailleux 2018-07-11 12:44:22 +02:00
parent df4c512d47
commit 6c77e74915
10 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bl1/bl1_main.c
View File

@ -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 * populates a new memory layout for BL2 that ensures that BL1's data sections
* resident in secure RAM are not visible to BL2. * resident in secure RAM are not visible to BL2.
******************************************************************************/ ******************************************************************************/
void bl1_init_bl2_mem_layout(const meminfo_t *bl1_mem_layout, void bl1_init_bl2_mem_layout(const struct meminfo *bl1_mem_layout,
meminfo_t *bl2_mem_layout) struct meminfo *bl2_mem_layout)
{ {
bl1_calc_bl2_mem_layout(bl1_mem_layout, bl2_mem_layout); bl1_calc_bl2_mem_layout(bl1_mem_layout, bl2_mem_layout);
} }

2
plat/arm/board/fvp/fvp_bl2u_setup.c
View File

@ -9,7 +9,7 @@
#include "fvp_def.h" #include "fvp_def.h"
#include "fvp_private.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); arm_bl2u_early_platform_setup(mem_layout, plat_info);

2
plat/arm/common/arm_bl1_setup.c
View File

@ -27,7 +27,7 @@
/* Data structure which holds the extents of the trusted SRAM for BL1*/ /* Data structure which holds the extents of the trusted SRAM for BL1*/
static meminfo_t bl1_tzram_layout; 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; return &bl1_tzram_layout;
} }

3
plat/arm/common/arm_bl2_setup.c
View File

@ -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. * 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. * 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 */ /* Initialize the console to provide early debug support */
arm_console_boot_init(); arm_console_boot_init();

4
plat/arm/common/arm_bl2u_setup.c
View File

@ -32,7 +32,7 @@ void bl2u_platform_setup(void)
arm_bl2u_platform_setup(); 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 */ /* Initialize the console to provide early debug support */
arm_console_boot_init(); 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 case of ARM FVP platforms x1 is not used.
* In both cases, x0 contains the extents of the memory available to BL2U * 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); arm_bl2u_early_platform_setup(mem_layout, plat_info);
} }

2
plat/arm/common/arm_bl31_setup.c
View File

@ -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 * while BL32 corresponds to the secure image type. A NULL pointer is returned
* if the image does not exist. * 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; entry_point_info_t *next_image_info;

4
plat/arm/common/arm_image_load.c
View File

@ -28,7 +28,7 @@ void plat_flush_next_bl_params(void)
/******************************************************************************* /*******************************************************************************
* This function returns the list of loadable images. * 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(); 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. * 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(); bl_params_t *next_bl_params = get_next_bl_params_from_mem_params_desc();

4
plat/common/plat_bl1_common.c
View File

@ -34,7 +34,7 @@ unsigned int bl1_plat_get_next_image_id(void)
} }
void bl1_plat_set_ep_info(unsigned int image_id, 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 * Following is the default definition that always
* returns BL2 image details. * 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; static image_desc_t bl2_img_desc = BL2_IMAGE_DESC;
return &bl2_img_desc; return &bl2_img_desc;

2
services/spd/opteed/opteed_main.c
View File

@ -34,7 +34,7 @@
* Address of the entrypoint vector table in OPTEE. It is * Address of the entrypoint vector table in OPTEE. It is
* initialised once on the primary core after a cold boot. * 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 * Array to keep track of per-cpu OPTEE state

2
services/spd/opteed/opteed_private.h
View File

@ -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); void __dead2 opteed_exit_sp(uint64_t c_rt_ctx, uint64_t ret);
uint64_t opteed_synchronous_sp_entry(optee_context_t *optee_ctx); 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 __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, uint32_t rw,
uint64_t pc, uint64_t pc,
uint64_t pageable_part, uint64_t pageable_part,