diff options
| author | Joel Kitching <kitching@google.com> | 2019-04-25 18:31:14 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-05-17 18:36:48 -0700 |
| commit | 27e3e9fcba98dba576322273a34bd0cbbb639e81 (patch) | |
| tree | 208694afb44812fd666551682bffe95c96856d48 /tests/vboot_display_tests.c | |
| parent | 719968c47a6220b3e660e4f72cbc2a56750eec00 (diff) | |
| download | vboot-27e3e9fcba98dba576322273a34bd0cbbb639e81.tar.gz | |
vboot: deprecate v1 GoogleBinaryBlockHeader struct
Deprecate internal usage of GoogleBinaryBlockHeader struct in
favour of vb2_gbb_header struct. Keep the v1 struct around until
we remove references in other repos.
BUG=b:124141368, chromium:954774
TEST=make clean && make runtests
BRANCH=none
Change-Id: I396d2e624bd5dcac9c461cc86e8175e8f7692d26
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1583826
Commit-Ready: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'tests/vboot_display_tests.c')
| -rw-r--r-- | tests/vboot_display_tests.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/vboot_display_tests.c b/tests/vboot_display_tests.c index 986bb270..16ccd36e 100644 --- a/tests/vboot_display_tests.c +++ b/tests/vboot_display_tests.c @@ -14,8 +14,8 @@ #include "2common.h" #include "2misc.h" #include "2nvstorage.h" +#include "2struct.h" #include "gbb_access.h" -#include "gbb_header.h" #include "host_common.h" #include "test_common.h" #include "vboot_common.h" @@ -25,8 +25,8 @@ /* Mock data */ static uint8_t shared_data[VB_SHARED_DATA_MIN_SIZE]; static VbSharedDataHeader *shared = (VbSharedDataHeader *)shared_data; -static char gbb_data[4096 + sizeof(GoogleBinaryBlockHeader)]; -static GoogleBinaryBlockHeader *gbb = (GoogleBinaryBlockHeader *)gbb_data; +static char gbb_data[4096 + sizeof(struct vb2_gbb_header)]; +static struct vb2_gbb_header *gbb = (struct vb2_gbb_header *)gbb_data; static char debug_info[4096]; static struct vb2_context ctx; struct vb2_shared_data *sd; @@ -40,10 +40,10 @@ static void ResetMocks(void) int gbb_used; memset(gbb_data, 0, sizeof(gbb_data)); - gbb->major_version = GBB_MAJOR_VER; - gbb->minor_version = GBB_MINOR_VER; + gbb->major_version = VB2_GBB_MAJOR_VER; + gbb->minor_version = VB2_GBB_MINOR_VER; gbb->flags = 0; - gbb_used = sizeof(GoogleBinaryBlockHeader); + gbb_used = sizeof(struct vb2_gbb_header); gbb->hwid_offset = gbb_used; strcpy(gbb_data + gbb->hwid_offset, "Test HWID"); |