ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c | 4 ++-- ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-)
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 reviewed at
https://github.com/AlexeiFedorov/edk2/tree/298_acpiview_fix_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 from 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..a5e1412484b56258c40e0cb4d795157ffbce6826 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;
+ SignaturePtr = (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
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com> Adding Eric Dong also. > -----Original Message----- > From: AlexeiFedorov [mailto:Alexei.Fedorov@arm.com] > Sent: Friday, July 13, 2018 8:17 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 v1] ShellPkg/UefiShellAcpiViewCommandLib: Fix VS2017 > compilation errors > Importance: High > > 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 reviewed at > https://github.com/AlexeiFedorov/edk2/tree/298_acpiview_fix_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 from 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..0ab460b02c9e062ac181e42e7 > e77f875a40c86dc 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..a5e1412484b56258c40e0cb4d > 795157ffbce6826 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; > + SignaturePtr = (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
The fix is good. I suggest you create another patch to add UefiShellAcpiViewCommandLib INF file into [Components] of ShellPkg.dsc. If so, this library can be built in the package level build. Thanks Liming >-----Original Message----- >From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of >AlexeiFedorov >Sent: Friday, July 13, 2018 11:17 PM >To: edk2-devel@lists.01.org >Cc: Ni, Ruiyu <ruiyu.ni@intel.com>; Stephanie.Hughes-Fitt@arm.com; Carsey, >Jaben <jaben.carsey@intel.com>; nd@arm.com >Subject: [edk2] [PATCH v1] 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> >--- >All the changes can be reviewed at >https://github.com/AlexeiFedorov/edk2/tree/298_acpiview_fix_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 from 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..0ab460b02c9e062ac181e42e7e >77f875a40c86dc 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..a5e1412484b56258c40e0cb4d7 >95157ffbce6826 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; >+ SignaturePtr = (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-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
© 2016 - 2024 Red Hat, Inc.