EmbeddedPkg: Change use of EFI_D_* to DEBUG_*

[mirror_edk2.git] / EmbeddedPkg / Universal / MmcDxe / MmcIdentification.c

diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c
index 4dc0be125c6357baf781d4a212f68d47eb863737..0df948426fb32d0f20069282bca9818ec528202a 100755 (executable)
--- a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c
+++ b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c
@@ -81,16 +81,16 @@ EmmcGetDeviceState (
   RCA = MmcHostInstance->CardInfo.RCA << RCA_SHIFT_OFFSET;\r
   Status = Host->SendCommand (Host, MMC_CMD13, RCA);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "EmmcGetDeviceState(): Failed to get card status, Status=%r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "EmmcGetDeviceState(): Failed to get card status, Status=%r.\n", Status));\r
     return Status;\r
   }\r
   Status = Host->ReceiveResponse (Host, MMC_RESPONSE_TYPE_R1, &Data);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "EmmcGetDeviceState(): Failed to get response of CMD13, Status=%r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "EmmcGetDeviceState(): Failed to get response of CMD13, Status=%r.\n", Status));\r
     return Status;\r
   }\r
   if (Data & EMMC_SWITCH_ERROR) {\r
-    DEBUG ((EFI_D_ERROR, "EmmcGetDeviceState(): Failed to switch expected mode, Status=%r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "EmmcGetDeviceState(): Failed to switch expected mode, Status=%r.\n", Status));\r
     return EFI_DEVICE_ERROR;\r
   }\r
   *State = DEVICE_STATE(Data);\r
@@ -116,14 +116,14 @@ EmmcSetEXTCSD (
              EMMC_CMD6_ARG_VALUE(Value) | EMMC_CMD6_ARG_CMD_SET(1);\r
   Status = Host->SendCommand (Host, MMC_CMD6, Argument);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "EmmcSetEXTCSD(): Failed to send CMD6, Status=%r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "EmmcSetEXTCSD(): Failed to send CMD6, Status=%r.\n", Status));\r
     return Status;\r
   }\r
   // Make sure device exiting prog mode\r
   do {\r
     Status = EmmcGetDeviceState (MmcHostInstance, &State);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "EmmcSetEXTCSD(): Failed to get device state, Status=%r.\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "EmmcSetEXTCSD(): Failed to get device state, Status=%r.\n", Status));\r
       return Status;\r
     }\r
   } while (State == EMMC_PRG_STATE);\r
@@ -150,13 +150,13 @@ EmmcIdentificationMode (
   // Fetch card identity register\r
   Status = Host->SendCommand (Host, MMC_CMD2, 0);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): Failed to send CMD2, Status=%r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "EmmcIdentificationMode(): Failed to send CMD2, Status=%r.\n", Status));\r
     return Status;\r
   }\r
 \r
   Status = Host->ReceiveResponse (Host, MMC_RESPONSE_TYPE_R2, (UINT32 *)&(MmcHostInstance->CardInfo.CIDData));\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): CID retrieval error, Status=%r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "EmmcIdentificationMode(): CID retrieval error, Status=%r.\n", Status));\r
     return Status;\r
   }\r
 \r
@@ -165,41 +165,41 @@ EmmcIdentificationMode (
   RCA = MmcHostInstance->CardInfo.RCA << RCA_SHIFT_OFFSET;\r
   Status = Host->SendCommand (Host, MMC_CMD3, RCA);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): RCA set error, Status=%r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "EmmcIdentificationMode(): RCA set error, Status=%r.\n", Status));\r
     return Status;\r
   }\r
 \r
   // Fetch card specific data\r
   Status = Host->SendCommand (Host, MMC_CMD9, RCA);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): Failed to send CMD9, Status=%r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "EmmcIdentificationMode(): Failed to send CMD9, Status=%r.\n", Status));\r
     return Status;\r
   }\r
 \r
   Status = Host->ReceiveResponse (Host, MMC_RESPONSE_TYPE_R2, (UINT32 *)&(MmcHostInstance->CardInfo.CSDData));\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): CSD retrieval error, Status=%r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "EmmcIdentificationMode(): CSD retrieval error, Status=%r.\n", Status));\r
     return Status;\r
   }\r
 \r
   // Select the card\r
   Status = Host->SendCommand (Host, MMC_CMD7, RCA);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): Card selection error, Status=%r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "EmmcIdentificationMode(): Card selection error, Status=%r.\n", Status));\r
   }\r
 \r
   if (MMC_HOST_HAS_SETIOS(Host)) {\r
     // Set 1-bit bus width\r
     Status = Host->SetIos (Host, 0, 1, EMMCBACKWARD);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): Set 1-bit bus width error, Status=%r.\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "EmmcIdentificationMode(): Set 1-bit bus width error, Status=%r.\n", Status));\r
       return Status;\r
     }\r
 \r
     // Set 1-bit bus width for EXTCSD\r
     Status = EmmcSetEXTCSD (MmcHostInstance, EXTCSD_BUS_WIDTH, EMMC_BUS_WIDTH_1BIT);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): Set extcsd bus width error, Status=%r.\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "EmmcIdentificationMode(): Set extcsd bus width error, Status=%r.\n", Status));\r
       return Status;\r
     }\r
   }\r
