MdeModulePkg: Change use of EFI_D_* to DEBUG_*

[mirror_edk2.git] / MdeModulePkg / Universal / Disk / PartitionDxe / Gpt.c

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
index efaff5e0808f8babd652dbd9660b67fc73736b66..e985bd2c447af1a25fff96c40ad1e90ee856cc12 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
@@ -225,8 +225,8 @@ PartitionInstallGptChildHandles (
   LastBlock     = BlockIo->Media->LastBlock;\r
   MediaId       = BlockIo->Media->MediaId;\r
 \r
-  DEBUG ((EFI_D_INFO, " BlockSize : %d \n", BlockSize));\r
-  DEBUG ((EFI_D_INFO, " LastBlock : %lx \n", LastBlock));\r
+  DEBUG ((DEBUG_INFO, " BlockSize : %d \n", BlockSize));\r
+  DEBUG ((DEBUG_INFO, " LastBlock : %lx \n", LastBlock));\r
 \r
   GptValidStatus = EFI_NOT_FOUND;\r
 \r
@@ -291,43 +291,43 @@ PartitionInstallGptChildHandles (
   // Check primary and backup partition tables\r
   //\r
   if (!PartitionValidGptTable (BlockIo, DiskIo, PRIMARY_PART_HEADER_LBA, PrimaryHeader)) {\r
-    DEBUG ((EFI_D_INFO, " Not Valid primary partition table\n"));\r
+    DEBUG ((DEBUG_INFO, " Not Valid primary partition table\n"));\r
 \r
     if (!PartitionValidGptTable (BlockIo, DiskIo, LastBlock, BackupHeader)) {\r
-      DEBUG ((EFI_D_INFO, " Not Valid backup partition table\n"));\r
+      DEBUG ((DEBUG_INFO, " Not Valid backup partition table\n"));\r
       goto Done;\r
     } else {\r
-      DEBUG ((EFI_D_INFO, " Valid backup partition table\n"));\r
-      DEBUG ((EFI_D_INFO, " Restore primary partition table by the backup\n"));\r
+      DEBUG ((DEBUG_INFO, " Valid backup partition table\n"));\r
+      DEBUG ((DEBUG_INFO, " Restore primary partition table by the backup\n"));\r
       if (!PartitionRestoreGptTable (BlockIo, DiskIo, BackupHeader)) {\r
-        DEBUG ((EFI_D_INFO, " Restore primary partition table error\n"));\r
+        DEBUG ((DEBUG_INFO, " Restore primary partition table error\n"));\r
       }\r
 \r
       if (PartitionValidGptTable (BlockIo, DiskIo, BackupHeader->AlternateLBA, PrimaryHeader)) {\r
-        DEBUG ((EFI_D_INFO, " Restore backup partition table success\n"));\r
+        DEBUG ((DEBUG_INFO, " Restore backup partition table success\n"));\r
       }\r
     }\r
   } else if (!PartitionValidGptTable (BlockIo, DiskIo, PrimaryHeader->AlternateLBA, BackupHeader)) {\r
-    DEBUG ((EFI_D_INFO, " Valid primary and !Valid backup partition table\n"));\r
-    DEBUG ((EFI_D_INFO, " Restore backup partition table by the primary\n"));\r
+    DEBUG ((DEBUG_INFO, " Valid primary and !Valid backup partition table\n"));\r
+    DEBUG ((DEBUG_INFO, " Restore backup partition table by the primary\n"));\r
     if (!PartitionRestoreGptTable (BlockIo, DiskIo, PrimaryHeader)) {\r
-      DEBUG ((EFI_D_INFO, " Restore backup partition table error\n"));\r
+      DEBUG ((DEBUG_INFO, " Restore backup partition table error\n"));\r
     }\r
 \r
     if (PartitionValidGptTable (BlockIo, DiskIo, PrimaryHeader->AlternateLBA, BackupHeader)) {\r
-      DEBUG ((EFI_D_INFO, " Restore backup partition table success\n"));\r
+      DEBUG ((DEBUG_INFO, " Restore backup partition table success\n"));\r
     }\r
 \r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, " Valid primary and Valid backup partition table\n"));\r
+  DEBUG ((DEBUG_INFO, " Valid primary and Valid backup partition table\n"));\r
 \r
   //\r
   // Read the EFI Partition Entries\r
   //\r
   PartEntry = AllocatePool (PrimaryHeader->NumberOfPartitionEntries * PrimaryHeader->SizeOfPartitionEntry);\r
   if (PartEntry == NULL) {\r
-    DEBUG ((EFI_D_ERROR, "Allocate pool error\n"));\r
+    DEBUG ((DEBUG_ERROR, "Allocate pool error\n"));\r
     goto Done;\r
   }\r
 \r
@@ -340,17 +340,17 @@ PartitionInstallGptChildHandles (
                      );\r
   if (EFI_ERROR (Status)) {\r
     GptValidStatus = Status;\r
-    DEBUG ((EFI_D_ERROR, " Partition Entry ReadDisk error\n"));\r
+    DEBUG ((DEBUG_ERROR, " Partition Entry ReadDisk error\n"));\r
     goto Done;\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, " Partition entries read block success\n"));\r
