ShellPkg/pci: Fix VS2012 build failure

[edk2] [PATCH] ShellPkg/pci: Fix VS2012 build failure

Posted by Ruiyu Ni 6 years, 12 months ago

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
---
 ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
index 99335f05c5..38559571c2 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
@@ -2885,6 +2885,7 @@ ShellCommandRunPci (
      );
 
     ExtendedConfigSpace = NULL;
+    ExtendedConfigSize  = 0;
     PcieCapabilityPtr = LocatePciCapability (&ConfigSpace, EFI_PCI_CAPABILITY_ID_PCIEXP);
     if (PcieCapabilityPtr != 0) {
       ExtendedConfigSize  = 0x1000 - EFI_PCIE_CAPABILITY_BASE_OFFSET;
@@ -2922,7 +2923,7 @@ ShellCommandRunPci (
     //
     if (ExplainData) {
       PciExplainPci (&ConfigSpace, Address, IoDev);
-      if ((PcieCapabilityPtr != 0) && !ShellGetExecutionBreakFlag ()) {
+      if ((ExtendedConfigSpace != NULL) && !ShellGetExecutionBreakFlag ()) {
         PciExplainPciExpress (
           (PCI_CAPABILITY_PCIEXP *) ((UINT8 *) &ConfigSpace + PcieCapabilityPtr),
           ExtendedConfigSpace,
-- 
2.12.2.windows.2

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH] ShellPkg/pci: Fix VS2012 build failure

Posted by Wu, Hao A 6 years, 12 months ago

Reviewed-by: Hao Wu <hao.a.wu@intel.com>


Best Regards,
Hao Wu


> -----Original Message-----
> From: Ni, Ruiyu
> Sent: Thursday, April 20, 2017 10:51 AM
> To: edk2-devel@lists.01.org
> Cc: Wu, Hao A; Bi, Dandan
> Subject: [PATCH] ShellPkg/pci: Fix VS2012 build failure
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Dandan Bi <dandan.bi@intel.com>
> ---
>  ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
> index 99335f05c5..38559571c2 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
> @@ -2885,6 +2885,7 @@ ShellCommandRunPci (
>       );
> 
>      ExtendedConfigSpace = NULL;
> +    ExtendedConfigSize  = 0;
>      PcieCapabilityPtr = LocatePciCapability (&ConfigSpace,
> EFI_PCI_CAPABILITY_ID_PCIEXP);
>      if (PcieCapabilityPtr != 0) {
>        ExtendedConfigSize  = 0x1000 - EFI_PCIE_CAPABILITY_BASE_OFFSET;
> @@ -2922,7 +2923,7 @@ ShellCommandRunPci (
>      //
>      if (ExplainData) {
>        PciExplainPci (&ConfigSpace, Address, IoDev);
> -      if ((PcieCapabilityPtr != 0) && !ShellGetExecutionBreakFlag ()) {
> +      if ((ExtendedConfigSpace != NULL) && !ShellGetExecutionBreakFlag ()) {
>          PciExplainPciExpress (
>            (PCI_CAPABILITY_PCIEXP *) ((UINT8 *) &ConfigSpace +
> PcieCapabilityPtr),
>            ExtendedConfigSpace,
> --
> 2.12.2.windows.2

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel