From d7612e97651b75ba2d157ca89bd108c5172ab2c6 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Thu, 11 Jan 2024 18:50:50 +0100 Subject: tree: Use accessor functions for struct region fields Always use the high-level API region_offset() and region_sz() functions. This excludes the internal `region.c` code as well as unit tests. FIT payload support was also skipped, as it seems it never tried to use the API and would need a bigger overhaul. Change-Id: Iaae116a1ab2da3b2ea2a5ebcd0c300b238582834 Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/c/coreboot/+/79904 Reviewed-by: Arthur Heymans Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer --- util/cbfstool/bpdt_formats/bpdt_1_6.c | 16 ++++++++-------- util/cbfstool/bpdt_formats/bpdt_1_7.c | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'util/cbfstool') diff --git a/util/cbfstool/bpdt_formats/bpdt_1_6.c b/util/cbfstool/bpdt_formats/bpdt_1_6.c index c5cedd3d8b..477a58c6ff 100644 --- a/util/cbfstool/bpdt_formats/bpdt_1_6.c +++ b/util/cbfstool/bpdt_formats/bpdt_1_6.c @@ -149,14 +149,14 @@ static cse_layout_ptr create_cse_layout(const struct region *r) if (!l) return NULL; - l->data_offset = r[DP].offset; - l->data_size = r[DP].size; - l->bp1_offset = r[BP1].offset; - l->bp1_size = r[BP1].size; - l->bp2_offset = r[BP2].offset; - l->bp2_size = r[BP2].size; - l->bp3_offset = r[BP3].offset; - l->bp3_size = r[BP3].size; + l->data_offset = region_offset(&r[DP]); + l->data_size = region_sz(&r[DP]); + l->bp1_offset = region_offset(&r[BP1]); + l->bp1_size = region_sz(&r[BP1]); + l->bp2_offset = region_offset(&r[BP2]); + l->bp2_size = region_sz(&r[BP2]); + l->bp3_offset = region_offset(&r[BP3]); + l->bp3_size = region_sz(&r[BP3]); l->checksum = 0; /* unused */ return l; diff --git a/util/cbfstool/bpdt_formats/bpdt_1_7.c b/util/cbfstool/bpdt_formats/bpdt_1_7.c index 9badc82c11..7e42a7b127 100644 --- a/util/cbfstool/bpdt_formats/bpdt_1_7.c +++ b/util/cbfstool/bpdt_formats/bpdt_1_7.c @@ -196,16 +196,16 @@ static cse_layout_ptr create_cse_layout(const struct region *r) l->size = sizeof(struct cse_layout) - sizeof(l->rom_bypass); l->redundancy = 0; l->checksum = 0; - l->data_offset = r[DP].offset; - l->data_size = r[DP].size; - l->bp1_offset = r[BP1].offset; - l->bp1_size = r[BP1].size; - l->bp2_offset = r[BP2].offset; - l->bp2_size = r[BP2].size; - l->bp3_offset = r[BP3].offset; - l->bp3_size = r[BP3].size; - l->bp4_offset = r[BP4].offset; - l->bp4_size = r[BP4].size; + l->data_offset = region_offset(&r[DP]); + l->data_size = region_sz(&r[DP]); + l->bp1_offset = region_offset(&r[BP1]); + l->bp1_size = region_sz(&r[BP1]); + l->bp2_offset = region_offset(&r[BP2]); + l->bp2_size = region_sz(&r[BP2]); + l->bp3_offset = region_offset(&r[BP3]); + l->bp3_size = region_sz(&r[BP3]); + l->bp4_offset = region_offset(&r[BP4]); + l->bp4_size = region_sz(&r[BP4]); l->bp5_offset = 0; l->bp5_size = 0; l->temp_base_addr = 0; -- cgit v1.2.3