ShellPkg: acpiview: Make '-h' option not require a parameter

Make the -h command line option a binary flag. Now, colour
highlighting is enabled whenever this flag is set (stateless),
instead of being dependent on previous acpiview command
invocations.

By removing the parameter required with the -h flag the command
line parsing logic becomes simpler.

Signed-off-by: Krzysztof Koch <krzysztof.koch@arm.com>
Reviewed-by: Alexei Fedorov <Alexei.Fedorov@arm.com>
Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c
index 911b2da3dd9f19010d0f4993bcf017749cafb749..9feb2df2078f5aff41e1d39081fbb8cbc0bc32dd 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c
@@ -34,7 +34,7 @@ STATIC BOOLEAN            mColourHighlighting;
 STATIC CONST SHELL_PARAM_ITEM ParamList[] = {\r
   {L"-q", TypeFlag},\r
   {L"-d", TypeFlag},\r
-  {L"-h", TypeValue},\r
+  {L"-h", TypeFlag},\r
   {L"-l", TypeFlag},\r
   {L"-s", TypeValue},\r
   {NULL, TypeMax}\r
@@ -459,8 +459,6 @@ ShellCommandRunAcpiView (
   SHELL_STATUS       ShellStatus;\r
   LIST_ENTRY*        Package;\r
   CHAR16*            ProblemParam;\r
-  CONST CHAR16*      Temp;\r
-  CHAR8              ColourOption[8];\r
   SHELL_FILE_HANDLE  TmpDumpFileHandle;\r
 \r
   // Set Defaults\r
@@ -540,18 +538,6 @@ ShellCommandRunAcpiView (
         L"acpiview"\r
         );\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
-    } else if (ShellCommandLineGetFlag (Package, L"-h") &&\r
-               ShellCommandLineGetValue (Package, L"-h") == NULL) {\r
-        ShellPrintHiiEx (\r
-          -1,\r
-          -1,\r
-          NULL,\r
-          STRING_TOKEN (STR_GEN_NO_VALUE),\r
-          gShellAcpiViewHiiHandle,\r
-          L"acpiview",\r
-          L"-h"\r
-          );\r
-        ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else if (ShellCommandLineGetFlag (Package, L"-d") &&\r
                !ShellCommandLineGetFlag (Package, L"-s")) {\r
         ShellPrintHiiEx (\r
@@ -566,18 +552,8 @@ ShellCommandRunAcpiView (
           );\r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
     } else {\r
-      // Check if the colour option is set\r
-      Temp = ShellCommandLineGetValue (Package, L"-h");\r
-      if (Temp != NULL) {\r
-        UnicodeStrToAsciiStrS (Temp, ColourOption, sizeof (ColourOption));\r
-        if ((AsciiStriCmp (ColourOption, "ON") == 0) ||\r
-            (AsciiStriCmp (ColourOption, "TRUE") == 0)) {\r
-          SetColourHighlighting (TRUE);\r
-        } else if ((AsciiStriCmp (ColourOption, "OFF") == 0) ||\r
-                   (AsciiStriCmp (ColourOption, "FALSE") == 0)) {\r
-          SetColourHighlighting (FALSE);\r
-        }\r
-      }\r
+      // Turn on colour highlighting if requested\r
+      SetColourHighlighting (ShellCommandLineGetFlag (Package, L"-h"));\r
 \r
       // Surpress consistency checking if requested\r
       SetConsistencyChecking (!ShellCommandLineGetFlag (Package, L"-q"));\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.uni b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.uni
index 0d10b5debe470cb096cf414d0a0144fd3bde03ee..1f07b7ae20d474be67a433ff3774a508a5289318 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.uni
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.uni
@@ -30,7 +30,7 @@
 "Display ACPI Table information.\r\n"\r
 ".SH SYNOPSIS\r\n"\r
 " \r\n"\r
-"ACPIVIEW [[-?] | [[-l] | [-s AcpiTable [-d]]] [-q] [-h Highlight]]\r\n"\r
+"ACPIVIEW [[-?] | [[-l] | [-s AcpiTable [-d]]] [-q] [-h]]\r\n"\r
 " \r\n"\r
 ".SH OPTIONS\r\n"\r
 " \r\n"\r
@@ -40,9 +40,7 @@
 "         AcpiTable    : The required ACPI Table type.\r\n"\r
 "  -d - Generate a binary file dump of the specified AcpiTable.\r\n"\r
 "  -q - Quiet. Suppress errors and warnings. Disables consistency checks.\r\n"\r
-"  -h - Enable/Disable Colour Highlighting.\r\n"\r
-"         Highlight    : TRUE/ON enables highlighting;\r\n"\r
-"                        FALSE/OFF (default) disables highlighting.\r\n"\r
+"  -h - Enable colour highlighting.\r\n"\r
 "  -? - Show help.\r\n"\r
 " \r\n"\r
 ".SH DESCRIPTION\r\n"\r