Merge branch 'master' of git://git.denx.de/u-boot-net

[karo-tx-uboot.git] / disk / part_efi.h

diff --git a/disk/part_efi.h b/disk/part_efi.h
index aad905daa774a99fb5be38fc17d79efbfb99cd63..5903e7c812a6e21e1a2420d338bd4a0e402c939e 100644 (file)
--- a/disk/part_efi.h
+++ b/disk/part_efi.h
@@ -43,33 +43,33 @@
 #define GPT_ENTRY_NAME "gpt"
 
 #define EFI_GUID(a,b,c,d0,d1,d2,d3,d4,d5,d6,d7) \
-((efi_guid_t) \
-{{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \
-  (b) & 0xff, ((b) >> 8) & 0xff, \
-  (c) & 0xff, ((c) >> 8) & 0xff, \
-  (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }})
+       ((efi_guid_t) \
+       {{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \
+               (b) & 0xff, ((b) >> 8) & 0xff, \
+               (c) & 0xff, ((c) >> 8) & 0xff, \
+               (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }})
 
 #define PARTITION_SYSTEM_GUID \
-    EFI_GUID( 0xC12A7328, 0xF81F, 0x11d2, \
-              0xBA, 0x4B, 0x00, 0xA0, 0xC9, 0x3E, 0xC9, 0x3B)
+       EFI_GUID( 0xC12A7328, 0xF81F, 0x11d2, \
+               0xBA, 0x4B, 0x00, 0xA0, 0xC9, 0x3E, 0xC9, 0x3B)
 #define LEGACY_MBR_PARTITION_GUID \
-    EFI_GUID( 0x024DEE41, 0x33E7, 0x11d3, \
-              0x9D, 0x69, 0x00, 0x08, 0xC7, 0x81, 0xF3, 0x9F)
+       EFI_GUID( 0x024DEE41, 0x33E7, 0x11d3, \
+               0x9D, 0x69, 0x00, 0x08, 0xC7, 0x81, 0xF3, 0x9F)
 #define PARTITION_MSFT_RESERVED_GUID \
-    EFI_GUID( 0xE3C9E316, 0x0B5C, 0x4DB8, \
-              0x81, 0x7D, 0xF9, 0x2D, 0xF0, 0x02, 0x15, 0xAE)
+       EFI_GUID( 0xE3C9E316, 0x0B5C, 0x4DB8, \
+               0x81, 0x7D, 0xF9, 0x2D, 0xF0, 0x02, 0x15, 0xAE)
 #define PARTITION_BASIC_DATA_GUID \
-    EFI_GUID( 0xEBD0A0A2, 0xB9E5, 0x4433, \
-              0x87, 0xC0, 0x68, 0xB6, 0xB7, 0x26, 0x99, 0xC7)
+       EFI_GUID( 0xEBD0A0A2, 0xB9E5, 0x4433, \
+               0x87, 0xC0, 0x68, 0xB6, 0xB7, 0x26, 0x99, 0xC7)
 #define PARTITION_LINUX_RAID_GUID \
-    EFI_GUID( 0xa19d880f, 0x05fc, 0x4d3b, \
-              0xa0, 0x06, 0x74, 0x3f, 0x0f, 0x84, 0x91, 0x1e)
+       EFI_GUID( 0xa19d880f, 0x05fc, 0x4d3b, \
+               0xa0, 0x06, 0x74, 0x3f, 0x0f, 0x84, 0x91, 0x1e)
 #define PARTITION_LINUX_SWAP_GUID \
-    EFI_GUID( 0x0657fd6d, 0xa4ab, 0x43c4, \
-              0x84, 0xe5, 0x09, 0x33, 0xc8, 0x4b, 0x4f, 0x4f)
+       EFI_GUID( 0x0657fd6d, 0xa4ab, 0x43c4, \
+               0x84, 0xe5, 0x09, 0x33, 0xc8, 0x4b, 0x4f, 0x4f)
 #define PARTITION_LINUX_LVM_GUID \
-    EFI_GUID( 0xe6d6d379, 0xf507, 0x44c2, \
-              0xa2, 0x3c, 0x23, 0x8f, 0x2a, 0x3d, 0xf9, 0x28)
+       EFI_GUID( 0xe6d6d379, 0xf507, 0x44c2, \
+               0xa2, 0x3c, 0x23, 0x8f, 0x2a, 0x3d, 0xf9, 0x28)
 
 /* linux/include/efi.h */
 typedef unsigned short efi_char16_t;
@@ -80,14 +80,14 @@ typedef struct {
 
 /* based on linux/include/genhd.h */
 struct partition {
-       unsigned char boot_ind; /* 0x80 - active */
-       unsigned char head;     /* starting head */
-       unsigned char sector;   /* starting sector */
-       unsigned char cyl;      /* starting cylinder */
-       unsigned char sys_ind;  /* What partition type */
-       unsigned char end_head; /* end head */
+       unsigned char boot_ind;         /* 0x80 - active */
+       unsigned char head;             /* starting head */
+       unsigned char sector;           /* starting sector */
+       unsigned char cyl;              /* starting cylinder */
+       unsigned char sys_ind;          /* What partition type */
+       unsigned char end_head;         /* end head */
        unsigned char end_sector;       /* end sector */
-       unsigned char end_cyl;  /* end cylinder */
+       unsigned char end_cyl;          /* end cylinder */
        unsigned char start_sect[4];    /* starting sector counting from 0 */
        unsigned char nr_sects[4];      /* nr of sectors in partition */
 } __attribute__ ((packed));
@@ -117,13 +117,14 @@ typedef struct _gpt_entry_attributes {
        unsigned long long type_guid_specific:16;
 } __attribute__ ((packed)) gpt_entry_attributes;
 
+#define PARTNAME_SZ    (72 / sizeof(efi_char16_t))
 typedef struct _gpt_entry {
        efi_guid_t partition_type_guid;
        efi_guid_t unique_partition_guid;
        unsigned char starting_lba[8];
        unsigned char ending_lba[8];
        gpt_entry_attributes attributes;
-       efi_char16_t partition_name[72 / sizeof(efi_char16_t)];
+       efi_char16_t partition_name[PARTNAME_SZ];
 }
 __attribute__ ((packed)) gpt_entry;
 
@@ -135,4 +136,4 @@ typedef struct _legacy_mbr {
        unsigned char signature[2];
 } __attribute__ ((packed)) legacy_mbr;
 
-#endif                         /* _DISK_PART_EFI_H */
+#endif /* _DISK_PART_EFI_H */