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

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / UhciDxe / UhciSched.c

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
index 401d32eb3433dccffafbb5561777f1cef9b332ec..3c2b7d4cbbd6ae405df86030e22d38ab72f064c7 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
@@ -121,11 +121,7 @@ UhciInitFrameList (
   // in supporting the full speed bandwidth reclamation in the previous\r
   // mentioned form. Most new platforms don't suffer it.\r
   //\r
-#ifdef UHCI_NO_BW_RECLAMATION\r
-  Uhc->BulkQh->QhHw.HorizonLink     = QH_HLINK (NULL, TRUE);\r
-#else\r
   Uhc->BulkQh->QhHw.HorizonLink     = QH_HLINK (Uhc->BulkQh, FALSE);\r
-#endif\r
 \r
   Uhc->BulkQh->NextQh               = NULL;\r
 \r
@@ -515,7 +511,7 @@ UhciCheckTdStatus (
       // terminate the transfer\r
       //\r
       if (!IsLow && (TdHw->ShortPacket == 1) && (Len < Td->DataLen)) {\r
-        UHCI_DEBUG (("UhciCheckTdStatus: short packet read occured\n"));\r
+        DEBUG ((EFI_D_INFO, "UhciCheckTdStatus: short packet read occured\n"));\r
 \r
         Finished = TRUE;\r
         goto ON_EXIT;\r
@@ -576,7 +572,7 @@ UhciExecuteTransfer (
   Finished = FALSE;\r
   Status   = EFI_SUCCESS;\r
   Delay    = (TimeOut * UHC_1_MILLISECOND / UHC_SYNC_POLL_INTERVAL) + 1;\r
-  \r
+\r
   for (Index = 0; Index < Delay; Index++) {\r
     Finished = UhciCheckTdStatus (Uhc, Td, IsLow, QhResult);\r
 \r
@@ -591,16 +587,16 @@ UhciExecuteTransfer (
   }\r
 \r
   if (!Finished) {\r
-    UHCI_ERROR (("UhciExecuteTransfer: execution not finished for %dms\n", TimeOut));\r
-    UHCI_DUMP_QH  ((Qh));\r
-    UHCI_DUMP_TDS ((Td));\r
+    DEBUG ((EFI_D_ERROR, "UhciExecuteTransfer: execution not finished for %dms\n", TimeOut));\r
+    UhciDumpQh (Qh);\r
+    UhciDumpTds (Td);\r
 \r
     Status = EFI_TIMEOUT;\r
 \r
   } else if (QhResult->Result != EFI_USB_NOERROR) {\r
-    UHCI_ERROR (("UhciExecuteTransfer: execution failed with result %x\n", QhResult->Result));\r
-    UHCI_DUMP_QH  ((Qh));\r
-    UHCI_DUMP_TDS ((Td));\r
+    DEBUG ((EFI_D_ERROR, "UhciExecuteTransfer: execution failed with result %x\n", QhResult->Result));\r
+    UhciDumpQh (Qh);\r
+    UhciDumpTds (Td);\r
 \r
     Status = EFI_DEVICE_ERROR;\r
   }\r