Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.c

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.c (modified) (8 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.c

@@ -3 +3 @@
 which is used to enable recovery function from USB Drivers.
 
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved. <BR>
+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved. <BR>
   
 This program and the accompanying materials
@@ -154 +154 @@
   @param  DataLength             The size (in bytes) of the data buffer.
   @param  TimeOut                Indicates the maximum timeout, in millisecond.
+                                 If Timeout is 0, then the caller must wait for the function
+                                 to be completed until EFI_SUCCESS or EFI_DEVICE_ERROR is returned.
   @param  TransferResult         Return the result of this control transfer.
 
@@ -392 +394 @@
   @param  TimeOut               Indicates the maximum time, in millisecond, which the
                                 transfer is allowed to complete.
+                                If Timeout is 0, then the caller must wait for the function
+                                to be completed until EFI_SUCCESS or EFI_DEVICE_ERROR is returned.
   @param  TransferResult        A pointer to the detailed result information of the
                                 bulk transfer.
@@ -1044 +1048 @@
     return EFI_OUT_OF_RESOURCES;
   }
-  
+  ASSERT (UhcDev->ConfigQH != NULL);
+
   Status = CreateQH(UhcDev, &UhcDev->BulkQH);
   if (Status != EFI_SUCCESS) {
     return EFI_OUT_OF_RESOURCES;
   }
+  ASSERT (UhcDev->BulkQH != NULL);
 
   //
@@ -2509 +2515 @@
   UINTN   ErrTDPos;
   UINTN   Delay;
+  BOOLEAN InfiniteLoop;
 
   ErrTDPos          = 0;
   *TransferResult   = EFI_USB_NOERROR;
   *ActualLen        = 0;
-
-  Delay = (TimeOut * STALL_1_MILLI_SECOND / 200) + 1;
+  InfiniteLoop      = FALSE;
+
+  Delay = TimeOut * STALL_1_MILLI_SECOND;
+  //
+  // If Timeout is 0, then the caller must wait for the function to be completed
+  // until EFI_SUCCESS or EFI_DEVICE_ERROR is returned.
+  //
+  if (TimeOut == 0) {
+    InfiniteLoop = TRUE;
+  }
 
   do {
@@ -2526 +2541 @@
       break;
     }
-    MicroSecondDelay (200);
+    MicroSecondDelay (STALL_1_MICRO_SECOND);
     Delay--;
 
-  } while (Delay != 0);
-
+  } while (InfiniteLoop || (Delay != 0));
 
   if (*TransferResult != EFI_USB_NOERROR) {
@@ -2567 +2581 @@
   UINTN   ScrollNum;
   UINTN   Delay;
+  BOOLEAN InfiniteLoop;
 
   ErrTDPos          = 0;
   *TransferResult   = EFI_USB_NOERROR;
   *ActualLen        = 0;
-
-  Delay = (TimeOut * STALL_1_MILLI_SECOND / 200) + 1;
+  InfiniteLoop      = FALSE;
+
+  Delay = TimeOut * STALL_1_MILLI_SECOND;
+  //
+  // If Timeout is 0, then the caller must wait for the function to be completed
+  // until EFI_SUCCESS or EFI_DEVICE_ERROR is returned.
+  //
+  if (TimeOut == 0) {
+    InfiniteLoop = TRUE;
+  }
 
   do {
@@ -2583 +2606 @@
       break;
     }
-    MicroSecondDelay (200);
+    MicroSecondDelay (STALL_1_MICRO_SECOND);
     Delay--;
 
-  } while (Delay != 0);
+  } while (InfiniteLoop || (Delay != 0));
 
   //