mirror of
https://github.com/Telecominfraproject/OpenCellular.git
synced 2025-11-24 02:05:01 +00:00
Implement cgptlib for MTD devices.
Defines MTD on-disk structures & API in mtdlib.h/c that closely mirrors the existing cgpt implementation. Currently, the disk structures do not contain guids or labels, and the number of available partition types and quantities are limited, exactly what we want to support should be decided before we ship this. Adds appropriate test coverage to the unit test library - either by modifying existing tests, or copying them and changing them accordingly. BUG=chromium:221745 TEST=added appropriate tests to the unittests BRANCH=none Change-Id: Iee19864498024c72229bc3c7811594fe762f52de Original-Change-Id: I031eca69d6c8e825b02bd0522d57e92b05eb191a Reviewed-on: https://gerrit.chromium.org/gerrit/46082 Tested-by: Albert Chaulk <achaulk@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org> Commit-Queue: Albert Chaulk <achaulk@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/48793 Reviewed-by: Albert Chaulk <achaulk@chromium.org>
This commit is contained in:
@@ -114,10 +114,9 @@ int GptNextKernelEntry(GptData *gpt, uint64_t *start_sector, uint64_t *size)
|
||||
|
||||
int GptUpdateKernelEntry(GptData *gpt, uint32_t update_type)
|
||||
{
|
||||
GptHeader *header = (GptHeader *)gpt->primary_header;
|
||||
GptEntry *entries = (GptEntry *)gpt->primary_entries;
|
||||
GptEntry *e = entries + gpt->current_kernel;
|
||||
uint16_t previous_attr = e->attrs.fields.gpt_att;
|
||||
int modified = 0;
|
||||
|
||||
if (gpt->current_kernel == CGPT_KERNEL_ENTRY_NOT_FOUND)
|
||||
return GPT_ERROR_INVALID_UPDATE_TYPE;
|
||||
@@ -138,6 +137,7 @@ int GptUpdateKernelEntry(GptData *gpt, uint32_t update_type)
|
||||
tries = GetEntryTries(e);
|
||||
if (tries > 1) {
|
||||
/* Still have tries left */
|
||||
modified = 1;
|
||||
SetEntryTries(e, tries - 1);
|
||||
break;
|
||||
}
|
||||
@@ -150,9 +150,9 @@ int GptUpdateKernelEntry(GptData *gpt, uint32_t update_type)
|
||||
* Only clear tries and priority if the successful bit
|
||||
* is not set.
|
||||
*/
|
||||
e->attrs.fields.gpt_att = previous_attr &
|
||||
~(CGPT_ATTRIBUTE_TRIES_MASK |
|
||||
CGPT_ATTRIBUTE_PRIORITY_MASK);
|
||||
modified = 1;
|
||||
SetEntryTries(e, 0);
|
||||
SetEntryPriority(e, 0);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -160,25 +160,9 @@ int GptUpdateKernelEntry(GptData *gpt, uint32_t update_type)
|
||||
return GPT_ERROR_INVALID_UPDATE_TYPE;
|
||||
}
|
||||
|
||||
/* If no change to attributes, we're done */
|
||||
if (e->attrs.fields.gpt_att == previous_attr)
|
||||
return GPT_SUCCESS;
|
||||
|
||||
/* Update the CRCs */
|
||||
header->entries_crc32 = Crc32((const uint8_t *)entries,
|
||||
header->size_of_entry *
|
||||
header->number_of_entries);
|
||||
header->header_crc32 = HeaderCrc(header);
|
||||
gpt->modified |= GPT_MODIFIED_HEADER1 | GPT_MODIFIED_ENTRIES1;
|
||||
|
||||
/*
|
||||
* Use the repair function to update the other copy of the GPT. This
|
||||
* is a tad inefficient, but is much faster than the disk I/O to update
|
||||
* the GPT on disk so it doesn't matter.
|
||||
*/
|
||||
gpt->valid_headers = MASK_PRIMARY;
|
||||
gpt->valid_entries = MASK_PRIMARY;
|
||||
GptRepair(gpt);
|
||||
if (modified) {
|
||||
GptModified(gpt);
|
||||
}
|
||||
|
||||
return GPT_SUCCESS;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user