@@ -211,12 +211,12 @@ EmmcIdentificationMode (
   }\r
   Status = Host->SendCommand (Host, MMC_CMD8, 0);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): ECSD fetch error, Status=%r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "EmmcIdentificationMode(): ECSD fetch error, Status=%r.\n", Status));\r
   }\r
 \r
   Status = Host->ReadBlockData (Host, 0, 512, (UINT32 *)MmcHostInstance->CardInfo.ECSDData);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): ECSD read error, Status=%r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "EmmcIdentificationMode(): ECSD read error, Status=%r.\n", Status));\r
     goto FreePageExit;\r
   }\r
 \r
@@ -224,7 +224,7 @@ EmmcIdentificationMode (
   do {\r
     Status = EmmcGetDeviceState (MmcHostInstance, &State);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): Failed to get device state, Status=%r.\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "EmmcIdentificationMode(): Failed to get device state, Status=%r.\n", Status));\r
       goto FreePageExit;\r
     }\r
   } while (State == EMMC_DATA_STATE);\r
@@ -353,14 +353,14 @@ InitializeSdMmcDevice (
   CmdArg = MmcHostInstance->CardInfo.RCA << 16;\r
   Status = MmcHost->SendCommand (MmcHost, MMC_CMD9, CmdArg);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG((EFI_D_ERROR, "InitializeSdMmcDevice(MMC_CMD9): Error, Status=%r\n", Status));\r
+    DEBUG((DEBUG_ERROR, "InitializeSdMmcDevice(MMC_CMD9): Error, Status=%r\n", Status));\r
     return Status;\r
   }\r
 \r
   // Read Response\r
   Status = MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_CSD, Response);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG((EFI_D_ERROR, "InitializeSdMmcDevice(): Failed to receive CSD, Status=%r\n", Status));\r
+    DEBUG((DEBUG_ERROR, "InitializeSdMmcDevice(): Failed to receive CSD, Status=%r\n", Status));\r
     return Status;\r
   }\r
   PrintCSD (Response);\r
@@ -395,7 +395,7 @@ InitializeSdMmcDevice (
   CmdArg = MmcHostInstance->CardInfo.RCA << 16;\r
   Status = MmcHost->SendCommand (MmcHost, MMC_CMD7, CmdArg);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG((EFI_D_ERROR, "InitializeSdMmcDevice(MMC_CMD7): Error and Status = %r\n", Status));\r
+    DEBUG((DEBUG_ERROR, "InitializeSdMmcDevice(MMC_CMD7): Error and Status = %r\n", Status));\r
     return Status;\r
   }\r
 \r
@@ -416,38 +416,38 @@ InitializeSdMmcDevice (
   /* SCR */\r
   Status = MmcHost->SendCommand (MmcHost, MMC_ACMD51, 0);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "%a(MMC_ACMD51): Error and Status = %r\n", __func__, Status));\r
+    DEBUG ((DEBUG_ERROR, "%a(MMC_ACMD51): Error and Status = %r\n", __func__, Status));\r
     return Status;\r
   } else {\r
     Status = MmcHost->ReadBlockData (MmcHost, 0, 8, Buffer);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "%a(MMC_ACMD51): ReadBlockData Error and Status = %r\n", __func__, Status));\r