+  DEBUG ((DEBUG_INFO, " Partition entries read block success\n"));\r
 \r
-  DEBUG ((EFI_D_INFO, " Number of partition entries: %d\n", PrimaryHeader->NumberOfPartitionEntries));\r
+  DEBUG ((DEBUG_INFO, " Number of partition entries: %d\n", PrimaryHeader->NumberOfPartitionEntries));\r
 \r
   PEntryStatus = AllocateZeroPool (PrimaryHeader->NumberOfPartitionEntries * sizeof (EFI_PARTITION_ENTRY_STATUS));\r
   if (PEntryStatus == NULL) {\r
-    DEBUG ((EFI_D_ERROR, "Allocate pool error\n"));\r
+    DEBUG ((DEBUG_ERROR, "Allocate pool error\n"));\r
     goto Done;\r
   }\r
 \r
@@ -401,12 +401,12 @@ PartitionInstallGptChildHandles (
     }\r
     CopyMem (&PartitionInfo.Info.Gpt, Entry, sizeof (EFI_PARTITION_ENTRY));\r
 \r
-    DEBUG ((EFI_D_INFO, " Index : %d\n", (UINT32) Index));\r
-    DEBUG ((EFI_D_INFO, " Start LBA : %lx\n", (UINT64) HdDev.PartitionStart));\r
-    DEBUG ((EFI_D_INFO, " End LBA : %lx\n", (UINT64) Entry->EndingLBA));\r
-    DEBUG ((EFI_D_INFO, " Partition size: %lx\n", (UINT64) HdDev.PartitionSize));\r
-    DEBUG ((EFI_D_INFO, " Start : %lx", MultU64x32 (Entry->StartingLBA, BlockSize)));\r
-    DEBUG ((EFI_D_INFO, " End : %lx\n", MultU64x32 (Entry->EndingLBA, BlockSize)));\r
+    DEBUG ((DEBUG_INFO, " Index : %d\n", (UINT32) Index));\r
+    DEBUG ((DEBUG_INFO, " Start LBA : %lx\n", (UINT64) HdDev.PartitionStart));\r
+    DEBUG ((DEBUG_INFO, " End LBA : %lx\n", (UINT64) Entry->EndingLBA));\r
+    DEBUG ((DEBUG_INFO, " Partition size: %lx\n", (UINT64) HdDev.PartitionSize));\r
+    DEBUG ((DEBUG_INFO, " Start : %lx", MultU64x32 (Entry->StartingLBA, BlockSize)));\r
+    DEBUG ((DEBUG_INFO, " End : %lx\n", MultU64x32 (Entry->EndingLBA, BlockSize)));\r
 \r
     Status = PartitionInstallChildHandle (\r
                This,\r
@@ -425,7 +425,7 @@ PartitionInstallGptChildHandles (
                );\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "Prepare to Free Pool\n"));\r
+  DEBUG ((DEBUG_INFO, "Prepare to Free Pool\n"));\r
 \r
 Done:\r
   if (ProtectiveMbr != NULL) {\r
@@ -481,7 +481,7 @@ PartitionValidGptTable (
   PartHdr   = AllocateZeroPool (BlockSize);\r
 \r
   if (PartHdr == NULL) {\r
-    DEBUG ((EFI_D_ERROR, "Allocate pool error\n"));\r
+    DEBUG ((DEBUG_ERROR, "Allocate pool error\n"));\r
     return FALSE;\r
   }\r
   //\r
@@ -504,7 +504,7 @@ PartitionValidGptTable (
       PartHdr->MyLBA != Lba ||\r
       (PartHdr->SizeOfPartitionEntry < sizeof (EFI_PARTITION_ENTRY))\r
       ) {\r
-    DEBUG ((EFI_D_INFO, "Invalid efi partition table header\n"));\r
+    DEBUG ((DEBUG_INFO, "Invalid efi partition table header\n"));\r
     FreePool (PartHdr);\r
     return FALSE;\r
   }\r
@@ -523,7 +523,7 @@ PartitionValidGptTable (
     return FALSE;\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, " Valid efi partition table header\n"));\r
+  DEBUG ((DEBUG_INFO, " Valid efi partition table header\n"));\r
   FreePool (PartHdr);\r
   return TRUE;\r
 }\r
