Modify the size of the attributes field to comply with msc limitations.

firmware/lib/cgptlib/cgptlib.c

 /* Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "cgptlib.h"
 #include "cgptlib_internal.h"
 #include "crc32.h"
 #include "gpt.h"
 #include "utility.h"
@@ skipping 75 matching lines @@
   *start_sector = e->starting_lba;
   *size = e->ending_lba - e->starting_lba + 1;
   return GPT_SUCCESS;
 }
 
 
 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;
-  uint64_t previous_attr = e->attributes;
+  uint16_t previous_attr = e->attrs.fields.gpt_att;
 
   if (gpt->current_kernel == CGPT_KERNEL_ENTRY_NOT_FOUND)
     return GPT_ERROR_INVALID_UPDATE_TYPE;
   if (!IsKernelEntry(e))
     return GPT_ERROR_INVALID_UPDATE_TYPE;
 
   switch (update_type) {
     case GPT_UPDATE_ENTRY_TRY: {
       /* Used up a try */
       int tries;
       if (GetEntrySuccessful(e))
         return GPT_SUCCESS;  /* Successfully booted this partition, so
                               * tries field is ignored. */
       tries = GetEntryTries(e);
       if (tries > 1) {
         /* Still have tries left */
         SetEntryTries(e, tries - 1);
         break;
       }
       /* Out of tries, so drop through and mark partition bad. */
     }
     case GPT_UPDATE_ENTRY_BAD: {
       /* Giving up on this partition entirely. */
-      e->attributes &= ~(CGPT_ATTRIBUTE_SUCCESSFUL_MASK |
-                         CGPT_ATTRIBUTE_TRIES_MASK |
-                         CGPT_ATTRIBUTE_PRIORITY_MASK);
+      e->attrs.fields.gpt_att = previous_attr & ~(
+          CGPT_ATTRIBUTE_SUCCESSFUL_MASK |
+          CGPT_ATTRIBUTE_TRIES_MASK |
+          CGPT_ATTRIBUTE_PRIORITY_MASK);
       break;
     }
     default:
       return GPT_ERROR_INVALID_UPDATE_TYPE;
   }
 
   /* If no change to attributes, we're done */
-  if (e->attributes == previous_attr)
+  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);
 
   return GPT_SUCCESS;
 }