X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdePkg%2FInclude%2FIndustryStandard%2Fpci22.h;h=581744ff5599c1775112139e7f2c4c2e9e7af45d;hp=b9098307a4ffcac1444250223499688d04e7d7d2;hb=1082de3167ca730c49ad694e564eb976b30f5244;hpb=3681d193ed5433c142fa05debc2ccb66cbd9b63a diff --git a/MdePkg/Include/IndustryStandard/pci22.h b/MdePkg/Include/IndustryStandard/pci22.h index b9098307a4..581744ff55 100644 --- a/MdePkg/Include/IndustryStandard/pci22.h +++ b/MdePkg/Include/IndustryStandard/pci22.h @@ -288,10 +288,6 @@ typedef struct { #define PCI_MAX_BAR 0x0006 #define PCI_MAX_CONFIG_OFFSET 0x0100 -// -// bugbug: this is supported in PCI spec v2.3 -// -#define PCI_EXP_MAX_CONFIG_OFFSET 0x1000 #define PCI_VENDOR_ID_OFFSET 0x00 #define PCI_DEVICE_ID_OFFSET 0x02 @@ -323,13 +319,10 @@ typedef struct { #define PCI_BRIDGE_SECONDARY_BUS_REGISTER_OFFSET 0x19 #define PCI_BRIDGE_SUBORDINATE_BUS_REGISTER_OFFSET 0x1a -typedef struct { - UINT8 Register; - UINT8 Function; - UINT8 Device; - UINT8 Bus; - UINT8 Reserved[4]; -} DEFIO_PCI_ADDR; +// +// Interrupt Line "Unknown" or "No connection" value defined for x86 based system +// +#define PCI_INT_LINE_UNKNOWN 0xFF typedef union { struct { @@ -345,9 +338,7 @@ typedef union { #pragma pack() -#define EFI_ROOT_BRIDGE_LIST 'eprb' #define PCI_EXPANSION_ROM_HEADER_SIGNATURE 0xaa55 -#define EFI_PCI_EXPANSION_ROM_HEADER_EFISIGNATURE 0x0EF1 #define PCI_DATA_STRUCTURE_SIGNATURE EFI_SIGNATURE_32 ('P', 'C', 'I', 'R') #define PCI_CODE_TYPE_PCAT_IMAGE 0x00 #define PCI_CODE_TYPE_EFI_IMAGE 0x03 @@ -403,18 +394,6 @@ typedef struct { UINT16 PcirOffset; } PCI_EXPANSION_ROM_HEADER; -typedef struct { - UINT16 Signature; // 0xaa55 - UINT16 InitializationSize; - UINT32 EfiSignature; // 0x0EF1 - UINT16 EfiSubsystem; - UINT16 EfiMachineType; - UINT16 CompressionType; - UINT8 Reserved[8]; - UINT16 EfiImageHeaderOffset; - UINT16 PcirOffset; -} EFI_PCI_EXPANSION_ROM_HEADER; - typedef struct { UINT16 Signature; // 0xaa55 UINT8 Size512; @@ -423,13 +402,6 @@ typedef struct { UINT16 PcirOffset; } EFI_LEGACY_EXPANSION_ROM_HEADER; -typedef union { - UINT8 *Raw; - PCI_EXPANSION_ROM_HEADER *Generic; - EFI_PCI_EXPANSION_ROM_HEADER *Efi; - EFI_LEGACY_EXPANSION_ROM_HEADER *PcAt; -} EFI_PCI_ROM_HEADER; - typedef struct { UINT32 Signature; // "PCIR" UINT16 VendorId; @@ -445,23 +417,6 @@ typedef struct { UINT16 Reserved1; } PCI_DATA_STRUCTURE; -typedef struct { - UINT32 Signature; // "PCIR" - UINT16 VendorId; - UINT16 DeviceId; - UINT16 DeviceListOffset; - UINT16 Length; - UINT8 Revision; - UINT8 ClassCode[3]; - UINT16 ImageLength; - UINT16 CodeRevision; - UINT8 CodeType; - UINT8 Indicator; - UINT16 MaxRuntimeImageLength; - UINT16 ConfigUtilityCodeHeaderOffset; - UINT16 DMTFCLPEntryPointOffset; -} PCI_3_0_DATA_STRUCTURE; - // // PCI Capability List IDs and records // @@ -472,10 +427,6 @@ typedef struct { #define EFI_PCI_CAPABILITY_ID_MSI 0x05 #define EFI_PCI_CAPABILITY_ID_HOTPLUG 0x06 #define EFI_PCI_CAPABILITY_ID_PCIX 0x07 -// -// bugbug: this ID is defined in PCI spec v2.3 -// -#define EFI_PCI_CAPABILITY_ID_PCIEXP 0x10 typedef struct { UINT8 CapabilityID; @@ -586,4 +537,12 @@ typedef struct { #pragma pack(pop) +// +// NOTE: The following header files are included here for +// compatibility consideration. +// +#include "pci23.h" +#include "pci30.h" +#include "EfiPci.h" + #endif