From 25dd150b585f0bc498482dc00325cf9b67362665 Mon Sep 17 00:00:00 2001
From: lzeng14 <lzeng14@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 1 Sep 2011 06:37:55 +0000
Subject: 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
---
 MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c    |  2 --
 MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c            |  2 +-
 .../Bus/Ata/AtaBusDxe/AtaPassThruExecute.c         | 30 +++++-----------------
 3 files changed, 8 insertions(+), 26 deletions(-)

(limited to 'MdeModulePkg/Bus')

diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
index 1eb8c0eaae..17e4d7e13a 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/IdeMode.c
@@ -1364,7 +1364,6 @@ AtaUdmStatusWait (
 
     if ((RegisterValue & BMIS_INTERRUPT) != 0) {
       Status = EFI_SUCCESS;
-      DEBUG ((DEBUG_INFO, "Task->RetryTimes = %x\n", Timeout));      
       break;
     }
     //
@@ -1409,7 +1408,6 @@ AtaUdmStatusCheck (
   }
 
   if ((RegisterValue & BMIS_INTERRUPT) != 0) {
-    DEBUG ((DEBUG_INFO, "Task->RetryTimes = %x\n", Task->RetryTimes));
     return EFI_SUCCESS;
   }
 
diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
index 33a7537b02..eb65022986 100644
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
+++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
@@ -364,7 +364,7 @@ Done:
 
   if (EFI_ERROR (Status) && (AtaDevice != NULL)) {
     ReleaseAtaResources (AtaDevice);  
-    DEBUG ((DEBUG_ERROR | DEBUG_INIT, "Failed to initialize Port %x PortMultiplierPort %x, status = %r\n", Port, PortMultiplierPort, Status));
+    DEBUG ((EFI_D_ERROR | EFI_D_INIT, "Failed to initialize Port %x PortMultiplierPort %x, status = %r\n", Port, PortMultiplierPort, Status));
   }
   return Status;
 }
diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
index 1b77324aa8..2177a45bf7 100644
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
+++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
@@ -301,7 +301,7 @@ IdentifyAtaDevice (
     return EFI_UNSUPPORTED;
   }
 
-  DEBUG ((EFI_D_INFO, "AtaBus - Identify Device (%x %x)\n", (UINTN)AtaDevice->Port, (UINTN)AtaDevice->PortMultiplierPort));
+  DEBUG ((EFI_D_INFO, "AtaBus - Identify Device: Port %x PortMultiplierPort %x\n", AtaDevice->Port, AtaDevice->PortMultiplierPort));
 
   //
   // Check whether the WORD 88 (supported UltraDMA by drive) is valid
@@ -570,8 +570,8 @@ AtaNonBlockingCallBack (
     Task->Token->TransactionStatus = EFI_DEVICE_ERROR;
   }
   DEBUG ((
-    DEBUG_INFO, 
-    "NON-BLOCKING EVENT FINISHED!- STATUS = %r\n", 
+    EFI_D_BLKIO,
+    "NON-BLOCKING EVENT FINISHED!- STATUS = %r\n",
     Task->Token->TransactionStatus
     ));
 
@@ -579,7 +579,7 @@ AtaNonBlockingCallBack (
   // Reduce the SubEventCount, till it comes to zero.
   //
   (*Task->UnsignalledEventCount) --;
-  DEBUG ((DEBUG_INFO, "UnsignalledEventCount = %d\n", *Task->UnsignalledEventCount));
+  DEBUG ((EFI_D_BLKIO, "UnsignalledEventCount = %d\n", *Task->UnsignalledEventCount));
 
   //
   // Remove the SubTask from the Task list.
@@ -592,7 +592,7 @@ AtaNonBlockingCallBack (
     //
     if (!(*Task->IsError)) {
       gBS->SignalEvent (Task->Token->Event);
-      DEBUG ((DEBUG_INFO, "Signal Up Level Event UnsignalledEventCount = %x!\n", *Task->UnsignalledEventCount));
+      DEBUG ((EFI_D_BLKIO, "Signal the upper layer event!\n"));
     }
     
     FreePool (Task->UnsignalledEventCount);
@@ -600,8 +600,8 @@ AtaNonBlockingCallBack (
   }
 
   DEBUG ((
-    DEBUG_INFO, 
-    "PACKET INFO: Write=%s, Lenght=%x, LowCylinder=%x, HighCylinder=%x,SectionNumber=%x",
+    EFI_D_BLKIO,
+    "PACKET INFO: Write=%s, Length=%x, LowCylinder=%x, HighCylinder=%x, SectionNumber=%x\n",
     Task->Packet.OutDataBuffer != NULL ? L"YES" : L"NO",
     Task->Packet.OutDataBuffer != NULL ? Task->Packet.OutTransferLength : Task->Packet.InTransferLength,
     Task->Packet.Acb->AtaCylinderLow,
@@ -737,28 +737,12 @@ AccessAtaDevice(
         goto EXIT;
       }
 
-      DEBUG ((EFI_D_INFO, "NON-BLOCKING SET EVENT START: WRITE = %d\n", IsWrite));
       Status = TransferAtaDevice (AtaDevice, &Task->Packet, Buffer, StartLba, (UINT32) TransferBlockNumber, IsWrite, SubEvent);
-      DEBUG ((
-        EFI_D_INFO,
-        "NON-BLOCKING SET EVENT END:StartLba=%x, TransferBlockNumbers=%x, Status=%r\n",
-        StartLba,
-        TransferBlockNumber,
-        Status
-        ));
     } else {
       //
       // Blocking Mode.
       //
-      DEBUG ((EFI_D_INFO, "BLOCKING BLOCK I/O START: WRITE = %d\n", IsWrite));
       Status = TransferAtaDevice (AtaDevice, NULL, Buffer, StartLba, (UINT32) TransferBlockNumber, IsWrite, NULL);
-      DEBUG ((
-        EFI_D_INFO,
-        "BLOCKING BLOCK I/O FINISHE - StartLba = %x; TransferBlockNumbers = %x, status = %r\n", 
-        StartLba,
-        TransferBlockNumber,
-        Status
-        ));
     }
 
     if (EFI_ERROR (Status)) {
-- 
cgit v1.2.3