diff options
author | Randall Spangler <rspangler@chromium.org> | 2011-07-25 13:24:22 -0700 |
---|---|---|
committer | Randall Spangler <rspangler@chromium.org> | 2011-07-26 10:28:57 -0700 |
commit | dfb0175a5b077e2c3c2809ee71c9b3368d91dbd9 (patch) | |
tree | d50a4f75888c6aadcdeaee67782975ef3f878e7c /utility | |
parent | 1cf77cda5ea2d7549caccb953079263d463feadb (diff) | |
download | vboot-dfb0175a5b077e2c3c2809ee71c9b3368d91dbd9.tar.gz |
Refactor LoadFirmware() and LoadKernel() to return VbError_t
BUG=chromium-os:18161
TEST=make && make runtests
Change-Id: I1f60654fef84e26ee15fa8bdaacdb87fb1ddf69e
Reviewed-on: http://gerrit.chromium.org/gerrit/4676
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
Tested-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'utility')
-rw-r--r-- | utility/load_firmware_test.c | 24 | ||||
-rw-r--r-- | utility/load_kernel_test.c | 7 |
2 files changed, 7 insertions, 24 deletions
diff --git a/utility/load_firmware_test.c b/utility/load_firmware_test.c index 6584977c..4f698872 100644 --- a/utility/load_firmware_test.c +++ b/utility/load_firmware_test.c @@ -30,8 +30,6 @@ static char* image_path = NULL; /* wrapper of FmapAreaIndex; print error when not found */ int FmapAreaIndexOrError(const FmapHeader* fh, const FmapAreaHeader* ah, const char* name); -/* return NULL on error */ -const char* status_string(int status); int GetFirmwareBody(LoadFirmwareParams* params, uint64_t firmware_index) { CallerInternal* ci = (CallerInternal*) params->caller_internal; @@ -140,8 +138,8 @@ int DriveLoadFirmware(const void* base_of_rom, const void* fmap, LoadFirmwareParams lfp; CallerInternal ci; - const char* status_str; - int index, status; + VbError_t status; + int index; void** vblock_ptr[2] = { &lfp.verification_block_0, &lfp.verification_block_1 @@ -197,11 +195,7 @@ int DriveLoadFirmware(const void* base_of_rom, const void* fmap, * happening here. */ status = LoadFirmware(&lfp); - status_str = status_string(status); - if (status_str) - printf("LoadFirmware returns %s\n", status_str); - else - printf("LoadFirmware returns unknown status code: %d\n", status); + printf("LoadFirmware returned: 0x%x\n", (int)status); free(lfp.shared_data_blob); @@ -217,18 +211,6 @@ int FmapAreaIndexOrError(const FmapHeader* fh, const FmapAreaHeader* ah, return i; } -/* Convert status returned by LoadFirmware to string. Return NULL on error. */ -const char* status_string(int status) { - switch (status) { - case LOAD_FIRMWARE_SUCCESS: - return "LOAD_FIRMWARE_SUCCESS"; - case LOAD_FIRMWARE_RECOVERY: - return "LOAD_FIRMWARE_RECOVERY"; - default: - return NULL; - } -} - int main(int argc, char* argv[]) { int i; int retval = 0; diff --git a/utility/load_kernel_test.c b/utility/load_kernel_test.c index 00ed49dd..1f8cc2a5 100644 --- a/utility/load_kernel_test.c +++ b/utility/load_kernel_test.c @@ -83,7 +83,8 @@ int main(int argc, char* argv[]) { uint8_t* key_blob = NULL; VbSharedDataHeader* shared; GoogleBinaryBlockHeader* gbb; - int rv, c, argsleft; + VbError_t rv; + int c, argsleft; int errorcnt = 0; char *e = 0; @@ -218,7 +219,7 @@ int main(int argc, char* argv[]) { rv = LoadKernel(&lkp); printf("LoadKernel() returned %d\n", rv); - if (LOAD_KERNEL_SUCCESS == rv) { + if (VBERROR_SUCCESS == rv) { printf("Partition number: %" PRIu64 "\n", lkp.partition_number); printf("Bootloader address: %" PRIu64 "\n", lkp.bootloader_address); printf("Bootloader size: %" PRIu64 "\n", lkp.bootloader_size); @@ -245,5 +246,5 @@ int main(int argc, char* argv[]) { fclose(image_file); free(lkp.kernel_buffer); - return rv != LOAD_KERNEL_SUCCESS; + return rv != VBERROR_SUCCESS; } |