From 5904052aab9fc953c9f608d011380587e7120651 Mon Sep 17 00:00:00 2001
From: jcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 19 Dec 2012 16:47:06 +0000
Subject: [PATCH] =?UTF-8?q?ShellPkg:=20Updates=20to=20DumpHex()=20and=20?=
 =?UTF-8?q?=E2=80=98dmem=E2=80=99=20command=20for=20correct=20output=20for?=
 =?UTF-8?q?mat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chris Phillips <chrisp@hp.com>
reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14010 6f19259b-4bc3-4df7-8a09-765794883524
---
 ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c            | 4 ++--
 .../UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
index dfee96bb29..ff628b782a 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c
@@ -74,7 +74,7 @@ DisplayMmioMemory(
     ShellStatus = SHELL_NOT_FOUND;
   } else {
     ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DMEM_MMIO_HEADER_ROW), gShellDebug1HiiHandle, (UINT64)(UINTN)Address, Size);
-    DumpHex(2,0,Size,Buffer);
+    DumpHex(2, (UINTN)Address, Size, Buffer);
   }
 
   FreePool(Buffer);
@@ -168,7 +168,7 @@ ShellCommandRunDmem (
     if (ShellStatus == SHELL_SUCCESS) {
       if (!ShellCommandLineGetFlag(Package, L"-mmio")) {
         ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DMEM_HEADER_ROW), gShellDebug1HiiHandle, (UINT64)(UINTN)Address, Size);
-        DumpHex(2,0,(UINTN)Size,Address);
+        DumpHex(2, (UINTN)Address, (UINTN)Size, Address);
         if (Address == (VOID*)gST) {
           Acpi20TableAddress  = 0;
           AcpiTableAddress    = 0;
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
index 75e0de2fa2..1d72ea6c3a 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
@@ -180,7 +180,7 @@ DumpHex (
 
     Val[Index * 3]  = 0;
     Str[Index]      = 0;
-    ShellPrintEx(-1, -1, L"%*a%02X: %-.48a *%a*\r\n", Indent, "", Offset, Val, Str);
+    ShellPrintEx(-1, -1, L"%*a%08X: %-48a *%a*\r\n", Indent, "", Offset, Val, Str);
 
     Data += Size;
     Offset += Size;