+      DEBUG ((DEBUG_ERROR, "%a(MMC_ACMD51): ReadBlockData Error and Status = %r\n", __func__, Status));\r
       return Status;\r
     }\r
     CopyMem (&Scr, Buffer, 8);\r
     if (Scr.SD_SPEC == 2) {\r
       if (Scr.SD_SPEC3 == 1) {\r
-       if (Scr.SD_SPEC4 == 1) {\r
-          DEBUG ((EFI_D_INFO, "Found SD Card for Spec Version 4.xx\n"));\r
-       } else {\r
-          DEBUG ((EFI_D_INFO, "Found SD Card for Spec Version 3.0x\n"));\r
-       }\r
+  if (Scr.SD_SPEC4 == 1) {\r
+          DEBUG ((DEBUG_INFO, "Found SD Card for Spec Version 4.xx\n"));\r
+  } else {\r
+          DEBUG ((DEBUG_INFO, "Found SD Card for Spec Version 3.0x\n"));\r
+  }\r
       } else {\r
-       if (Scr.SD_SPEC4 == 0) {\r
-          DEBUG ((EFI_D_INFO, "Found SD Card for Spec Version 2.0\n"));\r
-       } else {\r
-         DEBUG ((EFI_D_ERROR, "Found invalid SD Card\n"));\r
-       }\r
+  if (Scr.SD_SPEC4 == 0) {\r
+          DEBUG ((DEBUG_INFO, "Found SD Card for Spec Version 2.0\n"));\r
+  } else {\r
+    DEBUG ((DEBUG_ERROR, "Found invalid SD Card\n"));\r
+  }\r
       }\r
     } else {\r
       if ((Scr.SD_SPEC3 == 0) && (Scr.SD_SPEC4 == 0)) {\r
         if (Scr.SD_SPEC == 1) {\r
-         DEBUG ((EFI_D_INFO, "Found SD Card for Spec Version 1.10\n"));\r
-       } else {\r
-         DEBUG ((EFI_D_INFO, "Found SD Card for Spec Version 1.0\n"));\r
-       }\r
+    DEBUG ((DEBUG_INFO, "Found SD Card for Spec Version 1.10\n"));\r
+  } else {\r
+    DEBUG ((DEBUG_INFO, "Found SD Card for Spec Version 1.0\n"));\r
+  }\r
       } else {\r
-        DEBUG ((EFI_D_ERROR, "Found invalid SD Card\n"));\r
+        DEBUG ((DEBUG_ERROR, "Found invalid SD Card\n"));\r
       }\r
     }\r
   }\r
@@ -543,19 +543,19 @@ MmcIdentificationMode (
     // Initialize the MMC Host HW\r
     Status = MmcNotifyState (MmcHostInstance, MmcHwInitializationState);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcHwInitializationState, Status=%r.\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "MmcIdentificationMode() : Error MmcHwInitializationState, Status=%r.\n", Status));\r
       return Status;\r
     }\r
   }\r
 \r
   Status = MmcHost->SendCommand (MmcHost, MMC_CMD0, 0);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD0): Error, Status=%r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "MmcIdentificationMode(MMC_CMD0): Error, Status=%r.\n", Status));\r
     return Status;\r
   }\r
   Status = MmcNotifyState (MmcHostInstance, MmcIdleState);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcIdleState, Status=%r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "MmcIdentificationMode() : Error MmcIdleState, Status=%r.\n", Status));\r
     return Status;\r
   }\r
 \r
@@ -568,14 +568,14 @@ MmcIdentificationMode (
       break;\r
     Status = MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_OCR, (UINT32 *)&OcrResponse);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "MmcIdentificationMode() : Failed to receive OCR, Status=%r.\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "MmcIdentificationMode() : Failed to receive OCR, Status=%r.\n", Status));\r
       return Status;\r
     }\r
     Timeout--;\r
   } while (!OcrResponse.Ocr.PowerUp && (Timeout > 0));\r
   if (Status == EFI_SUCCESS) {\r
     if (!OcrResponse.Ocr.PowerUp) {\r
-      DEBUG ((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD1): Card initialisation failure, Status=%r.\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "MmcIdentificationMode(MMC_CMD1): Card initialisation failure, Status=%r.\n", Status));\r
       return EFI_DEVICE_ERROR;\r
     }\r
     OcrResponse.Ocr.PowerUp = 0;\r
@@ -595,7 +595,7 @@ MmcIdentificationMode (
   // Are we using SDIO ?\r
   Status = MmcHost->SendCommand (MmcHost, MMC_CMD5, 0);\r
   if (Status == EFI_SUCCESS) {\r
-    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD5): Error - SDIO not supported, Status=%r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "MmcIdentificationMode(MMC_CMD5): Error - SDIO not supported, Status=%r.\n", Status));\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -603,21 +603,21 @@ MmcIdentificationMode (
   CmdArg = (0x0UL << 12 | BIT8 | 0xCEUL << 0);\r
   Status = MmcHost->SendCommand (MmcHost, MMC_CMD8, CmdArg);\r
   if (Status == EFI_SUCCESS) {\r
-    DEBUG ((EFI_D_ERROR, "Card is SD2.0 => Supports high capacity\n"));\r
+    DEBUG ((DEBUG_ERROR, "Card is SD2.0 => Supports high capacity\n"));\r
     IsHCS = TRUE;\r
     Status = MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_R7, Response);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "MmcIdentificationMode() : Failed to receive response to CMD8, Status=%r.\n", Status));\r
