ShellPkg: Updates to 'smbiosview' command

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@13996 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
index b6f38479927ad1443b45e30c12a9da57643a9148..be8b7c6c5360471a0e29d251092711675e5c324f 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
@@ -3953,7 +3953,7 @@ DisplayPMAUse (
   IN UINT8 Option\r
   )\r
 {\r
-  ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_QUERYTABLE_PHYS_MEM_ARRAY_LOCATION), gShellDebug1HiiHandle);\r
+  ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_QUERYTABLE_PHYS_MEM_ARRAY_USE), gShellDebug1HiiHandle);\r
   PRINT_INFO_OPTION (Use, Option);\r
   PRINT_TABLE_ITEM (PMAUseTable, Use);\r
 }\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView.c
index 95627a545c08b3d52f6ec6a69ade80c79d3df55f..1f0d0be710e52466311ec9dfd3f0bb09fae550d2 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView.c
@@ -325,6 +325,12 @@ SMBiosView (
       if (!RandomView) {\r
         break;\r
       }\r
+      //\r
+      // Support Execution Interrupt.\r
+      //\r
+      if (ShellGetExecutionBreakFlag ()) {\r
+        return EFI_ABORTED;\r
+      }\r
     }\r
 \r
     ShellPrintEx(-1,-1,L"\n=========================================================\n");\r

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni
index e50995c58f820015ad8f50a10c8d033be551f749..ea5df85c058497b401ff0f78ee676bde3e970a53 100644 (file)
Binary files a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni and b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni differ