Remove "Efi" from gEfiIncompatiblePciDeviceSupport to shorten the global variable name.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni <[email protected]> Cc: Jeff Fan <[email protected]> --- MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c | 6 +++--- MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h | 2 +- .../Bus/Pci/PciBusDxe/PciEnumeratorSupport.c | 22 +++++++++++----------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c index beecf79..a463bea 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.c @@ -8,7 +8,7 @@ PCI Root Bridges. So it means platform needs install PCI Root Bridge IO protocol for each PCI Root Bus and install PCI Host Bridge Resource Allocation Protocol. -Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR> +Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR> 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 @@ -34,7 +34,7 @@ EFI_DRIVER_BINDING_PROTOCOL gPciBusDriverBinding = { }; EFI_HANDLE gPciHostBrigeHandles[PCI_MAX_HOST_BRIDGE_NUM]; -EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL *gEfiIncompatiblePciDeviceSupport = NULL; +EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL *gIncompatiblePciDeviceSupport = NULL; UINTN gPciHostBridgeNumber = 0; BOOLEAN gFullEnumeration = TRUE; UINT64 gAllOne = 0xFFFFFFFFFFFFFFFFULL; @@ -258,7 +258,7 @@ PciBusDriverBindingStart ( gBS->LocateProtocol ( &gEfiIncompatiblePciDeviceSupportProtocolGuid, NULL, - (VOID **) &gEfiIncompatiblePciDeviceSupport + (VOID **) &gIncompatiblePciDeviceSupport ); // diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h index baf88c7..2226b1b 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h @@ -307,7 +307,7 @@ struct _PCI_IO_DEVICE { // // Global Variables // -extern EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL *gEfiIncompatiblePciDeviceSupport; +extern EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL *gIncompatiblePciDeviceSupport; extern EFI_DRIVER_BINDING_PROTOCOL gPciBusDriverBinding; extern EFI_COMPONENT_NAME_PROTOCOL gPciBusComponentName; extern EFI_COMPONENT_NAME2_PROTOCOL gPciBusComponentName2; diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c index 5002140..57e2760 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c @@ -1336,7 +1336,7 @@ UpdatePciInfo ( Configuration = NULL; Status = EFI_SUCCESS; - if (gEfiIncompatiblePciDeviceSupport == NULL) { + if (gIncompatiblePciDeviceSupport == NULL) { // // It can only be supported after the Incompatible PCI Device // Support Protocol has been installed @@ -1344,7 +1344,7 @@ UpdatePciInfo ( Status = gBS->LocateProtocol ( &gEfiIncompatiblePciDeviceSupportProtocolGuid, NULL, - (VOID **) &gEfiIncompatiblePciDeviceSupport + (VOID **) &gIncompatiblePciDeviceSupport ); } if (Status == EFI_SUCCESS) { @@ -1352,15 +1352,15 @@ UpdatePciInfo ( // Check whether the device belongs to incompatible devices from protocol or not // If it is , then get its special requirement in the ACPI table // - Status = gEfiIncompatiblePciDeviceSupport->CheckDevice ( - gEfiIncompatiblePciDeviceSupport, - PciIoDevice->Pci.Hdr.VendorId, - PciIoDevice->Pci.Hdr.DeviceId, - PciIoDevice->Pci.Hdr.RevisionID, - PciIoDevice->Pci.Device.SubsystemVendorID, - PciIoDevice->Pci.Device.SubsystemID, - &Configuration - ); + Status = gIncompatiblePciDeviceSupport->CheckDevice ( + gIncompatiblePciDeviceSupport, + PciIoDevice->Pci.Hdr.VendorId, + PciIoDevice->Pci.Hdr.DeviceId, + PciIoDevice->Pci.Hdr.RevisionID, + PciIoDevice->Pci.Device.SubsystemVendorID, + PciIoDevice->Pci.Device.SubsystemID, + &Configuration + ); } -- 2.7.0.windows.1 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
