ShellPkg/UefiShellAcpiViewCommandLib: Fix VS2017 compilation errors

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>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
index 3a3cee948ad8cd35ef3a6e13fec9d44300dbe73f..0ab460b02c9e062ac181e42e7e77f875a40c86dc 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
@@ -161,12 +161,12 @@ STATIC
 VOID\r
 DumpGTBlock (\r
   IN UINT8* Ptr,\r
-  IN UINT16 Length\r
+  IN UINT32 Length\r
   )\r
 {\r
   UINT32 Index;\r
   UINT32 Offset;\r
-  UINT16 GTBlockTimerLength;\r
+  UINT32 GTBlockTimerLength;\r
 \r
   Offset = ParseAcpi (\r
              TRUE,\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c
index 99521cd67a714065c2eb9e4e5ec0f2e21f4c9da9..a5e1412484b56258c40e0cb4d795157ffbce6826 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c
@@ -96,7 +96,7 @@ ParseAcpiXsdt (
       CONST UINT8*  Revision;\r
 \r
       if ((UINT64*)(UINTN)(*TablePointer) != NULL) {\r
-        UINT8*      Ptr;\r
+        UINT8*      SignaturePtr;\r
 \r
         ParseAcpiHeader (\r
           (UINT8*)(UINTN)(*TablePointer),\r
@@ -105,17 +105,17 @@ ParseAcpiXsdt (
           &Revision\r
           );\r
 \r
-        Ptr = (UINT8*)Signature;\r
+        SignaturePtr = (UINT8*)Signature;\r
 \r
         UnicodeSPrint (\r
           Buffer,\r
           sizeof (Buffer),\r
           L"Entry[%d] - %c%c%c%c",\r
           EntryIndex++,\r
-          Ptr[0],\r
-          Ptr[1],\r
-          Ptr[2],\r
-          Ptr[3]\r
+          SignaturePtr[0],\r
+          SignaturePtr[1],\r
+          SignaturePtr[2],\r
+          SignaturePtr[3]\r
           );\r
       } else {\r
         UnicodeSPrint (\r