commit b3d38f5c620da89662deb1a08971c5025d6c1132
author Dan Ehrenberg <dehrenberg@chromium.org> Tue Dec 09 13:42:15 2014 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Dec 11 03:12:14 2014 +0000
tree 1a401569a1d4faf8c45c32708a1b3856b707e190
parent cfe83a827d40b310003fc6996b9978d8cf301444

vboot: GPT interface cleanup

- Rename drive_sectors to streaming_drive_sectors, to contrast with
  gpt_drive_sectors
- Replace stored_on_device field with flags field for future
  extensibility

BUG=chromium:433433
TEST=make runtests
BRANCH=none

Change-Id: I785a3b735b8eb96f647a334659329db3ee43eb80
Signed-off-by: Dan Ehrenberg <dehrenberg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/234283
Reviewed-by: Bill Richardson <wfrichar@chromium.org>

cgpt/cgpt_create.c

diff --git a/cgpt/cgpt_create.c b/cgpt/cgpt_create.c
index 298e2ae..2265c8f 100644
--- a/cgpt/cgpt_create.c
+++ b/cgpt/cgpt_create.c
@@ -46,14 +46,15 @@
     h->my_lba = GPT_PMBR_SECTORS;  /* The second sector on drive. */
     h->alternate_lba = drive->gpt.gpt_drive_sectors - GPT_HEADER_SECTORS;
     h->entries_lba = h->my_lba + GPT_HEADER_SECTORS;
-    if (drive->gpt.stored_on_device == GPT_STORED_ON_DEVICE) {
+    if (!(drive->gpt.flags & GPT_FLAG_EXTERNAL)) {
       h->entries_lba += params->padding;
       h->first_usable_lba = h->entries_lba + GPT_ENTRIES_SECTORS;
-      h->last_usable_lba = (drive->gpt.drive_sectors - GPT_HEADER_SECTORS -
+      h->last_usable_lba = (drive->gpt.streaming_drive_sectors -
+			    GPT_HEADER_SECTORS -
                             GPT_ENTRIES_SECTORS - 1);
     } else {
       h->first_usable_lba = params->padding;
-      h->last_usable_lba = (drive->gpt.drive_sectors - 1);
+      h->last_usable_lba = (drive->gpt.streaming_drive_sectors - 1);
     }
     if (CGPT_OK != GenerateGuid(&h->disk_uuid)) {
       Error("Unable to generate new GUID.\n");
@@ -61,7 +62,7 @@
     }
     h->size_of_entry = sizeof(GptEntry);
     h->number_of_entries = TOTAL_ENTRIES_SIZE / h->size_of_entry;
-    if (drive->gpt.stored_on_device != GPT_STORED_ON_DEVICE) {
+    if (drive->gpt.flags & GPT_FLAG_EXTERNAL) {
       // We might have smaller space for the GPT table. Scale accordingly.
       size_t half_size_sectors = drive->gpt.gpt_drive_sectors / 2;
       if (half_size_sectors < GPT_HEADER_SECTORS) {