Fixed unexpected timeout in Usb MassStorage Driver.

[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 222322a2b059182b2e1713bf324d22765daee7bd..401d32eb3433dccffafbb5561777f1cef9b332ec 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciSched.c
@@ -498,7 +498,7 @@ UhciCheckTdStatus (
       // next to the last known-good TD's data toggle if\r
       // any TD is executed OK\r
       //\r
-      QhResult->NextToggle = 1 - (UINT8)TdHw->DataToggle;\r
+      QhResult->NextToggle = (UINT8) (1 - (UINT8)TdHw->DataToggle);\r
 \r
       //\r
       // This TD is finished OK or met short packet read. Update the\r
@@ -575,8 +575,8 @@ UhciExecuteTransfer (
 \r
   Finished = FALSE;\r
   Status   = EFI_SUCCESS;\r
-  Delay    = (TimeOut * STALL_1_MS / UHC_SYN_POLL) + 1;\r
-\r
+  Delay    = (TimeOut * UHC_1_MILLISECOND / UHC_SYNC_POLL_INTERVAL) + 1;\r
+  \r
   for (Index = 0; Index < Delay; Index++) {\r
     Finished = UhciCheckTdStatus (Uhc, Td, IsLow, QhResult);\r
 \r
@@ -587,7 +587,7 @@ UhciExecuteTransfer (
       break;\r
     }\r
 \r
-    gBS->Stall (UHC_SYN_POLL);\r
+    gBS->Stall (UHC_SYNC_POLL_INTERVAL);\r
   }\r
 \r
   if (!Finished) {\r