MdeModulePkg: Change use of EFI_D_* to DEBUG_*

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3739

Update all use of EFI_D_* defines in DEBUG() macros to DEBUG_* defines.

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

8 files changed, 63 insertions, 64 deletions

diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
index fd34f07..242dbf8 100644
--- a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
+++ b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c
@@ -231,9 +231,9 @@ UpdateBlocksAndVolumes (
             ) {

           continue;

         }

-        DEBUG ((EFI_D_INFO, "PeiCdExpress InterfaceType is %d\n", Media2.InterfaceType));

-        DEBUG ((EFI_D_INFO, "PeiCdExpress MediaPresent is %d\n", Media2.MediaPresent));

-        DEBUG ((EFI_D_INFO, "PeiCdExpress BlockSize is  0x%x\n", Media2.BlockSize));

+        DEBUG ((DEBUG_INFO, "PeiCdExpress InterfaceType is %d\n", Media2.InterfaceType));

+        DEBUG ((DEBUG_INFO, "PeiCdExpress MediaPresent is %d\n", Media2.MediaPresent));

+        DEBUG ((DEBUG_INFO, "PeiCdExpress BlockSize is  0x%x\n", Media2.BlockSize));

       } else {

         Status = BlockIoPpi->GetBlockDeviceMediaInfo (

                               PeiServices,

@@ -248,14 +248,14 @@ UpdateBlocksAndVolumes (
             ) {

           continue;

         }

-        DEBUG ((EFI_D_INFO, "PeiCdExpress DeviceType is %d\n", Media.DeviceType));

-        DEBUG ((EFI_D_INFO, "PeiCdExpress MediaPresent is %d\n", Media.MediaPresent));

-        DEBUG ((EFI_D_INFO, "PeiCdExpress BlockSize is  0x%x\n", Media.BlockSize));

+        DEBUG ((DEBUG_INFO, "PeiCdExpress DeviceType is %d\n", Media.DeviceType));

+        DEBUG ((DEBUG_INFO, "PeiCdExpress MediaPresent is %d\n", Media.MediaPresent));

+        DEBUG ((DEBUG_INFO, "PeiCdExpress BlockSize is  0x%x\n", Media.BlockSize));

       }

 

-      DEBUG ((EFI_D_INFO, "PeiCdExpress Status is %d\n", Status));

+      DEBUG ((DEBUG_INFO, "PeiCdExpress Status is %d\n", Status));

 

-      DEBUG ((EFI_D_INFO, "IndexBlockDevice is %d\n", IndexBlockDevice));

+      DEBUG ((DEBUG_INFO, "IndexBlockDevice is %d\n", IndexBlockDevice));

       PrivateData->CapsuleData[PrivateData->CapsuleCount].IndexBlock = IndexBlockDevice;

       if (BlockIo2) {

         PrivateData->CapsuleData[PrivateData->CapsuleCount].BlockIo2 = BlockIo2Ppi;

@@ -263,7 +263,7 @@ UpdateBlocksAndVolumes (
         PrivateData->CapsuleData[PrivateData->CapsuleCount].BlockIo  = BlockIoPpi;

       }

       Status = FindRecoveryCapsules (PrivateData);

-      DEBUG ((EFI_D_INFO, "Status is %d\n", Status));

+      DEBUG ((DEBUG_INFO, "Status is %d\n", Status));

 

       if (EFI_ERROR (Status)) {

         continue;

diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c
index e19466b..235db92 100644
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c
+++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIo.c
@@ -492,7 +492,7 @@ DiskIoCreateSubtask (
     }

   }

   DEBUG ((

-    EFI_D_BLKIO,

+    DEBUG_BLKIO,

     "  %c:Lba/Offset/Length/WorkingBuffer/Buffer = %016lx/%08x/%08x/%08x/%08x\n",

     Write ? 'W': 'R', Lba, Offset, Length, WorkingBuffer, Buffer

     ));

@@ -540,7 +540,7 @@ DiskIoCreateSubtaskList (
   VOID                  *WorkingBuffer;

   LIST_ENTRY            *Link;

 

-  DEBUG ((EFI_D_BLKIO, "DiskIo: Create subtasks for task: Offset/BufferSize/Buffer = %016lx/%08x/%08x\n", Offset, BufferSize, Buffer));

+  DEBUG ((DEBUG_BLKIO, "DiskIo: Create subtasks for task: Offset/BufferSize/Buffer = %016lx/%08x/%08x\n", Offset, BufferSize, Buffer));

 

   BlockSize = Instance->BlockIo->Media->BlockSize;

   IoAlign   = Instance->BlockIo->Media->IoAlign;

@@ -668,7 +668,7 @@ DiskIoCreateSubtaskList (
           //

           // If there is not enough memory, downgrade to blocking access

           //

-          DEBUG ((EFI_D_VERBOSE, "DiskIo: No enough memory so downgrade to blocking access\n"));

+          DEBUG ((DEBUG_VERBOSE, "DiskIo: No enough memory so downgrade to blocking access\n"));

           if (!DiskIoCreateSubtaskList (Instance, Write, Offset, BufferSize, BufferPtr, TRUE, SharedWorkingBuffer, Subtasks)) {

             goto Done;

           }

@@ -970,7 +970,7 @@ DiskIo2ReadWriteDisk (
       // Task->Token should be set to NULL by the DiskIo2OnReadWriteComplete

       // It it's not, that means the non-blocking request was downgraded to blocking request.

       //

-      DEBUG ((EFI_D_VERBOSE, "DiskIo: Non-blocking request was downgraded to blocking request, signal event directly.\n"));

+      DEBUG ((DEBUG_VERBOSE, "DiskIo: Non-blocking request was downgraded to blocking request, signal event directly.\n"));

       Task->Token->TransactionStatus = Status;

       gBS->SignalEvent (Task->Token->Event);

     }

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c b/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
index 3d2ff3b..e2b028f 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
@@ -141,7 +141,7 @@ PartitionInstallElToritoChildHandles (
                        Catalog

                        );

     if (EFI_ERROR (Status)) {

-      DEBUG ((EFI_D_ERROR, "EltCheckDevice: error reading catalog %r\n", Status));

+      DEBUG ((DEBUG_ERROR, "EltCheckDevice: error reading catalog %r\n", Status));

       continue;

     }

     //

@@ -149,7 +149,7 @@ PartitionInstallElToritoChildHandles (
     // to make sure it looks like a Catalog header

     //

     if (Catalog->Catalog.Indicator != ELTORITO_ID_CATALOG || Catalog->Catalog.Id55AA != 0xAA55) {

-      DEBUG ((EFI_D_ERROR, "EltCheckBootCatalog: El Torito boot catalog header IDs not correct\n"));

+      DEBUG ((DEBUG_ERROR, "EltCheckBootCatalog: El Torito boot catalog header IDs not correct\n"));

       continue;

     }

 

@@ -160,7 +160,7 @@ PartitionInstallElToritoChildHandles (
     }

 

     if ((Check & 0xFFFF) != 0) {

-      DEBUG ((EFI_D_ERROR, "EltCheckBootCatalog: El Torito boot catalog header checksum failed\n"));

+      DEBUG ((DEBUG_ERROR, "EltCheckBootCatalog: El Torito boot catalog header checksum failed\n"));

       continue;

     }

 

@@ -203,7 +203,7 @@ PartitionInstallElToritoChildHandles (
         break;

 

       default:

-        DEBUG ((EFI_D_INIT, "EltCheckDevice: unsupported El Torito boot media type %x\n", Catalog->Boot.MediaType));

+        DEBUG ((DEBUG_INIT, "EltCheckDevice: unsupported El Torito boot media type %x\n", Catalog->Boot.MediaType));

         SectorCount   = 0;

         SubBlockSize  = Media->BlockSize;

         break;

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
index efaff5e..e985bd2 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Gpt.c
@@ -225,8 +225,8 @@ PartitionInstallGptChildHandles (
   LastBlock     = BlockIo->Media->LastBlock;

   MediaId       = BlockIo->Media->MediaId;

 

-  DEBUG ((EFI_D_INFO, " BlockSize : %d \n", BlockSize));

-  DEBUG ((EFI_D_INFO, " LastBlock : %lx \n", LastBlock));

+  DEBUG ((DEBUG_INFO, " BlockSize : %d \n", BlockSize));

+  DEBUG ((DEBUG_INFO, " LastBlock : %lx \n", LastBlock));

 

   GptValidStatus = EFI_NOT_FOUND;

 

@@ -291,43 +291,43 @@ PartitionInstallGptChildHandles (
   // Check primary and backup partition tables

   //

   if (!PartitionValidGptTable (BlockIo, DiskIo, PRIMARY_PART_HEADER_LBA, PrimaryHeader)) {

-    DEBUG ((EFI_D_INFO, " Not Valid primary partition table\n"));

+    DEBUG ((DEBUG_INFO, " Not Valid primary partition table\n"));

 

     if (!PartitionValidGptTable (BlockIo, DiskIo, LastBlock, BackupHeader)) {

-      DEBUG ((EFI_D_INFO, " Not Valid backup partition table\n"));

+      DEBUG ((DEBUG_INFO, " Not Valid backup partition table\n"));

       goto Done;

     } else {

-      DEBUG ((EFI_D_INFO, " Valid backup partition table\n"));

-      DEBUG ((EFI_D_INFO, " Restore primary partition table by the backup\n"));

+      DEBUG ((DEBUG_INFO, " Valid backup partition table\n"));

+      DEBUG ((DEBUG_INFO, " Restore primary partition table by the backup\n"));

       if (!PartitionRestoreGptTable (BlockIo, DiskIo, BackupHeader)) {

-        DEBUG ((EFI_D_INFO, " Restore primary partition table error\n"));

+        DEBUG ((DEBUG_INFO, " Restore primary partition table error\n"));

       }

 

       if (PartitionValidGptTable (BlockIo, DiskIo, BackupHeader->AlternateLBA, PrimaryHeader)) {

-        DEBUG ((EFI_D_INFO, " Restore backup partition table success\n"));

+        DEBUG ((DEBUG_INFO, " Restore backup partition table success\n"));

       }

     }

   } else if (!PartitionValidGptTable (BlockIo, DiskIo, PrimaryHeader->AlternateLBA, BackupHeader)) {

-    DEBUG ((EFI_D_INFO, " Valid primary and !Valid backup partition table\n"));

-    DEBUG ((EFI_D_INFO, " Restore backup partition table by the primary\n"));

+    DEBUG ((DEBUG_INFO, " Valid primary and !Valid backup partition table\n"));

+    DEBUG ((DEBUG_INFO, " Restore backup partition table by the primary\n"));

     if (!PartitionRestoreGptTable (BlockIo, DiskIo, PrimaryHeader)) {

-      DEBUG ((EFI_D_INFO, " Restore backup partition table error\n"));

+      DEBUG ((DEBUG_INFO, " Restore backup partition table error\n"));

     }

 

     if (PartitionValidGptTable (BlockIo, DiskIo, PrimaryHeader->AlternateLBA, BackupHeader)) {

-      DEBUG ((EFI_D_INFO, " Restore backup partition table success\n"));

+      DEBUG ((DEBUG_INFO, " Restore backup partition table success\n"));

     }

 

   }

 

-  DEBUG ((EFI_D_INFO, " Valid primary and Valid backup partition table\n"));

+  DEBUG ((DEBUG_INFO, " Valid primary and Valid backup partition table\n"));

 

   //

   // Read the EFI Partition Entries

   //

   PartEntry = AllocatePool (PrimaryHeader->NumberOfPartitionEntries * PrimaryHeader->SizeOfPartitionEntry);

   if (PartEntry == NULL) {

-    DEBUG ((EFI_D_ERROR, "Allocate pool error\n"));

+    DEBUG ((DEBUG_ERROR, "Allocate pool error\n"));

     goto Done;

   }

 

@@ -340,17 +340,17 @@ PartitionInstallGptChildHandles (
                      );

   if (EFI_ERROR (Status)) {

     GptValidStatus = Status;

-    DEBUG ((EFI_D_ERROR, " Partition Entry ReadDisk error\n"));

+    DEBUG ((DEBUG_ERROR, " Partition Entry ReadDisk error\n"));

     goto Done;

   }

 

-  DEBUG ((EFI_D_INFO, " Partition entries read block success\n"));

+  DEBUG ((DEBUG_INFO, " Partition entries read block success\n"));

 

-  DEBUG ((EFI_D_INFO, " Number of partition entries: %d\n", PrimaryHeader->NumberOfPartitionEntries));

+  DEBUG ((DEBUG_INFO, " Number of partition entries: %d\n", PrimaryHeader->NumberOfPartitionEntries));

 

   PEntryStatus = AllocateZeroPool (PrimaryHeader->NumberOfPartitionEntries * sizeof (EFI_PARTITION_ENTRY_STATUS));

   if (PEntryStatus == NULL) {

-    DEBUG ((EFI_D_ERROR, "Allocate pool error\n"));

+    DEBUG ((DEBUG_ERROR, "Allocate pool error\n"));

     goto Done;

   }

 

@@ -401,12 +401,12 @@ PartitionInstallGptChildHandles (
     }

     CopyMem (&PartitionInfo.Info.Gpt, Entry, sizeof (EFI_PARTITION_ENTRY));

 

-    DEBUG ((EFI_D_INFO, " Index : %d\n", (UINT32) Index));

-    DEBUG ((EFI_D_INFO, " Start LBA : %lx\n", (UINT64) HdDev.PartitionStart));

-    DEBUG ((EFI_D_INFO, " End LBA : %lx\n", (UINT64) Entry->EndingLBA));

-    DEBUG ((EFI_D_INFO, " Partition size: %lx\n", (UINT64) HdDev.PartitionSize));

-    DEBUG ((EFI_D_INFO, " Start : %lx", MultU64x32 (Entry->StartingLBA, BlockSize)));

-    DEBUG ((EFI_D_INFO, " End : %lx\n", MultU64x32 (Entry->EndingLBA, BlockSize)));

+    DEBUG ((DEBUG_INFO, " Index : %d\n", (UINT32) Index));

+    DEBUG ((DEBUG_INFO, " Start LBA : %lx\n", (UINT64) HdDev.PartitionStart));

+    DEBUG ((DEBUG_INFO, " End LBA : %lx\n", (UINT64) Entry->EndingLBA));

+    DEBUG ((DEBUG_INFO, " Partition size: %lx\n", (UINT64) HdDev.PartitionSize));

+    DEBUG ((DEBUG_INFO, " Start : %lx", MultU64x32 (Entry->StartingLBA, BlockSize)));

+    DEBUG ((DEBUG_INFO, " End : %lx\n", MultU64x32 (Entry->EndingLBA, BlockSize)));

 

     Status = PartitionInstallChildHandle (

                This,

@@ -425,7 +425,7 @@ PartitionInstallGptChildHandles (
                );

   }

 

-  DEBUG ((EFI_D_INFO, "Prepare to Free Pool\n"));

+  DEBUG ((DEBUG_INFO, "Prepare to Free Pool\n"));

 

 Done:

   if (ProtectiveMbr != NULL) {

@@ -481,7 +481,7 @@ PartitionValidGptTable (
   PartHdr   = AllocateZeroPool (BlockSize);

 

   if (PartHdr == NULL) {

-    DEBUG ((EFI_D_ERROR, "Allocate pool error\n"));

+    DEBUG ((DEBUG_ERROR, "Allocate pool error\n"));

     return FALSE;

   }

   //

@@ -504,7 +504,7 @@ PartitionValidGptTable (
       PartHdr->MyLBA != Lba ||

       (PartHdr->SizeOfPartitionEntry < sizeof (EFI_PARTITION_ENTRY))

       ) {

-    DEBUG ((EFI_D_INFO, "Invalid efi partition table header\n"));

+    DEBUG ((DEBUG_INFO, "Invalid efi partition table header\n"));

     FreePool (PartHdr);

     return FALSE;

   }

@@ -523,7 +523,7 @@ PartitionValidGptTable (
     return FALSE;

   }

 

-  DEBUG ((EFI_D_INFO, " Valid efi partition table header\n"));

+  DEBUG ((DEBUG_INFO, " Valid efi partition table header\n"));

   FreePool (PartHdr);

   return TRUE;

 }

@@ -557,7 +557,7 @@ PartitionCheckGptEntryArrayCRC (
   //

   Ptr = AllocatePool (PartHeader->NumberOfPartitionEntries * PartHeader->SizeOfPartitionEntry);

   if (Ptr == NULL) {

-    DEBUG ((EFI_D_ERROR, " Allocate pool error\n"));

+    DEBUG ((DEBUG_ERROR, " Allocate pool error\n"));

     return FALSE;

   }

 

@@ -577,7 +577,7 @@ PartitionCheckGptEntryArrayCRC (
 

   Status  = gBS->CalculateCrc32 (Ptr, Size, &Crc);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "CheckPEntryArrayCRC: Crc calculation failed\n"));

+    DEBUG ((DEBUG_ERROR, "CheckPEntryArrayCRC: Crc calculation failed\n"));

     FreePool (Ptr);

     return FALSE;

   }

@@ -623,7 +623,7 @@ PartitionRestoreGptTable (
   PartHdr   = AllocateZeroPool (BlockSize);

 

   if (PartHdr == NULL) {

-    DEBUG ((EFI_D_ERROR, "Allocate pool error\n"));

+    DEBUG ((DEBUG_ERROR, "Allocate pool error\n"));

     return FALSE;

   }

 

@@ -651,7 +651,7 @@ PartitionRestoreGptTable (
 

   Ptr = AllocatePool (PartHeader->NumberOfPartitionEntries * PartHeader->SizeOfPartitionEntry);

   if (Ptr == NULL) {

-    DEBUG ((EFI_D_ERROR, " Allocate pool error\n"));

+    DEBUG ((DEBUG_ERROR, " Allocate pool error\n"));

     Status = EFI_OUT_OF_RESOURCES;

     goto Done;

   }

@@ -715,7 +715,7 @@ PartitionCheckGptEntry (
   UINTN                Index1;

   UINTN                Index2;

 

-  DEBUG ((EFI_D_INFO, " start check partition entries\n"));

+  DEBUG ((DEBUG_INFO, " start check partition entries\n"));

   for (Index1 = 0; Index1 < PartHeader->NumberOfPartitionEntries; Index1++) {

     Entry = (EFI_PARTITION_ENTRY *) ((UINT8 *) PartEntry + Index1 * PartHeader->SizeOfPartitionEntry);

     if (CompareGuid (&Entry->PartitionTypeGUID, &gEfiPartTypeUnusedGuid)) {

@@ -758,7 +758,7 @@ PartitionCheckGptEntry (
     }

   }

 

-  DEBUG ((EFI_D_INFO, " End check partition entries\n"));

+  DEBUG ((DEBUG_INFO, " End check partition entries\n"));

 }

 

 

@@ -850,7 +850,7 @@ PartitionCheckCrcAltSize (
   }

 

   if ((MaxSize != 0) && (Size > MaxSize)) {

-    DEBUG ((EFI_D_ERROR, "CheckCrc32: Size > MaxSize\n"));

+    DEBUG ((DEBUG_ERROR, "CheckCrc32: Size > MaxSize\n"));

     return FALSE;

   }

   //

@@ -861,7 +861,7 @@ PartitionCheckCrcAltSize (
 

   Status      = gBS->CalculateCrc32 ((UINT8 *) Hdr, Size, &Crc);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "CheckCrc32: Crc calculation failed\n"));

+    DEBUG ((DEBUG_ERROR, "CheckCrc32: Crc calculation failed\n"));

     return FALSE;

   }

   //

@@ -874,7 +874,7 @@ PartitionCheckCrcAltSize (
   //

   DEBUG_CODE_BEGIN ();

     if (OrgCrc != Crc) {

-      DEBUG ((EFI_D_ERROR, "CheckCrc32: Crc check failed\n"));

+      DEBUG ((DEBUG_ERROR, "CheckCrc32: Crc check failed\n"));

     }

   DEBUG_CODE_END ();

 

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
index f0c92aa..df25a93 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Mbr.c
@@ -71,7 +71,7 @@ PartitionValidMbr (
       // with INT 13h

       //

 

-      DEBUG((EFI_D_INFO, "PartitionValidMbr: Bad MBR partition size EndingLBA(%1x) > LastLBA(%1x)\n", EndingLBA, LastLba));

+      DEBUG((DEBUG_INFO, "PartitionValidMbr: Bad MBR partition size EndingLBA(%1x) > LastLBA(%1x)\n", EndingLBA, LastLba));

 

       return FALSE;

     }

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
index 473e091..aebc8a1 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
@@ -417,7 +417,7 @@ PartitionDriverBindingStop (
     // bus driver. Hence, additional check is needed here.

     //

     if (HasChildren (ControllerHandle)) {

-      DEBUG((EFI_D_ERROR, "PartitionDriverBindingStop: Still has child.\n"));

+      DEBUG((DEBUG_ERROR, "PartitionDriverBindingStop: Still has child.\n"));

       return EFI_DEVICE_ERROR;

     }

 

@@ -486,7 +486,7 @@ PartitionDriverBindingStop (
 

     if (BlockIo2 != NULL) {

       Status = BlockIo2->FlushBlocksEx (BlockIo2, NULL);

-      DEBUG((EFI_D_ERROR, "PartitionDriverBindingStop: FlushBlocksEx returned with %r\n", Status));

+      DEBUG((DEBUG_ERROR, "PartitionDriverBindingStop: FlushBlocksEx returned with %r\n", Status));

     } else {

       Status = EFI_SUCCESS;

     }

@@ -1372,4 +1372,3 @@ HasChildren (
 

   return (BOOLEAN) (Index < EntryCount);

 }

-

diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c
index 13e2aed..1ecf8da 100644
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c
+++ b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c
@@ -68,7 +68,7 @@ RamDiskAcpiCheck (
                   );

   if (EFI_ERROR (Status)) {

     DEBUG ((

-      EFI_D_INFO,

+      DEBUG_INFO,

       "RamDiskAcpiCheck: Cannot locate the EFI ACPI Table Protocol, "

       "unable to publish RAM disks to NFIT.\n"

       ));

@@ -85,7 +85,7 @@ RamDiskAcpiCheck (
                   );

   if (EFI_ERROR (Status)) {

     DEBUG ((

-      EFI_D_INFO,

+      DEBUG_INFO,

       "RamDiskAcpiCheck: Cannot locate the EFI ACPI Sdt Protocol, "

       "unable to publish RAM disks to NFIT.\n"

       ));

@@ -134,7 +134,7 @@ RamDiskDxeEntryPoint (
                   &DummyInterface

                   );

   if (!EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_INFO, "Driver already started!\n"));

+    DEBUG ((DEBUG_INFO, "Driver already started!\n"));

     return EFI_ALREADY_STARTED;

   }

 

diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c
index a45a55c..329de17 100644
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c
+++ b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c
@@ -194,7 +194,7 @@ RamDiskPublishNfit (
          >= PrivateData->StartingAddr + PrivateData->Size)) {

       MemoryFound = TRUE;

       DEBUG ((

-        EFI_D_INFO,

+        DEBUG_INFO,

         "RamDiskPublishNfit: RAM disk with reserved memory type, will publish to NFIT.\n"

         ));

       break;

@@ -237,7 +237,7 @@ RamDiskPublishNfit (
     // A NFIT is already in the ACPI table.

     //

     DEBUG ((

-      EFI_D_INFO,

+      DEBUG_INFO,

       "RamDiskPublishNfit: A NFIT is already exist in the ACPI Table.\n"

       ));

 

@@ -300,7 +300,7 @@ RamDiskPublishNfit (
     // No NFIT is in the ACPI table, we will create one here.

     //

     DEBUG ((

-      EFI_D_INFO,

+      DEBUG_INFO,

       "RamDiskPublishNfit: No NFIT is in the ACPI Table, will create one.\n"

       ));