+      DEBUG ((DEBUG_ERROR, "MmcIdentificationMode() : Failed to receive response to CMD8, Status=%r.\n", Status));\r
       return Status;\r
     }\r
     PrintResponseR1 (Response[0]);\r
     // Check if it is valid response\r
     if (Response[0] != CmdArg) {\r
-      DEBUG ((EFI_D_ERROR, "The Card is not usable\n"));\r
+      DEBUG ((DEBUG_ERROR, "The Card is not usable\n"));\r
       return EFI_UNSUPPORTED;\r
     }\r
   } else {\r
-    DEBUG ((EFI_D_ERROR, "Not a SD2.0 Card\n"));\r
+    DEBUG ((DEBUG_ERROR, "Not a SD2.0 Card\n"));\r
   }\r
 \r
   // We need to wait for the MMC or SD card is ready => (gCardInfo.OCRData.PowerUp == 1)\r
@@ -626,7 +626,7 @@ MmcIdentificationMode (
     // SD Card or MMC Card ? CMD55 indicates to the card that the next command is an application specific command\r
     Status = MmcHost->SendCommand (MmcHost, MMC_CMD55, 0);\r
     if (Status == EFI_SUCCESS) {\r
-      DEBUG ((EFI_D_INFO, "Card should be SD\n"));\r
+      DEBUG ((DEBUG_INFO, "Card should be SD\n"));\r
       if (IsHCS) {\r
         MmcHostInstance->CardInfo.CardType = SD_CARD_2;\r
       } else {\r
@@ -642,20 +642,20 @@ MmcIdentificationMode (
       if (!EFI_ERROR (Status)) {\r
         Status = MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_OCR, Response);\r
         if (EFI_ERROR (Status)) {\r
-          DEBUG ((EFI_D_ERROR, "MmcIdentificationMode() : Failed to receive OCR, Status=%r.\n", Status));\r
+          DEBUG ((DEBUG_ERROR, "MmcIdentificationMode() : Failed to receive OCR, Status=%r.\n", Status));\r
           return Status;\r
         }\r
         ((UINT32 *) &(MmcHostInstance->CardInfo.OCRData))[0] = Response[0];\r
       }\r
     } else {\r
-      DEBUG ((EFI_D_INFO, "Card should be MMC\n"));\r
+      DEBUG ((DEBUG_INFO, "Card should be MMC\n"));\r
       MmcHostInstance->CardInfo.CardType = MMC_CARD;\r
 \r
       Status = MmcHost->SendCommand (MmcHost, MMC_CMD1, 0x800000);\r
       if (!EFI_ERROR (Status)) {\r
         Status = MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_OCR, Response);\r
         if (EFI_ERROR (Status)) {\r
-          DEBUG ((EFI_D_ERROR, "MmcIdentificationMode() : Failed to receive OCR, Status=%r.\n", Status));\r
+          DEBUG ((DEBUG_ERROR, "MmcIdentificationMode() : Failed to receive OCR, Status=%r.\n", Status));\r
           return Status;\r
         }\r
         ((UINT32 *) &(MmcHostInstance->CardInfo.OCRData))[0] = Response[0];\r
@@ -669,7 +669,7 @@ MmcIdentificationMode (
       } else {\r
         if ((MmcHostInstance->CardInfo.CardType == SD_CARD_2) && (MmcHostInstance->CardInfo.OCRData.AccessMode & BIT1)) {\r
           MmcHostInstance->CardInfo.CardType = SD_CARD_2_HIGH;\r
-          DEBUG ((EFI_D_ERROR, "High capacity card.\n"));\r
+          DEBUG ((DEBUG_ERROR, "High capacity card.\n"));\r
         }\r
         break;  // The MMC/SD card is ready. Continue the Identification Mode\r
       }\r
@@ -680,7 +680,7 @@ MmcIdentificationMode (
   }\r
 \r
   if (Timeout == 0) {\r
-    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode(): No Card\n"));\r
+    DEBUG ((DEBUG_ERROR, "MmcIdentificationMode(): No Card\n"));\r
     return EFI_NO_MEDIA;\r
   } else {\r
     PrintOCR (Response[0]);\r
@@ -688,18 +688,18 @@ MmcIdentificationMode (
 \r
   Status = MmcNotifyState (MmcHostInstance, MmcReadyState);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcReadyState\n"));\r
+    DEBUG ((DEBUG_ERROR, "MmcIdentificationMode() : Error MmcReadyState\n"));\r
     return Status;\r
   }\r
 \r
   Status = MmcHost->SendCommand (MmcHost, MMC_CMD2, 0);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD2): Error\n"));\r
+    DEBUG ((DEBUG_ERROR, "MmcIdentificationMode(MMC_CMD2): Error\n"));\r
     return Status;\r
   }\r
   Status = MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_CID, Response);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode() : Failed to receive CID, Status=%r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "MmcIdentificationMode() : Failed to receive CID, Status=%r.\n", Status));\r
     return Status;\r
   }\r
 \r
