Add a new definition according to Pci spec 2.2

[mirror_edk2.git] / MdePkg / Include / IndustryStandard / pci22.h

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