scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-08 16:41:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

vboot_reference: Rename *_SECTOR to *_SECTORS

Browse Source 
This CL renames GPT_PMBR_SECTOR to GPT_PMBR_SECTORS and GPT_HEADER_SECTOR to
GPT_HEADER_SECTORS to better indicate that these are constants for sizes, not
location.

BRANCH=None
BUG=None
TEST=unittest

Change-Id: I26ed6d45d77dcb1eb714135edbb9e4124b54e953
Reviewed-on: https://chromium-review.googlesource.com/214830
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Tested-by: Nam Nguyen <namnguyen@chromium.org>
Commit-Queue: Nam Nguyen <namnguyen@chromium.org>
This commit is contained in:
Nam T. Nguyen
2014-08-28 10:58:47 -07:00
committed by chrome-internal-fetch
parent c0777be638
commit 88458d9b52
7 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/lib/cgptlib/cgptlib_internal.c
View File

@@ -88,12 +88,12 @@ int CheckHeader(GptHeader *h, int is_secondary, uint64_t drive_sectors)
* secondary is at the end of the drive, preceded by its entries.
*/
if (is_secondary) {
if (h->my_lba != drive_sectors - GPT_HEADER_SECTOR)
if (h->my_lba != drive_sectors - GPT_HEADER_SECTORS)
return 1;
if (h->entries_lba != h->my_lba - GPT_ENTRIES_SECTORS)
return 1;
} else {
if (h->my_lba != GPT_PMBR_SECTOR)
if (h->my_lba != GPT_PMBR_SECTORS)
return 1;
if (h->entries_lba < h->my_lba + 1)
return 1;
@@ -296,8 +296,8 @@ void GptRepair(GptData *gpt)
if (MASK_PRIMARY == gpt->valid_headers) {
/* Primary is good, secondary is bad */
Memcpy(header2, header1, sizeof(GptHeader));
header2->my_lba = gpt->drive_sectors - GPT_HEADER_SECTOR;
header2->alternate_lba = GPT_PMBR_SECTOR; /* Second sector. */
header2->my_lba = gpt->drive_sectors - GPT_HEADER_SECTORS;
header2->alternate_lba = GPT_PMBR_SECTORS; /* Second sector. */
header2->entries_lba = header2->my_lba - GPT_ENTRIES_SECTORS;
header2->header_crc32 = HeaderCrc(header2);
gpt->modified |= GPT_MODIFIED_HEADER2;
@@ -305,8 +305,8 @@ void GptRepair(GptData *gpt)
else if (MASK_SECONDARY == gpt->valid_headers) {
/* Secondary is good, primary is bad */
Memcpy(header1, header2, sizeof(GptHeader));
header1->my_lba = GPT_PMBR_SECTOR; /* Second sector. */
header1->alternate_lba = gpt->drive_sectors - GPT_HEADER_SECTOR;
header1->my_lba = GPT_PMBR_SECTORS; /* Second sector. */
header1->alternate_lba = gpt->drive_sectors - GPT_HEADER_SECTORS;
/* TODO (namnguyen): Preserve (header, entries) padding. */
header1->entries_lba = header1->my_lba + 1;
header1->header_crc32 = HeaderCrc(header1);