1. Added EFI_MEDIA_CHANGED and EFI_INVALID_PARAMETER returns in UsbMassReadBlocks().

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / EhciDxe / EhciSched.c

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
index 349b5c233a955d838cf29bc56328505fef341168..60b095f31ebccd827530840989a544cc2b418096 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
@@ -345,7 +345,7 @@ EhcUnlinkQhFromAsync (
   Status = EhcSetAndWaitDoorBell (Ehc, EHC_GENERIC_TIMEOUT);\r
 \r
   if (EFI_ERROR (Status)) {\r
-    EHC_ERROR (("EhcUnlinkQhFromAsync: Failed to synchronize with doorbell\n"));\r
+    DEBUG ((EFI_D_ERROR, "EhcUnlinkQhFromAsync: Failed to synchronize with doorbell\n"));\r
   }\r
 }\r
 \r
@@ -598,7 +598,7 @@ EhcCheckUrbResult (
       }\r
 \r
       if ((QtdHw->TotalBytes != 0) && (QtdHw->Pid == QTD_PID_INPUT)) {\r
-        EHC_DUMP_QH ((Urb->Qh, "Short packet read", FALSE));\r
+        EhcDumpQh (Urb->Qh, "Short packet read", FALSE);\r
 \r
         //\r
         // Short packet read condition. If it isn't a setup transfer,\r
@@ -607,13 +607,13 @@ EhcCheckUrbResult (
         // Status Stage of the setup transfer to get the finial result\r
         //\r
         if (QtdHw->AltNext == QTD_LINK (Ehc->ShortReadStop, FALSE)) {\r
-          EHC_DEBUG (("EhcCheckUrbResult: Short packet read, break\n"));\r
+          DEBUG ((EFI_D_INFO, "EhcCheckUrbResult: Short packet read, break\n"));\r
 \r
           Finished = TRUE;\r
           goto ON_EXIT;\r
         }\r
 \r
-        EHC_DEBUG (("EhcCheckUrbResult: Short packet read, continue\n"));\r
+        DEBUG ((EFI_D_INFO, "EhcCheckUrbResult: Short packet read, continue\n"));\r
       }\r
     }\r
   }\r
@@ -673,14 +673,14 @@ EhcExecTransfer (
   }\r
 \r
   if (!Finished) {\r
-    EHC_ERROR (("EhcExecTransfer: transfer not finished in %dms\n", TimeOut));\r
-    EHC_DUMP_QH ((Urb->Qh, NULL, FALSE));\r
+    DEBUG ((EFI_D_ERROR, "EhcExecTransfer: transfer not finished in %dms\n", TimeOut));\r
+    EhcDumpQh (Urb->Qh, NULL, FALSE);\r
 \r
     Status = EFI_TIMEOUT;\r
 \r
   } else if (Urb->Result != EFI_USB_NOERROR) {\r
-    EHC_ERROR (("EhcExecTransfer: transfer failed with %x\n", Urb->Result));\r
-    EHC_DUMP_QH ((Urb->Qh, NULL, FALSE));\r
+    DEBUG ((EFI_D_ERROR, "EhcExecTransfer: transfer failed with %x\n", Urb->Result));\r
+    EhcDumpQh (Urb->Qh, NULL, FALSE);\r
 \r
     Status = EFI_DEVICE_ERROR;\r
   }\r
@@ -781,14 +781,14 @@ EhcFlushAsyncIntMap (
 \r
 Routine Description:\r
 \r
-  Flush data from PCI controller specific address to mapped system \r
+  Flush data from PCI controller specific address to mapped system\r
   memory address.\r
 \r
 Arguments:\r
 \r
   Ehc         - The EHCI device\r
   Urb         - The URB to unmap\r
-  \r
+\r
 Returns:\r
 \r
   EFI_SUCCESS      - Success to flush data to mapped system memory\r
@@ -811,7 +811,7 @@ Returns:
   } else {\r
     MapOp = EfiPciIoOperationBusMasterRead;\r
   }\r
-  \r
+\r
   Status = PciIo->Unmap (PciIo, Urb->DataMap);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
@@ -953,14 +953,14 @@ EhcMoniteAsyncRequests (
     }\r
 \r
     //\r
-    // Flush any PCI posted write transactions from a PCI host \r
+    // Flush any PCI posted write transactions from a PCI host\r
     // bridge to system memory.\r
     //\r
     Status = EhcFlushAsyncIntMap (Ehc, Urb);\r
     if (EFI_ERROR (Status)) {\r
-      EHC_ERROR (("EhcMoniteAsyncRequests: Fail to Flush AsyncInt Mapped Memeory\n"));\r
+      DEBUG ((EFI_D_ERROR, "EhcMoniteAsyncRequests: Fail to Flush AsyncInt Mapped Memeory\n"));\r
     }\r
-    \r
+\r
     //\r
     // Allocate a buffer then copy the transferred data for user.\r
     // If failed to allocate the buffer, update the URB for next\r