vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #37 from marineam/enum

Browse source 
gpt: do not use an enum for status bit values
This commit is contained in:
Michael Marineau 2016-09-21 13:26:57 -07:00 committed by GitHub
commit d57c41e8f5
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
include/grub/gpt_partition.h
View file

@ -151,15 +151,14 @@ grub_gpt_partition_map_iterate (grub_disk_t disk,
void *hook_data); void *hook_data);
/* Advanced GPT library. */ /* Advanced GPT library. */
typedef enum grub_gpt_status
{ /* Status bits for the grub_gpt.status field. */
GRUB_GPT_PROTECTIVE_MBR = 0x01, #define GRUB_GPT_PROTECTIVE_MBR 0x01
GRUB_GPT_HYBRID_MBR = 0x02, #define GRUB_GPT_HYBRID_MBR 0x02
GRUB_GPT_PRIMARY_HEADER_VALID = 0x04, #define GRUB_GPT_PRIMARY_HEADER_VALID 0x04
GRUB_GPT_PRIMARY_ENTRIES_VALID = 0x08, #define GRUB_GPT_PRIMARY_ENTRIES_VALID 0x08
GRUB_GPT_BACKUP_HEADER_VALID = 0x10, #define GRUB_GPT_BACKUP_HEADER_VALID 0x10
GRUB_GPT_BACKUP_ENTRIES_VALID = 0x20, #define GRUB_GPT_BACKUP_ENTRIES_VALID 0x20
} grub_gpt_status_t;
/* UEFI requires the entries table to be at least 16384 bytes for a /* UEFI requires the entries table to be at least 16384 bytes for a
* total of 128 entries given the standard 128 byte entry size. */ * total of 128 entries given the standard 128 byte entry size. */
@ -170,7 +169,7 @@ typedef enum grub_gpt_status
struct grub_gpt struct grub_gpt
{ {
/* Bit field indicating which structures on disk are valid. */ /* Bit field indicating which structures on disk are valid. */
grub_gpt_status_t status; unsigned status;
/* Protective or hybrid MBR. */ /* Protective or hybrid MBR. */
struct grub_msdos_partition_mbr mbr; struct grub_msdos_partition_mbr mbr;