Use the "PAY_LOAD" StatusCode definitions defined in IntelFrameworkPkg.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2913 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumerator.c b/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumerator.c
index e7a05a2ec9be40c4eebfa2c6442fce3f971508f2..84fd9753c6f0b07c4850824f30811cbcc61637bd 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumerator.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumerator.c
@@ -1011,7 +1011,7 @@ Returns:
   UINTN                                 DevIndex;\r
   UINTN                                 ResType;\r
   EFI_STATUS                            Status;\r
   UINTN                                 DevIndex;\r
   UINTN                                 ResType;\r
   EFI_STATUS                            Status;\r

-  REPORT_STATUS_CODE_LIBRARY_RESOURCE_ALLOC_FAILURE_ERROR_DATA AllocFailExtendedData;\r
+  EFI_RESOURCE_ALLOC_FAILURE_ERROR_DATA_PAYLOAD AllocFailExtendedData;\r

 \r
   PciResNode = NULL;\r
   ZeroMem (RemovedPciDev, 5 * sizeof (PCI_IO_DEVICE *));\r
 \r
   PciResNode = NULL;\r
   ZeroMem (RemovedPciDev, 5 * sizeof (PCI_IO_DEVICE *));\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.h b/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.h
index a788916cbd0befc5c060979e1deb97acde3e3c15..f295e1946e53bd9d917c4446fcf34e5eaf05cdf6 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBus/Dxe/pcibus.h
@@ -66,28 +66,6 @@ Revision History
 #include <IndustryStandard/Acpi.h>\r
 #include "ComponentName.h"\r
 \r
 #include <IndustryStandard/Acpi.h>\r
 #include "ComponentName.h"\r
 \r

-///\r
-/// Device handle Extended Data. Used for many\r
-/// errors and progress codes to point to the device.\r
-///\r
-typedef struct {\r
-  EFI_HANDLE            Handle;\r
-} REPORT_STATUS_CODE_LIBRARY_DEVICE_HANDLE_EXTENDED_DATA;\r
-\r
-///\r
-/// Resource Allocation Failure Extended Error Data\r
-///\r
-typedef struct {\r
-  UINT32                             Bar;\r
-  UINT16                             DevicePathSize;\r
-  UINT16                             ReqResSize;\r
-  UINT16                             AllocResSize;\r
-  UINT8                              *DevicePath;\r
-  UINT8                              *ReqRes;\r
-  UINT8                              *AllocRes;\r
-} REPORT_STATUS_CODE_LIBRARY_RESOURCE_ALLOC_FAILURE_ERROR_DATA;\r
-\r
-\r

 //\r
 // Driver Produced Protocol Prototypes\r
 //\r
 //\r
 // Driver Produced Protocol Prototypes\r
 //\r