Reviewed-by: Ruiyu Ni <ruiyu...@intel.com>
> -----Original Message-----
> From: Tian, Feng
> Sent: Wednesday, July 29, 2015 11:26 AM
> To: Zeng, Star <star.z...@intel.com>; Ni, Ruiyu <ruiyu...@intel.com>
> Cc: edk2-devel@lists.01.org; Kinney, Michael D
> <michael.d.kin...@intel.com>
> Subject: [patch 2/2] MdeModulePkg/PciBus: Simplify an complex if
> statement to pass VS2015
>
> The logic in an if statement in PciIo is too complex and hard to understand
> and make VS2015 build failure. The fix simplifies the logic.
>
> Cc: Ruiyu Ni <ruiyu...@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Michael D Kinney <michael.d.kin...@intel.com>
> Reviewed-by: Feng Tian <feng.t...@intel.com>
> ---
> MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c | 15 +++++----------
> 1 file changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c
> b/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c
> index 15d6443..4160632 100644
> --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c
> +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciIo.c
> @@ -1,7 +1,7 @@
> /** @file
> EFI PCI IO protocol functions implementation for PCI Bus module.
>
> -Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2006 - 2015, 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
> @@ -1568,15 +1568,10 @@ PciIoAttributes (
> //
> // Check VGA and VGA16, they can not be set at the same time
> //
> - if (((Attributes & EFI_PCI_IO_ATTRIBUTE_VGA_IO) != 0 &&
> - (Attributes & EFI_PCI_IO_ATTRIBUTE_VGA_IO_16) != 0)
> ||
> - ((Attributes & EFI_PCI_IO_ATTRIBUTE_VGA_IO) != 0 &&
> - (Attributes & EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO_16) != 0)
> ||
> - ((Attributes & EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO) != 0 &&
> - (Attributes & EFI_PCI_IO_ATTRIBUTE_VGA_IO_16) != 0)
> ||
> - ((Attributes & EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO) != 0 &&
> - (Attributes & EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO_16) != 0) )
> {
> - return EFI_UNSUPPORTED;
> + if ((Attributes & (EFI_PCI_IO_ATTRIBUTE_VGA_IO |
> EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO)) != 0) {
> + if ((Attributes & (EFI_PCI_IO_ATTRIBUTE_VGA_IO_16 |
> EFI_PCI_IO_ATTRIBUTE_VGA_PALETTE_IO_16)) != 0) {
> + return EFI_UNSUPPORTED;
> + }
> }
>
> //
> --
> 1.9.5.msysgit.0
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