@@ -707,7 +707,7 @@ MmcIdentificationMode (
 \r
   Status = MmcHost->NotifyState (MmcHost, MmcIdentificationState);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcIdentificationState\n"));\r
+    DEBUG ((DEBUG_ERROR, "MmcIdentificationMode() : Error MmcIdentificationState\n"));\r
     return Status;\r
   }\r
 \r
@@ -719,13 +719,13 @@ MmcIdentificationMode (
   CmdArg = 1;\r
   Status = MmcHost->SendCommand (MmcHost, MMC_CMD3, CmdArg);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode(MMC_CMD3): Error\n"));\r
+    DEBUG ((DEBUG_ERROR, "MmcIdentificationMode(MMC_CMD3): Error\n"));\r
     return Status;\r
   }\r
 \r
   Status = MmcHost->ReceiveResponse (MmcHost, MMC_RESPONSE_TYPE_RCA, Response);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode() : Failed to receive RCA, Status=%r.\n", Status));\r
+    DEBUG ((DEBUG_ERROR, "MmcIdentificationMode() : Failed to receive RCA, Status=%r.\n", Status));\r
     return Status;\r
   }\r
   PrintRCA (Response[0]);\r
@@ -738,7 +738,7 @@ MmcIdentificationMode (
   }\r
   Status = MmcNotifyState (MmcHostInstance, MmcStandByState);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "MmcIdentificationMode() : Error MmcStandByState\n"));\r
+    DEBUG ((DEBUG_ERROR, "MmcIdentificationMode() : Error MmcStandByState\n"));\r
     return Status;\r
   }\r
 \r
@@ -759,13 +759,13 @@ InitializeMmcDevice (
 \r
   Status = MmcIdentificationMode (MmcHostInstance);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG((EFI_D_ERROR, "InitializeMmcDevice(): Error in Identification Mode, Status=%r\n", Status));\r
+    DEBUG((DEBUG_ERROR, "InitializeMmcDevice(): Error in Identification Mode, Status=%r\n", Status));\r
     return Status;\r
   }\r
 \r
   Status = MmcNotifyState (MmcHostInstance, MmcTransferState);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG((EFI_D_ERROR, "InitializeMmcDevice(): Error MmcTransferState, Status=%r\n", Status));\r
+    DEBUG((DEBUG_ERROR, "InitializeMmcDevice(): Error MmcTransferState, Status=%r\n", Status));\r
     return Status;\r
   }\r
 \r
@@ -781,7 +781,7 @@ InitializeMmcDevice (
   // Set Block Length\r
   Status = MmcHost->SendCommand (MmcHost, MMC_CMD16, MmcHostInstance->BlockIo.Media->BlockSize);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG((EFI_D_ERROR, "InitializeMmcDevice(MMC_CMD16): Error MmcHostInstance->BlockIo.Media->BlockSize: %d and Error = %r\n",\r
+    DEBUG((DEBUG_ERROR, "InitializeMmcDevice(MMC_CMD16): Error MmcHostInstance->BlockIo.Media->BlockSize: %d and Error = %r\n",\r
                         MmcHostInstance->BlockIo.Media->BlockSize, Status));\r
     return Status;\r
   }\r
@@ -790,7 +790,7 @@ InitializeMmcDevice (
   if (MmcHostInstance->CardInfo.CardType == MMC_CARD) {\r
     Status = MmcHost->SendCommand (MmcHost, MMC_CMD23, BlockCount);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG((EFI_D_ERROR, "InitializeMmcDevice(MMC_CMD23): Error, Status=%r\n", Status));\r
+      DEBUG((DEBUG_ERROR, "InitializeMmcDevice(MMC_CMD23): Error, Status=%r\n", Status));\r
       return Status;\r
     }\r
   }\r