diff options
| author | Joel Kitching <kitching@google.com> | 2019-07-31 14:12:30 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-13 04:36:52 +0000 |
| commit | e6700f4c70fe72850ae4f3f5df19c9281ebcefc8 (patch) | |
| tree | 0f2abff7be99bc140e288058fb2eeab6f8bb8b64 /firmware/lib/ec_sync.c | |
| parent | a5afd01feb0b4b45adbcd8ab38ab8a2ef2a2ef67 (diff) | |
| download | vboot-e6700f4c70fe72850ae4f3f5df19c9281ebcefc8.tar.gz | |
vboot: update vboot2 functions to use new vb2_error_t
To make explicit when vboot2 error codes should be returned,
use the new vb2_error_t type on all functions which return
VB2_ERROR_* constants.
BUG=b:124141368, chromium:988410
TEST=make clean && make runtests
BRANCH=none
Change-Id: Idd3ee8afe8c78347783ce5fa829cb78f1e5719e2
Signed-off-by: Joel Kitching <kitching@google.com>
Cq-Depend: chromium:1728113, chromium:1728499
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1728292
Reviewed-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'firmware/lib/ec_sync.c')
| -rw-r--r-- | firmware/lib/ec_sync.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/firmware/lib/ec_sync.c b/firmware/lib/ec_sync.c index 23951aff..bdea2f9a 100644 --- a/firmware/lib/ec_sync.c +++ b/firmware/lib/ec_sync.c @@ -46,7 +46,7 @@ static void request_recovery(struct vb2_context *ctx, uint32_t recovery_request) static vb2_error_t protect_ec(struct vb2_context *ctx, int devidx, enum VbSelectFirmware_t select) { - int rv = VbExEcProtect(devidx, select); + vb2_error_t rv = VbExEcProtect(devidx, select); if (rv == VBERROR_EC_REBOOT_TO_RO_REQUIRED) { VB2_DEBUG("VbExEcProtect() needs reboot\n"); @@ -97,15 +97,16 @@ static const char *image_name_to_string(enum VbSelectFirmware_t select) * @param select Which firmware image to check * @return VB2_SUCCESS, or non-zero error code. */ -static int check_ec_hash(struct vb2_context *ctx, int devidx, - enum VbSelectFirmware_t select) +static vb2_error_t check_ec_hash(struct vb2_context *ctx, int devidx, + enum VbSelectFirmware_t select) { struct vb2_shared_data *sd = vb2_get_sd(ctx); /* Get current EC hash. */ const uint8_t *ec_hash = NULL; int ec_hash_size; - int rv = VbExEcHashImage(devidx, select, &ec_hash, &ec_hash_size); + vb2_error_t rv = VbExEcHashImage(devidx, select, &ec_hash, + &ec_hash_size); if (rv) { VB2_DEBUG("VbExEcHashImage() returned %d\n", rv); request_recovery(ctx, VB2_RECOVERY_EC_HASH_FAILED); @@ -155,7 +156,8 @@ static vb2_error_t update_ec(struct vb2_context *ctx, int devidx, /* Get expected EC image */ const uint8_t *want = NULL; int want_size; - int rv = VbExEcGetExpectedImage(devidx, select, &want, &want_size); + vb2_error_t rv = VbExEcGetExpectedImage(devidx, select, &want, + &want_size); if (rv) { VB2_DEBUG("VbExEcGetExpectedImage() returned %d\n", rv); request_recovery(ctx, VB2_RECOVERY_EC_EXPECTED_IMAGE); @@ -211,7 +213,7 @@ static vb2_error_t check_ec_active(struct vb2_context *ctx, int devidx) * trust what EC-RW says. If it lies it's in RO, we'll flash RW while * it's in RW. */ - int rv = VbExEcRunningRW(devidx, &in_rw); + vb2_error_t rv = VbExEcRunningRW(devidx, &in_rw); /* If we couldn't determine where the EC was, reboot to recovery. */ if (rv != VBERROR_SUCCESS) { @@ -239,7 +241,7 @@ static vb2_error_t sync_one_ec(struct vb2_context *ctx, int devidx) { struct vb2_shared_data *sd = vb2_get_sd(ctx); int is_rw_ab = ctx->flags & RW_AB(devidx); - int rv; + vb2_error_t rv; const enum VbSelectFirmware_t select_rw = is_rw_ab ? VB_SELECT_FIRMWARE_EC_UPDATE : |