Clean up to update the reference of the these macros:

[mirror_edk2.git] / MdeModulePkg / Universal / Disk / PartitionDxe / Partition.h

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h
index 9d6477cc3a09859e9b04306810e032e267880d84..a9bbcc6586ec7e1a95c7ef0a3a15f56f9bb72ebe 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.h
@@ -15,8 +15,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#ifndef _PARTITION_H \r
-#define _PARTITION_H \r
+#ifndef _PARTITION_H_ \r
+#define _PARTITION_H_ \r
 \r
 #include <Uefi.h>\r
 #include <Protocol/BlockIo.h>\r
@@ -41,7 +41,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 // Partition private data\r
 //\r
-#define PARTITION_PRIVATE_DATA_SIGNATURE  EFI_SIGNATURE_32 ('P', 'a', 'r', 't')\r
+#define PARTITION_PRIVATE_DATA_SIGNATURE  SIGNATURE_32 ('P', 'a', 'r', 't')\r
 typedef struct {\r
   UINT64                    Signature;\r
 \r
@@ -85,6 +85,15 @@ extern EFI_COMPONENT_NAME2_PROTOCOL  gPartitionComponentName2;
                                    (((UINT8 *) a)[2] << 16) |    \\r
                                    (((UINT8 *) a)[3] << 24) )\r
 \r
+\r
+//\r
+// GPT Partition Entry Status\r
+//\r
+typedef struct {\r
+  BOOLEAN OutOfRange;\r
+  BOOLEAN Overlap;\r
+} EFI_PARTITION_ENTRY_STATUS;\r
+\r
 //\r
 // Function Prototypes\r
 //\r
@@ -150,10 +159,10 @@ PartitionDriverBindingStart (
 EFI_STATUS\r
 EFIAPI\r
 PartitionDriverBindingStop (\r
-  IN  EFI_DRIVER_BINDING_PROTOCOL  *This,\r
-  IN  EFI_HANDLE                   ControllerHandle,\r
-  IN  UINTN                        NumberOfChildren,\r
-  IN  EFI_HANDLE                   *ChildHandleBuffer\r
+  IN  EFI_DRIVER_BINDING_PROTOCOL   *This,\r
+  IN  EFI_HANDLE                    ControllerHandle,\r
+  IN  UINTN                         NumberOfChildren,\r
+  IN  EFI_HANDLE                    *ChildHandleBuffer\r
   );\r
 \r
 //\r
@@ -313,12 +322,11 @@ PartitionInstallChildHandle (
   IN  EFI_BLOCK_IO_PROTOCOL        *ParentBlockIo,\r
   IN  EFI_DEVICE_PATH_PROTOCOL     *ParentDevicePath,\r
   IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePathNode,\r
-  IN  UINT64                       Start,\r
-  IN  UINT64                       End,\r
+  IN  EFI_LBA                      Start,\r
+  IN  EFI_LBA                      End,\r
   IN  UINT32                       BlockSize,\r
   IN  BOOLEAN                      InstallEspGuid\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Install child handles if the Handle supports GPT partition structure.\r
@@ -341,8 +349,7 @@ PartitionInstallGptChildHandles (
   IN  EFI_DISK_IO_PROTOCOL         *DiskIo,\r
   IN  EFI_BLOCK_IO_PROTOCOL        *BlockIo,\r
   IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePath\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Install child handles if the Handle supports El Torito format.\r
@@ -366,8 +373,7 @@ PartitionInstallElToritoChildHandles (
   IN  EFI_DISK_IO_PROTOCOL         *DiskIo,\r
   IN  EFI_BLOCK_IO_PROTOCOL        *BlockIo,\r
   IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePath\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Install child handles if the Handle supports MBR format.\r
@@ -390,8 +396,7 @@ PartitionInstallMbrChildHandles (
   IN  EFI_DISK_IO_PROTOCOL         *DiskIo,\r
   IN  EFI_BLOCK_IO_PROTOCOL        *BlockIo,\r
   IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePath\r
-  )\r
-;\r
+  );\r
 \r
 typedef\r
 EFI_STATUS\r