sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdeModulePkg/PciBus: Refine ActiveVGADeviceOnTheRootBridge

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1109
The patch doesn't change any behavior of this function.
It just renames the function to LocateVgaDevice() and renames
some parameters and local variables.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
This commit is contained in:
Ruiyu Ni
2018-08-23 10:34:33 +08:00
parent 6861765935
commit 06da1e310b
2 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
View File

@ -1002,7 +1002,7 @@ ActiveVGADeviceOnTheSameSegment (
if (Temp->PciRootBridgeIo->SegmentNumber == VgaDevice->PciRootBridgeIo->SegmentNumber) { if (Temp->PciRootBridgeIo->SegmentNumber == VgaDevice->PciRootBridgeIo->SegmentNumber) {
Temp = ActiveVGADeviceOnTheRootBridge (Temp); Temp = LocateVgaDevice (Temp);
if (Temp != NULL) { if (Temp != NULL) {
return Temp; return Temp;
@ -1016,41 +1016,41 @@ ActiveVGADeviceOnTheSameSegment (
} }
/** /**
Get the active VGA device on the root bridge. Locate the active VGA device under the bridge.
@param RootBridge PCI IO instance for the root bridge. @param Bridge PCI IO instance for the bridge.
@return The active VGA device. @return The active VGA device.
**/ **/
PCI_IO_DEVICE * PCI_IO_DEVICE *
ActiveVGADeviceOnTheRootBridge ( LocateVgaDevice (
IN PCI_IO_DEVICE *RootBridge IN PCI_IO_DEVICE *Bridge
) )
{ {
LIST_ENTRY *CurrentLink; LIST_ENTRY *CurrentLink;
PCI_IO_DEVICE *Temp; PCI_IO_DEVICE *PciIoDevice;
CurrentLink = RootBridge->ChildList.ForwardLink; CurrentLink = Bridge->ChildList.ForwardLink;
while (CurrentLink != NULL && CurrentLink != &RootBridge->ChildList) { while (CurrentLink != NULL && CurrentLink != &Bridge->ChildList) {
Temp = PCI_IO_DEVICE_FROM_LINK (CurrentLink); PciIoDevice = PCI_IO_DEVICE_FROM_LINK (CurrentLink);
if (IS_PCI_VGA(&Temp->Pci) && if (IS_PCI_VGA(&PciIoDevice->Pci) &&
(Temp->Attributes & (PciIoDevice->Attributes &
(EFI_PCI_IO_ATTRIBUTE_VGA_MEMORY | (EFI_PCI_IO_ATTRIBUTE_VGA_MEMORY |
EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_ATTRIBUTE_VGA_IO |
EFI_PCI_IO_ATTRIBUTE_VGA_IO_16)) != 0) { EFI_PCI_IO_ATTRIBUTE_VGA_IO_16)) != 0) {
return Temp; return PciIoDevice;
} }
if (IS_PCI_BRIDGE (&Temp->Pci)) { if (IS_PCI_BRIDGE (&PciIoDevice->Pci)) {
Temp = ActiveVGADeviceOnTheRootBridge (Temp); PciIoDevice = LocateVgaDevice (PciIoDevice);
if (Temp != NULL) { if (PciIoDevice != NULL) {
return Temp; return PciIoDevice;
} }
} }
@ -1060,6 +1060,3 @@ ActiveVGADeviceOnTheRootBridge (
return NULL; return NULL;
} }

10
MdeModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
Supporting functions declaration for PCI devices management. Supporting functions declaration for PCI devices management.
Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -243,16 +243,16 @@ ActiveVGADeviceOnTheSameSegment (
); );
/** /**
Get the active VGA device on the root bridge. Locate the active VGA device under the bridge.
@param RootBridge PCI IO instance for the root bridge. @param Bridge PCI IO instance for the bridge.
@return The active VGA device. @return The active VGA device.
**/ **/
PCI_IO_DEVICE * PCI_IO_DEVICE *
ActiveVGADeviceOnTheRootBridge ( LocateVgaDevice (
IN PCI_IO_DEVICE *RootBridge IN PCI_IO_DEVICE *Bridge
); );