From: AlexeiFedorov <Alexei.Fedorov@arm.com>
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, Evan.Lloyd@arm.com, Sami.Mujawar@arm.com
Subject: [PATCH v1] ShellPkg/UefiShellAcpiViewCommandLib: Fix VS2017 compilation errors
Date: Fri, 13 Jul 2018 11:07:21 +0100 [thread overview]
Message-ID: <20180713100721.19224-1-Alexei.Fedorov@arm.com> (raw)
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)'
next reply other threads:[~2018-07-13 10:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-13 10:07 AlexeiFedorov [this message]
2018-07-13 10:12 ` [PATCH v1] ShellPkg/UefiShellAcpiViewCommandLib: Fix VS2017 compilation errors Leif Lindholm
-- strict thread matches above, loose matches on Subject: below --
2018-07-13 11:05 AlexeiFedorov
2018-07-13 15:17 AlexeiFedorov
2018-07-13 16:39 ` Carsey, Jaben
2018-07-16 2:38 ` Gao, Liming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180713100721.19224-1-Alexei.Fedorov@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox