Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <[email protected]>
Cc: Hao A Wu <[email protected]>
---
ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c | 2 +-
ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c | 1 +
.../Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c
b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c
index 18c4983e95..5cab20023d 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c
@@ -297,7 +297,7 @@ DumpUint64 (
Val = *(UINT32*)(Ptr + sizeof (UINT32));
Val <<= 32;
- Val |= *(UINT32*)Ptr;
+ Val |= (UINT64)*(UINT32*)Ptr;
Print (Format, Val);
}
diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c
b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c
index 47ce93f104..4199e82ab1 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c
@@ -284,6 +284,7 @@ ConvertStrToAcpiSignature (
UINT8 Index;
CHAR8 Ptr[4];
+ ZeroMem (Ptr, sizeof (Ptr));
Index = 0;
// Convert to Upper case and convert to ASCII
diff --git
a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
index 245700a253..c6eb7087cf 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
@@ -118,7 +118,7 @@ UefiShellAcpiViewCommandLibConstructor (
gShellAcpiViewHiiHandle = NULL;
// Check Shell Profile Debug1 bit of the profiles mask
- if ((FixedPcdGet8 (PcdShellProfileMask) & BIT1) == 0) {
+ if ((PcdGet8 (PcdShellProfileMask) & BIT1) == 0) {
return EFI_SUCCESS;
}
--
2.16.1.windows.1
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel
