1. Merger Tracker 8448: PciHostBridgeEnumerator() error checking could lead to memory...

[mirror_edk2.git] / EdkModulePkg / Bus / Pci / PciBus / Dxe / PciHotPlugSupport.c

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciHotPlugSupport.c b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciHotPlugSupport.c
index 87074873114c3e708128ff1aa754b429030a2bb9..7fba0476b5c25d9ec602c5c32c29eb5d1ec0ef55 100644 (file)
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciHotPlugSupport.c
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciHotPlugSupport.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -21,7 +21,7 @@ Revision History
 \r
 --*/\r
 \r
-#include "pcibus.h"\r
+#include "Pcibus.h"\r
 #include "PciHotPlugSupport.h"\r
 \r
 EFI_PCI_HOT_PLUG_INIT_PROTOCOL  *gPciHotPlugInit;\r
@@ -270,17 +270,18 @@ Returns:
 \r
 EFI_STATUS\r
 AllRootHPCInitialized (\r
-  IN  UINTN           TimeoutInMilliSeconds\r
+  IN  UINTN           TimeoutInMicroSeconds\r
   )\r
 /*++\r
 \r
 Routine Description:\r
 \r
 Arguments:\r
+  TimeoutInMicroSeconds - microseconds to wait for all root hpc's initialization\r
 \r
 Returns:\r
-\r
-  None\r
+  EFI_SUCCESS - All root hpc's initialization is finished before the timeout\r
+  EFI_TIMEOUT - Time out\r
 \r
 --*/\r
 // TODO:    TimeoutInMilliSeconds - add argument and description to function comment\r
@@ -290,7 +291,7 @@ Returns:
   UINT32  Delay;\r
   UINTN   Index;\r
 \r
-  Delay = (UINT32) (((TimeoutInMilliSeconds * STALL_1_MILLI_SECOND) / 30) + 1);\r
+  Delay = (UINT32) ((TimeoutInMicroSeconds / 30) + 1);\r
   do {\r
 \r
     for (Index = 0; Index < gPciRootHpcCount; Index++) {\r