1. Patchew
  2. EDK2
  3. View series

[edk2] [PATCH v1] ShellPkg/UefiShellAcpiViewCommandLib: Fix VS2017 compilation errors

AlexeiFedorov posted 1 patch 6 years, 5 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c |  4 ++--
ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
[edk2] [PATCH v1] ShellPkg/UefiShellAcpiViewCommandLib: Fix VS2017 compilation errors
Posted by AlexeiFedorov 6 years, 5 months ago 
From: AlexeiFedorov <alexei.fedorov@arm.com>

This patch fixes VS2017 compilation errors for
UefiShellAcpiViewCommandLib\Parsers\Gtdt\GtdtParser.c
and
UefiShellAcpiViewCommandLib\Parsers\Xsdt\XsdtParser.c
reported in
https://bugzilla.tianocore.org/show_bug.cgi?id=985
https://bugzilla.tianocore.org/show_bug.cgi?id=986

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Alexei Fedorov <Alexei.Fedorov@arm.com>
---
All the changes can be seen at
https://github.com/AlexeiFedorov/edk2/tree/298_fix_acpiview_v1

Notes:
    v1:
    - GtdtParser.c DumpFTBlock() function:
      change UINT16 type of Length parameter to UINT32
      change UINT16 type of GTBlockTimerLength variable to UINT32
    - XsdtParser.c ParseAcpiXsdt() function:
      change name of local variable Ptr to SignaturePtr

 ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c |  4 ++--
 ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
