updated parameters name to match spec.

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

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c b/IntelFrameworkModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
index 9f81f1de3ae739ad6fa5165191a39350ad16a955..cebd63d11ee1059cb6a9c492f4e2ab29c2f267bb 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
@@ -30,9 +30,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 typedef struct {\r
   UINT64  VendorId;\r
   UINT64  DeviceId;\r
 typedef struct {\r
   UINT64  VendorId;\r
   UINT64  DeviceId;\r

-  UINT64  Revision;\r
-  UINT64  SubVendorId;\r
-  UINT64  SubDeviceId;\r
+  UINT64  RevisionId;\r
+  UINT64  SubsystemVendorId;\r
+  UINT64  SubsystemDeviceId;\r

 } EFI_PCI_DEVICE_HEADER_INFO;\r
 \r
 typedef struct {\r
 } EFI_PCI_DEVICE_HEADER_INFO;\r
 \r
 typedef struct {\r


@@ -62,9 +62,9 @@ typedef struct {
   resource configuration requirements for an incompatible PCI device.\r
 \r
   @param  This                  Pointer to the EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL instance.\r
   resource configuration requirements for an incompatible PCI device.\r
 \r
   @param  This                  Pointer to the EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL instance.\r

-  @param  VendorID              A unique ID to identify the manufacturer of the PCI device.\r
-  @param  DeviceID              A unique ID to identify the particular PCI device.\r
-  @param  RevisionID            A PCI device-specific revision identifier.\r
+  @param  VendorId              A unique ID to identify the manufacturer of the PCI device.\r
+  @param  DeviceId              A unique ID to identify the particular PCI device.\r
+  @param  RevisionId            A PCI device-specific revision identifier.\r

   @param  SubsystemVendorId     Specifies the subsystem vendor ID.\r
   @param  SubsystemDeviceId     Specifies the subsystem device ID.\r
   @param  Configuration         A list of ACPI resource descriptors returned that detail\r
   @param  SubsystemVendorId     Specifies the subsystem vendor ID.\r
   @param  SubsystemDeviceId     Specifies the subsystem device ID.\r
   @param  Configuration         A list of ACPI resource descriptors returned that detail\r


@@ -82,7 +82,7 @@ PCheckDevice (
   IN  EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL  *This,\r
   IN  UINTN                                         VendorId,\r
   IN  UINTN                                         DeviceId,\r
   IN  EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL  *This,\r
   IN  UINTN                                         VendorId,\r
   IN  UINTN                                         DeviceId,\r

-  IN  UINTN                                         Revision,\r
+  IN  UINTN                                         RevisionId,\r

   IN  UINTN                                         SubVendorId,\r
   IN  UINTN                                         SubDeviceId,\r
   OUT VOID                                          **Configuration\r
   IN  UINTN                                         SubVendorId,\r
   IN  UINTN                                         SubDeviceId,\r
   OUT VOID                                          **Configuration\r


@@ -227,9 +227,9 @@ IncompatiblePciDeviceSupportEntryPoint (
   resource configuration requirements for an incompatible PCI device.\r
 \r
   @param  This                  Pointer to the EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL instance.\r
   resource configuration requirements for an incompatible PCI device.\r
 \r
   @param  This                  Pointer to the EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL instance.\r

-  @param  VendorID              A unique ID to identify the manufacturer of the PCI device.\r
-  @param  DeviceID              A unique ID to identify the particular PCI device.\r
-  @param  RevisionID            A PCI device-specific revision identifier.\r
+  @param  VendorId              A unique ID to identify the manufacturer of the PCI device.\r
+  @param  DeviceId              A unique ID to identify the particular PCI device.\r
+  @param  RevisionId            A PCI device-specific revision identifier.\r

   @param  SubsystemVendorId     Specifies the subsystem vendor ID.\r
   @param  SubsystemDeviceId     Specifies the subsystem device ID.\r
   @param  Configuration         A list of ACPI resource descriptors returned that detail\r
   @param  SubsystemVendorId     Specifies the subsystem vendor ID.\r
   @param  SubsystemDeviceId     Specifies the subsystem device ID.\r
   @param  Configuration         A list of ACPI resource descriptors returned that detail\r


@@ -247,9 +247,9 @@ PCheckDevice (
   IN  EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL  *This,\r
   IN  UINTN                                         VendorId,\r
   IN  UINTN                                         DeviceId,\r
   IN  EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL  *This,\r
   IN  UINTN                                         VendorId,\r
   IN  UINTN                                         DeviceId,\r

-  IN  UINTN                                         Revision,\r
-  IN  UINTN                                         SubVendorId,\r
-  IN  UINTN                                         SubDeviceId,\r
+  IN  UINTN                                         RevisionId,\r
+  IN  UINTN                                         SubsystemVendorId,\r
+  IN  UINTN                                         SubsystemDeviceId,\r

   OUT VOID                                          **Configuration\r
   )\r
 {\r
   OUT VOID                                          **Configuration\r
   )\r
 {\r


@@ -298,20 +298,20 @@ PCheckDevice (
         }\r
       }\r
 \r
         }\r
       }\r
 \r

-      if (Header->Revision != DEVICE_ID_NOCARE) {\r
-        if (Revision != Header->Revision) {\r
+      if (Header->RevisionId != DEVICE_ID_NOCARE) {\r
+        if (RevisionId != Header->RevisionId) {\r

           continue;\r
         }\r
       }\r
 \r
           continue;\r
         }\r
       }\r
 \r

-      if (Header->SubVendorId != DEVICE_ID_NOCARE) {\r
-        if (SubVendorId != Header->SubVendorId) {\r
+      if (Header->SubsystemVendorId != DEVICE_ID_NOCARE) {\r
+        if (SubsystemVendorId != Header->SubsystemVendorId) {\r

           continue;\r
         }\r
       }\r
 \r
           continue;\r
         }\r
       }\r
 \r

-      if (Header->SubDeviceId != DEVICE_ID_NOCARE) {\r
-        if (SubDeviceId != Header->SubDeviceId) {\r
+      if (Header->SubsystemDeviceId != DEVICE_ID_NOCARE) {\r
+        if (SubsystemDeviceId != Header->SubsystemDeviceId) {\r

           continue;\r
         }\r
       }\r
           continue;\r
         }\r
       }\r

diff --git a/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h b/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h
index 287d7a9ea8adf8cd429923c18d188e2ae25f4c5d..a763399395fbd73a127cfc4b83f635ab62a108cc 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h
+++ b/IntelFrameworkPkg/Include/Protocol/IncompatiblePciDeviceSupport.h
@@ -44,9 +44,9 @@ typedef struct _EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL EFI_INCOMPATIBLE_PC
   resource configuration requirements for an incompatible PCI device.\r
 \r
   @param  This                  Pointer to the EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL instance.\r
   resource configuration requirements for an incompatible PCI device.\r
 \r
   @param  This                  Pointer to the EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL instance.\r

-  @param  VendorID              A unique ID to identify the manufacturer of the PCI device.\r
-  @param  DeviceID              A unique ID to identify the particular PCI device.\r
-  @param  RevisionID            A PCI device-specific revision identifier.\r
+  @param  VendorId              A unique ID to identify the manufacturer of the PCI device.\r
+  @param  DeviceId              A unique ID to identify the particular PCI device.\r
+  @param  RevisionId            A PCI device-specific revision identifier.\r

   @param  SubsystemVendorId     Specifies the subsystem vendor ID.\r
   @param  SubsystemDeviceId     Specifies the subsystem device ID.\r
   @param  Configuration         A list of ACPI resource descriptors that detail\r
   @param  SubsystemVendorId     Specifies the subsystem vendor ID.\r
   @param  SubsystemDeviceId     Specifies the subsystem device ID.\r
   @param  Configuration         A list of ACPI resource descriptors that detail\r


@@ -58,12 +58,12 @@ typedef struct _EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL EFI_INCOMPATIBLE_PC
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_CHECK_DEVICE)(\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_CHECK_DEVICE)(\r

-  IN EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL   *This,\r
+  IN  EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL  *This,\r

   IN  UINTN                                         VendorId,\r
   IN  UINTN                                         DeviceId,\r
   IN  UINTN                                         VendorId,\r
   IN  UINTN                                         DeviceId,\r

-  IN  UINTN                                         Revision,\r
-  IN  UINTN                                         SubVendorId,\r
-  IN  UINTN                                         SubDeviceId,\r
+  IN  UINTN                                         RevisionId,\r
+  IN  UINTN                                         SubsystemVendorId,\r
+  IN  UINTN                                         SubsystemDeviceId,\r

   OUT VOID                                          **Configuration\r
 );\r
 \r
   OUT VOID                                          **Configuration\r
 );\r
 \r