@@ -557,7 +557,7 @@ PartitionCheckGptEntryArrayCRC (
   //\r
   Ptr = AllocatePool (PartHeader->NumberOfPartitionEntries * PartHeader->SizeOfPartitionEntry);\r
   if (Ptr == NULL) {\r
-    DEBUG ((EFI_D_ERROR, " Allocate pool error\n"));\r
+    DEBUG ((DEBUG_ERROR, " Allocate pool error\n"));\r
     return FALSE;\r
   }\r
 \r
@@ -577,7 +577,7 @@ PartitionCheckGptEntryArrayCRC (
 \r
   Status  = gBS->CalculateCrc32 (Ptr, Size, &Crc);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "CheckPEntryArrayCRC: Crc calculation failed\n"));\r
+    DEBUG ((DEBUG_ERROR, "CheckPEntryArrayCRC: Crc calculation failed\n"));\r
     FreePool (Ptr);\r
     return FALSE;\r
   }\r
@@ -623,7 +623,7 @@ PartitionRestoreGptTable (
   PartHdr   = AllocateZeroPool (BlockSize);\r
 \r
   if (PartHdr == NULL) {\r
-    DEBUG ((EFI_D_ERROR, "Allocate pool error\n"));\r
+    DEBUG ((DEBUG_ERROR, "Allocate pool error\n"));\r
     return FALSE;\r
   }\r
 \r
@@ -651,7 +651,7 @@ PartitionRestoreGptTable (
 \r
   Ptr = AllocatePool (PartHeader->NumberOfPartitionEntries * PartHeader->SizeOfPartitionEntry);\r
   if (Ptr == NULL) {\r
-    DEBUG ((EFI_D_ERROR, " Allocate pool error\n"));\r
+    DEBUG ((DEBUG_ERROR, " Allocate pool error\n"));\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Done;\r
   }\r
@@ -715,7 +715,7 @@ PartitionCheckGptEntry (
   UINTN                Index1;\r
   UINTN                Index2;\r
 \r
-  DEBUG ((EFI_D_INFO, " start check partition entries\n"));\r
+  DEBUG ((DEBUG_INFO, " start check partition entries\n"));\r
   for (Index1 = 0; Index1 < PartHeader->NumberOfPartitionEntries; Index1++) {\r
     Entry = (EFI_PARTITION_ENTRY *) ((UINT8 *) PartEntry + Index1 * PartHeader->SizeOfPartitionEntry);\r
     if (CompareGuid (&Entry->PartitionTypeGUID, &gEfiPartTypeUnusedGuid)) {\r
@@ -758,7 +758,7 @@ PartitionCheckGptEntry (
     }\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, " End check partition entries\n"));\r
+  DEBUG ((DEBUG_INFO, " End check partition entries\n"));\r
 }\r
 \r
 \r
@@ -850,7 +850,7 @@ PartitionCheckCrcAltSize (
   }\r
 \r
   if ((MaxSize != 0) && (Size > MaxSize)) {\r
-    DEBUG ((EFI_D_ERROR, "CheckCrc32: Size > MaxSize\n"));\r
+    DEBUG ((DEBUG_ERROR, "CheckCrc32: Size > MaxSize\n"));\r
     return FALSE;\r
   }\r
   //\r
@@ -861,7 +861,7 @@ PartitionCheckCrcAltSize (
 \r
   Status      = gBS->CalculateCrc32 ((UINT8 *) Hdr, Size, &Crc);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "CheckCrc32: Crc calculation failed\n"));\r
+    DEBUG ((DEBUG_ERROR, "CheckCrc32: Crc calculation failed\n"));\r
     return FALSE;\r
   }\r
   //\r
@@ -874,7 +874,7 @@ PartitionCheckCrcAltSize (
   //\r
   DEBUG_CODE_BEGIN ();\r
     if (OrgCrc != Crc) {\r
-      DEBUG ((EFI_D_ERROR, "CheckCrc32: Crc check failed\n"));\r
+      DEBUG ((DEBUG_ERROR, "CheckCrc32: Crc check failed\n"));\r
     }\r
   DEBUG_CODE_END ();\r
 \r