index 3a3cee948ad8cd35ef3a6e13fec9d44300dbe73f..0ab460b02c9e062ac181e42e7e77f875a40c86dc 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
@@ -161,12 +161,12 @@ STATIC
 VOID
 DumpGTBlock (
   IN UINT8* Ptr,
-  IN UINT16 Length
+  IN UINT32 Length
   )
 {
   UINT32 Index;
   UINT32 Offset;
-  UINT16 GTBlockTimerLength;
+  UINT32 GTBlockTimerLength;
 
   Offset = ParseAcpi (
              TRUE,
diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c
index 99521cd67a714065c2eb9e4e5ec0f2e21f4c9da9..014b6259aa9cfe4093b6f19d4ff0be1e8096fd9b 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c
@@ -96,7 +96,7 @@ ParseAcpiXsdt (
       CONST UINT8*  Revision;
 
       if ((UINT64*)(UINTN)(*TablePointer) != NULL) {
-        UINT8*      Ptr;
+        UINT8*      SignaturePtr;
 
         ParseAcpiHeader (
           (UINT8*)(UINTN)(*TablePointer),
@@ -105,17 +105,17 @@ ParseAcpiXsdt (
           &Revision
           );
 
-        Ptr = (UINT8*)Signature;
+        SigPtr = (UINT8*)Signature;
 
         UnicodeSPrint (
           Buffer,
           sizeof (Buffer),
           L"Entry[%d] - %c%c%c%c",
           EntryIndex++,
-          Ptr[0],
-          Ptr[1],
-          Ptr[2],
-          Ptr[3]
+          SignaturePtr[0],
+          SignaturePtr[1],
+          SignaturePtr[2],
+          SignaturePtr[3]
           );
       } else {
         UnicodeSPrint (
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH v2] ShellPkg/UefiShellAcpiViewCommandLib: Fix VS2017 compilation errors
Posted by AlexeiFedorov 6 years, 5 months ago 
Please find v2 patch which corrects local variable
name SigPtr to SignaturePtr.

This patch fixes VS2017 compilation errors for
UefiShellAcpiViewCommandLib\Parsers\Gtdt\GtdtParser.c
and
UefiShellAcpiViewCommandLib\Parsers\Xsdt\XsdtParser.c
reported in
https://bugzilla.tianocore.org/show_bug.cgi?id=985
https://bugzilla.tianocore.org/show_bug.cgi?id=986

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Alexei Fedorov <Alexei.Fedorov@arm.com>
---
All the changes can be seen at
https://github.com/AlexeiFedorov/edk2/tree/298_fix_acpiview_v2

Notes:
        v1:
        - GtdtParser.c DumpFTBlock() function:
          change UINT16 type of Length parameter to UINT32
          change UINT16 type of GTBlockTimerLength variable to UINT32
        - XsdtParser.c ParseAcpiXsdt() function:
          change name of local variable Ptr to SignaturePtr
        v2:
    	- XsdtParser.c ParseAcpiXsdt() function:
          correct name of local variable SigPtr to SignaturePtr

 ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c
index 014b6259aa9cfe4093b6f19d4ff0be1e8096fd9b..a5e1412484b56258c40e0cb4d795157ffbce6826 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c
@@ -105,7 +105,7 @@ ParseAcpiXsdt (
           &Revision
           );
 
-        SigPtr = (UINT8*)Signature;
+        SignaturePtr = (UINT8*)Signature;
 
         UnicodeSPrint (
           Buffer,
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v2] ShellPkg/UefiShellAcpiViewCommandLib: Fix VS2017 compilation errors
Posted by Carsey, Jaben 6 years, 5 months ago 
This patch look good, and with this the v1 looks good, but I don't see a single patch that I could apply and push.  Can you send out a single patch with all the changes?

-Jaben

> -----Original Message-----
> From: AlexeiFedorov [mailto:Alexei.Fedorov@arm.com]
> Sent: Friday, July 13, 2018 4:06 AM
> To: edk2-devel@lists.01.org
> Cc: Ard.Biesheuvel@linaro.org; Leif.Lindholm@linaro.org;
> Matteo.Carlini@arm.com; Stephanie.Hughes-Fitt@arm.com; nd@arm.com;
> Carsey, Jaben <jaben.carsey@intel.com>; Ni, Ruiyu <ruiyu.ni@intel.com>;
> Evan.Lloyd@arm.com; Sami.Mujawar@arm.com
> Subject: [PATCH v2] ShellPkg/UefiShellAcpiViewCommandLib: Fix VS2017
> compilation errors
> Importance: High
> 
> Please find v2 patch which corrects local variable
> name SigPtr to SignaturePtr.
> 
> This patch fixes VS2017 compilation errors for
> UefiShellAcpiViewCommandLib\Parsers\Gtdt\GtdtParser.c
> and
> UefiShellAcpiViewCommandLib\Parsers\Xsdt\XsdtParser.c
> reported in
> https://bugzilla.tianocore.org/show_bug.cgi?id=985
> https://bugzilla.tianocore.org/show_bug.cgi?id=986
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Alexei Fedorov <Alexei.Fedorov@arm.com>
> ---
> All the changes can be seen at
> https://github.com/AlexeiFedorov/edk2/tree/298_fix_acpiview_v2
> 
> Notes:
>         v1:
>         - GtdtParser.c DumpFTBlock() function:
>           change UINT16 type of Length parameter to UINT32
>           change UINT16 type of GTBlockTimerLength variable to UINT32
>         - XsdtParser.c ParseAcpiXsdt() function:
>           change name of local variable Ptr to SignaturePtr
>         v2:
>     	- XsdtParser.c ParseAcpiXsdt() function:
>           correct name of local variable SigPtr to SignaturePtr
> 
>  ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c
> | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git
> a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.
> c
> b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.
> c
> index
> 014b6259aa9cfe4093b6f19d4ff0be1e8096fd9b..a5e1412484b56258c40e0cb4d
> 795157ffbce6826 100644
> ---
> a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.
> c
> +++
> b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.
> c
> @@ -105,7 +105,7 @@ ParseAcpiXsdt (
>            &Revision
>            );
> 
> -        SigPtr = (UINT8*)Signature;
> +        SignaturePtr = (UINT8*)Signature;
> 
>          UnicodeSPrint (
>            Buffer,
> --
> 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'
> 

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

Patchew 2.1-devel-8c64711

© 2016 - 2024 Red Hat, Inc.