Jan Samek has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/72667 )
Change subject: vc/siemens/hwilib: Change uint32_t return type to size_t ......................................................................
vc/siemens/hwilib: Change uint32_t return type to size_t
The commit fcff39f0ea47 ("vc/siemens/hwilib: Rename 'maxlen' to 'dstsize'") changed the 'dstsize' input parameter type from uint32_t to size_t.
This patch changes also the return parameter, which is often directly compared with the aforementioned input parameter value. This should introduce no change on 32-bit builds and stay consistent across the project in the case of 64-bit builds and avoid comparisons of integers of different width here.
BUG=none TEST=No changes to hwilib behavior on any of the siemens/mc_apl1 or siemens/mc_ehl variants.
Change-Id: I0a623f55b596297cdb6e17232828b9536c9a43e6 Signed-off-by: Jan Samek jan.samek@siemens.com --- M src/vendorcode/siemens/hwilib/hwilib.c M src/vendorcode/siemens/hwilib/hwilib.h 2 files changed, 29 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/67/72667/1
diff --git a/src/vendorcode/siemens/hwilib/hwilib.c b/src/vendorcode/siemens/hwilib/hwilib.c index b6c8c6b..2a3c10a 100644 --- a/src/vendorcode/siemens/hwilib/hwilib.c +++ b/src/vendorcode/siemens/hwilib/hwilib.c @@ -53,7 +53,7 @@ struct param_pos pos[MAX_BLOCK_NUM]; uint64_t mask; uint8_t mask_offset; - uint32_t (*get_field)(const struct param_info *param, uint8_t *dst, size_t dstsize); + size_t (*get_field)(const struct param_info *param, uint8_t *dst, size_t dstsize); };
/* Storage for pointers to the different blocks. The contents will be filled @@ -69,7 +69,7 @@ /* Storage for the cbfs file name of the currently open hwi file. */ static char current_hwi[HWI_MAX_NAME_LEN];
-static uint32_t hwilib_read_bytes(const struct param_info *param, uint8_t *dst, size_t dstsize); +static size_t hwilib_read_bytes(const struct param_info *param, uint8_t *dst, size_t dstsize);
/* Add all supported fields to this variable. It is important to use the * field type of a given field as the array index so that all the information @@ -385,7 +385,7 @@ * @param dstsize Size of the memory passed in via the *dst pointer * @return Number of copied bytes on success, 0 on error */ -static uint32_t hwilib_read_bytes(const struct param_info *param, uint8_t *dst, size_t dstsize) +static size_t hwilib_read_bytes(const struct param_info *param, uint8_t *dst, size_t dstsize) { uint8_t i = 0, *blk = NULL;
@@ -541,7 +541,7 @@ * @param dstsize Size of the memory passed in via the *dst pointer * @return Number of copied bytes on success, 0 on error */ -uint32_t hwilib_get_field(hwinfo_field_t field, uint8_t *dst, size_t dstsize) +size_t hwilib_get_field(hwinfo_field_t field, uint8_t *dst, size_t dstsize) { /* Check the boundaries of params-variable */ if ((uint32_t)field < ARRAY_SIZE(params)) diff --git a/src/vendorcode/siemens/hwilib/hwilib.h b/src/vendorcode/siemens/hwilib/hwilib.h index e4b11dd..2a4f4cd 100644 --- a/src/vendorcode/siemens/hwilib/hwilib.h +++ b/src/vendorcode/siemens/hwilib/hwilib.h @@ -123,6 +123,6 @@ /* Use this function to get fields out of supported info blocks * This function returns the number of copied bytes or 0 on error. */ -uint32_t hwilib_get_field(hwinfo_field_t field, uint8_t *dst, size_t dstsize); +size_t hwilib_get_field(hwinfo_field_t field, uint8_t *dst, size_t dstsize);
#endif /* SIEMENS_HWI_LIB_H_ */