MdeModulePkg/PciBus: Refine ActiveVGADeviceOnTheRootBridge

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

View File

@ -1002,7 +1002,7 @@ ActiveVGADeviceOnTheSameSegment (
if (Temp->PciRootBridgeIo->SegmentNumber == VgaDevice->PciRootBridgeIo->SegmentNumber) {
Temp = ActiveVGADeviceOnTheRootBridge (Temp);
Temp = LocateVgaDevice (Temp);
if (Temp != NULL) {
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.
**/
PCI_IO_DEVICE *
ActiveVGADeviceOnTheRootBridge (
IN PCI_IO_DEVICE *RootBridge
LocateVgaDevice (
IN PCI_IO_DEVICE *Bridge
)
{
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) &&
(Temp->Attributes &
if (IS_PCI_VGA(&PciIoDevice->Pci) &&
(PciIoDevice->Attributes &
(EFI_PCI_IO_ATTRIBUTE_VGA_MEMORY |
EFI_PCI_IO_ATTRIBUTE_VGA_IO |
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) {
return Temp;
if (PciIoDevice != NULL) {
return PciIoDevice;
}
}
@ -1060,6 +1060,3 @@ ActiveVGADeviceOnTheRootBridge (
return NULL;
}