Move gEfiPciOptionRomTableGuid from IntelFrameworkModulePkg to the DuetPkg

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

diff --git a/DuetPkg/DuetPkg.dec b/DuetPkg/DuetPkg.dec
index dbd6238961ad2e39803a68533ddb3b86207d66fe..40e72b04742c0dfe998972b9227fcb956429b108 100644 (file)
--- a/DuetPkg/DuetPkg.dec
+++ b/DuetPkg/DuetPkg.dec
@@ -30,4 +30,5 @@
   gEfiAcpiDescriptionGuid       = {0x3c699197, 0x093c, 0x4c69, {0xb0, 0x6b, 0x12, 0x8a, 0xe3, 0x48, 0x1d, 0xc9 }}\r
   gEfiFlashMapHobGuid           = { 0xb091e7d2, 0x5a0, 0x4198, {0x94, 0xf0, 0x74, 0xb7, 0xb8, 0xc5, 0x54, 0x59 }}\r
   \r
-  
\ No newline at end of file
+  ## Include/Guid/PciOptionRomTable.h\r
+  gEfiPciOptionRomTableGuid       = { 0x7462660F, 0x1CBD, 0x48DA, { 0xAD, 0x11, 0x91, 0x71, 0x79, 0x13, 0x83, 0x1C }}\r

diff --git a/DuetPkg/Include/Guid/PciOptionRomTable.h b/DuetPkg/Include/Guid/PciOptionRomTable.h
new file mode 100644 (file)
index 0000000..09e4faa
--- /dev/null
+++ b/DuetPkg/Include/Guid/PciOptionRomTable.h
@@ -0,0 +1,41 @@
+/** @file\r
+  GUID and data structure used to describe the list of PCI Option ROMs present in a system.\r
+  \r
+Copyright (c) 2006, 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
+http://opensource.org/licenses/bsd-license.php                                            \r
+                                                                                          \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+**/\r
+\r
+#ifndef __PCI_OPTION_ROM_TABLE_GUID_H_\r
+#define __PCI_OPTION_ROM_TABLE_GUID_H_\r
+\r
+#define EFI_PCI_OPTION_ROM_TABLE_GUID \\r
+  { 0x7462660f, 0x1cbd, 0x48da, {0xad, 0x11, 0x91, 0x71, 0x79, 0x13, 0x83, 0x1c } }\r
+\r
+extern EFI_GUID gEfiPciOptionRomTableGuid;\r
+\r
+typedef struct {\r
+  EFI_PHYSICAL_ADDRESS   RomAddress; \r
+  EFI_MEMORY_TYPE        MemoryType;\r
+  UINT32                 RomLength; \r
+  UINT32                 Seg; \r
+  UINT8                  Bus; \r
+  UINT8                  Dev; \r
+  UINT8                  Func; \r
+  BOOLEAN                ExecutedLegacyBiosImage; \r
+  BOOLEAN                DontLoadEfiRom;\r
+} EFI_PCI_OPTION_ROM_DESCRIPTOR;\r
+\r
+typedef struct {\r
+  UINT64                         PciOptionRomCount;\r
+  EFI_PCI_OPTION_ROM_DESCRIPTOR   *PciOptionRomDescriptors;\r
+} EFI_PCI_OPTION_ROM_TABLE;\r
+\r
+#endif // __PCI_OPTION_ROM_TABLE_GUID_H_\r
+\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciBus.h b/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
index e83f32d7bf55a6436f752ebd15363fa25d1e5f61..168108928f4521b7a256c401221c3c6d4babca7d 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
@@ -24,7 +24,7 @@ Revision History
 #ifndef _EFI_PCI_BUS_H\r
 #define _EFI_PCI_BUS_H\r
 \r
-#include <FrameworkDxe.h>\r
+#include <PiDxe.h>\r
 \r
 #include <Protocol/PciIo.h>\r
 #include <Protocol/PciRootBridgeIo.h>\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf b/DuetPkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf
index 5ad324d3e31e99a8ee287d9d0cd60a7ab5376fcb..0b7827aa83ee36a7c4db73916ba813317a6df26a 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf
@@ -27,8 +27,7 @@
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
-  IntelFrameworkPkg/IntelFrameworkPkg.dec\r
-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
+  DuetPkg/DuetPkg.dec\r
 \r
 [LibraryClasses]\r
   DebugLib\r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf b/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
index 3f9b43fd745adbbda8a9c8b4da592e55a215a928..c85e4646c34eaf10b26e4698c34fbab6bcceef54 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
@@ -31,7 +31,6 @@
   MdePkg/MdePkg.dec\r
   DuetPkg/DuetPkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
-  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
 \r
 [LibraryClasses]\r
   UefiDriverEntryPoint\r