From 31c24f4c61615b562ee5e70d7cbdd0667d8a441e Mon Sep 17 00:00:00 2001 From: mdkinney Date: Fri, 5 Jun 2009 21:34:04 +0000 Subject: [PATCH] Move gEfiPciOptionRomTableGuid from IntelFrameworkModulePkg to the DuetPkg Update PCI Bus Driver in IntelFramworkModulePkg to no longer depend on gEfiPciOptionRomTableGuid git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8484 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Bus/Pci/PciBusDxe/PciBus.h | 1 - .../Bus/Pci/PciBusDxe/PciBusDxe.inf | 6 --- .../Include/Guid/PciOptionRomTable.h | 41 ------------------- .../IntelFrameworkModulePkg.dec | 3 -- 4 files changed, 51 deletions(-) delete mode 100644 IntelFrameworkModulePkg/Include/Guid/PciOptionRomTable.h diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h index 90e32bf198..8f2e29c16e 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h +++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h @@ -29,7 +29,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include #include #include #include diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf index b4dd56d221..bf66552185 100644 --- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf +++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf @@ -71,8 +71,6 @@ IntelFrameworkPkg/IntelFrameworkPkg.dec IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec - - [LibraryClasses] PciIncompatibleDeviceSupportLib PcdLib @@ -87,9 +85,6 @@ DebugLib PeCoffLib -[Guids] - gEfiPciOptionRomTableGuid # SOMETIMES_CONSUMED System Table - [Protocols] gEfiPciHotPlugRequestProtocolGuid # PROTOCOL ALWAYS_PRODUCED gEfiBusSpecificDriverOverrideProtocolGuid # PROTOCOL BY_START @@ -110,7 +105,6 @@ gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciBusHotplugDeviceSupport gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciIsaEnable - [FixedPcd.common] gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciIncompatibleDeviceSupportMask diff --git a/IntelFrameworkModulePkg/Include/Guid/PciOptionRomTable.h b/IntelFrameworkModulePkg/Include/Guid/PciOptionRomTable.h deleted file mode 100644 index 09e4faa06d..0000000000 --- a/IntelFrameworkModulePkg/Include/Guid/PciOptionRomTable.h +++ /dev/null @@ -1,41 +0,0 @@ -/** @file - GUID and data structure used to describe the list of PCI Option ROMs present in a system. - -Copyright (c) 2006, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#ifndef __PCI_OPTION_ROM_TABLE_GUID_H_ -#define __PCI_OPTION_ROM_TABLE_GUID_H_ - -#define EFI_PCI_OPTION_ROM_TABLE_GUID \ - { 0x7462660f, 0x1cbd, 0x48da, {0xad, 0x11, 0x91, 0x71, 0x79, 0x13, 0x83, 0x1c } } - -extern EFI_GUID gEfiPciOptionRomTableGuid; - -typedef struct { - EFI_PHYSICAL_ADDRESS RomAddress; - EFI_MEMORY_TYPE MemoryType; - UINT32 RomLength; - UINT32 Seg; - UINT8 Bus; - UINT8 Dev; - UINT8 Func; - BOOLEAN ExecutedLegacyBiosImage; - BOOLEAN DontLoadEfiRom; -} EFI_PCI_OPTION_ROM_DESCRIPTOR; - -typedef struct { - UINT64 PciOptionRomCount; - EFI_PCI_OPTION_ROM_DESCRIPTOR *PciOptionRomDescriptors; -} EFI_PCI_OPTION_ROM_TABLE; - -#endif // __PCI_OPTION_ROM_TABLE_GUID_H_ - diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec index acb6f98a82..0f31f934a6 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec @@ -40,9 +40,6 @@ ## Include/Guid/DataHubStatusCodeRecord.h gEfiDataHubStatusCodeRecordGuid = { 0xD083E94C, 0x6560, 0x42E4, { 0xB6, 0xD4, 0x2D, 0xF7, 0x5A, 0xDF, 0x6A, 0x2A }} - ## Include/Guid/PciOptionRomTable.h - gEfiPciOptionRomTableGuid = { 0x7462660F, 0x1CBD, 0x48DA, { 0xAD, 0x11, 0x91, 0x71, 0x79, 0x13, 0x83, 0x1C }} - gEfiIntelFrameworkModulePkgTokenSpaceGuid = { 0xD3705011, 0xBC19, 0x4af7, { 0xBE, 0x16, 0xF6, 0x80, 0x30, 0x37, 0x8C, 0x15 }} ## Include/Guid/CustomDecompress.h