From 5b202a94f0ef30421c532b2aed963ac9f6f78521 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Tue, 22 Sep 2015 09:09:27 -0700 Subject: [PATCH] vboot: Move GPT entry operator functions to gpt_misc This is to allow external entities using vboot library (e.g. depthcharge) to utilize these operator functions to perform get / set operations on GPT entry. BUG=chrome-os-partner:45670 BRANCH=None TEST=Compiles successfully "sudo emerge vboot_reference" "emerge-smaug vboot_reference". "make -j runtests" successful. Change-Id: I9e34a2a7afeae6293a78424794797d5755950888 Signed-off-by: Furquan Shaikh Reviewed-on: https://chromium-review.googlesource.com/301475 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Randall Spangler --- firmware/include/gpt_misc.h | 9 +++++++++ firmware/lib/cgptlib/include/cgptlib_internal.h | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/firmware/include/gpt_misc.h b/firmware/include/gpt_misc.h index e5a366bb93..49e1351885 100644 --- a/firmware/include/gpt_misc.h +++ b/firmware/include/gpt_misc.h @@ -196,4 +196,13 @@ int GptUpdateKernelWithEntry(GptData *gpt, GptEntry *e, uint32_t update_type); */ int GptUpdateKernelEntry(GptData *gpt, uint32_t update_type); +/* Getters and setters for partition attribute fields. */ + +int GetEntrySuccessful(const GptEntry *e); +int GetEntryPriority(const GptEntry *e); +int GetEntryTries(const GptEntry *e); +void SetEntrySuccessful(GptEntry *e, int successful); +void SetEntryPriority(GptEntry *e, int priority); +void SetEntryTries(GptEntry *e, int tries); + #endif /* VBOOT_REFERENCE_CGPT_MISC_H_ */ diff --git a/firmware/lib/cgptlib/include/cgptlib_internal.h b/firmware/lib/cgptlib/include/cgptlib_internal.h index 50477c4fed..b13c491665 100644 --- a/firmware/lib/cgptlib/include/cgptlib_internal.h +++ b/firmware/lib/cgptlib/include/cgptlib_internal.h @@ -138,15 +138,6 @@ void GptRepair(GptData *gpt); */ void GptModified(GptData *gpt); -/* Getters and setters for partition attribute fields. */ - -int GetEntrySuccessful(const GptEntry *e); -int GetEntryPriority(const GptEntry *e); -int GetEntryTries(const GptEntry *e); -void SetEntrySuccessful(GptEntry *e, int successful); -void SetEntryPriority(GptEntry *e, int priority); -void SetEntryTries(GptEntry *e, int tries); - /** * Return 1 if the entry is a Chrome OS kernel partition, else 0. */