Remove, correct and refine some debug messages.

Signed-off-by: lzeng14
Reviewed-by: erictian
Reviewed-by: qianouyang
Reviewed-by: niruiyu
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12248 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
index 1eb8c0eaae96e713d99baef5a688478ab13f949b..17e4d7e13a482c26c0aa5b50f17f332aba5b90ab 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
@@ -1364,7 +1364,6 @@ AtaUdmStatusWait (
 \r
     if ((RegisterValue & BMIS_INTERRUPT) != 0) {\r
       Status = EFI_SUCCESS;\r
-      DEBUG ((DEBUG_INFO, "Task->RetryTimes = %x\n", Timeout));      \r
       break;\r
     }\r
     //\r
@@ -1409,7 +1408,6 @@ AtaUdmStatusCheck (
   }\r
 \r
   if ((RegisterValue & BMIS_INTERRUPT) != 0) {\r
-    DEBUG ((DEBUG_INFO, "Task->RetryTimes = %x\n", Task->RetryTimes));\r
     return EFI_SUCCESS;\r
   }\r
 \r

diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
index 33a7537b0242c85461eb5f5bc9cf10214ee0b652..eb6502298623b803f0563f0d468fe0094d43503f 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
+++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
@@ -364,7 +364,7 @@ Done:
 \r
   if (EFI_ERROR (Status) && (AtaDevice != NULL)) {\r
     ReleaseAtaResources (AtaDevice);  \r
-    DEBUG ((DEBUG_ERROR | DEBUG_INIT, "Failed to initialize Port %x PortMultiplierPort %x, status = %r\n", Port, PortMultiplierPort, Status));\r
+    DEBUG ((EFI_D_ERROR | EFI_D_INIT, "Failed to initialize Port %x PortMultiplierPort %x, status = %r\n", Port, PortMultiplierPort, Status));\r
   }\r
   return Status;\r
 }\r

diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
index 1b77324aa836594357ac169e524f9e25dc903d69..2177a45bf7f7c61393445ad73b7fd53b8b343a87 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
+++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
@@ -301,7 +301,7 @@ IdentifyAtaDevice (
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "AtaBus - Identify Device (%x %x)\n", (UINTN)AtaDevice->Port, (UINTN)AtaDevice->PortMultiplierPort));\r
+  DEBUG ((EFI_D_INFO, "AtaBus - Identify Device: Port %x PortMultiplierPort %x\n", AtaDevice->Port, AtaDevice->PortMultiplierPort));\r
 \r
   //\r
   // Check whether the WORD 88 (supported UltraDMA by drive) is valid\r
@@ -570,8 +570,8 @@ AtaNonBlockingCallBack (
     Task->Token->TransactionStatus = EFI_DEVICE_ERROR;\r
   }\r
   DEBUG ((\r
-    DEBUG_INFO, \r
-    "NON-BLOCKING EVENT FINISHED!- STATUS = %r\n", \r
+    EFI_D_BLKIO,\r
+    "NON-BLOCKING EVENT FINISHED!- STATUS = %r\n",\r
     Task->Token->TransactionStatus\r
     ));\r
 \r
@@ -579,7 +579,7 @@ AtaNonBlockingCallBack (
   // Reduce the SubEventCount, till it comes to zero.\r
   //\r
   (*Task->UnsignalledEventCount) --;\r
-  DEBUG ((DEBUG_INFO, "UnsignalledEventCount = %d\n", *Task->UnsignalledEventCount));\r
+  DEBUG ((EFI_D_BLKIO, "UnsignalledEventCount = %d\n", *Task->UnsignalledEventCount));\r
 \r
   //\r
   // Remove the SubTask from the Task list.\r
@@ -592,7 +592,7 @@ AtaNonBlockingCallBack (
     //\r
     if (!(*Task->IsError)) {\r
       gBS->SignalEvent (Task->Token->Event);\r
-      DEBUG ((DEBUG_INFO, "Signal Up Level Event UnsignalledEventCount = %x!\n", *Task->UnsignalledEventCount));\r
+      DEBUG ((EFI_D_BLKIO, "Signal the upper layer event!\n"));\r
     }\r
     \r
     FreePool (Task->UnsignalledEventCount);\r
@@ -600,8 +600,8 @@ AtaNonBlockingCallBack (
   }\r
 \r
   DEBUG ((\r
-    DEBUG_INFO, \r
-    "PACKET INFO: Write=%s, Lenght=%x, LowCylinder=%x, HighCylinder=%x,SectionNumber=%x",\r
+    EFI_D_BLKIO,\r
+    "PACKET INFO: Write=%s, Length=%x, LowCylinder=%x, HighCylinder=%x, SectionNumber=%x\n",\r
     Task->Packet.OutDataBuffer != NULL ? L"YES" : L"NO",\r
     Task->Packet.OutDataBuffer != NULL ? Task->Packet.OutTransferLength : Task->Packet.InTransferLength,\r
     Task->Packet.Acb->AtaCylinderLow,\r
@@ -737,28 +737,12 @@ AccessAtaDevice(
         goto EXIT;\r
       }\r
 \r
-      DEBUG ((EFI_D_INFO, "NON-BLOCKING SET EVENT START: WRITE = %d\n", IsWrite));\r
       Status = TransferAtaDevice (AtaDevice, &Task->Packet, Buffer, StartLba, (UINT32) TransferBlockNumber, IsWrite, SubEvent);\r
-      DEBUG ((\r
-        EFI_D_INFO,\r
-        "NON-BLOCKING SET EVENT END:StartLba=%x, TransferBlockNumbers=%x, Status=%r\n",\r
-        StartLba,\r
-        TransferBlockNumber,\r
-        Status\r
-        ));\r
     } else {\r
       //\r
       // Blocking Mode.\r
       //\r
-      DEBUG ((EFI_D_INFO, "BLOCKING BLOCK I/O START: WRITE = %d\n", IsWrite));\r
       Status = TransferAtaDevice (AtaDevice, NULL, Buffer, StartLba, (UINT32) TransferBlockNumber, IsWrite, NULL);\r
-      DEBUG ((\r
-        EFI_D_INFO,\r
-        "BLOCKING BLOCK I/O FINISHE - StartLba = %x; TransferBlockNumbers = %x, status = %r\n", \r
-        StartLba,\r
-        TransferBlockNumber,\r
-        Status\r
-        ));\r
     }\r
 \r
     if (EFI_ERROR (Status)) {\r