vendor/acpica/20150515

1 files changed, 28 insertions, 6 deletions

diff --git a/source/tools/acpihelp/ahmain.c b/source/tools/acpihelp/ahmain.c
index 7f658120e30a..0416eec74e3e 100644
--- a/source/tools/acpihelp/ahmain.c
+++ b/source/tools/acpihelp/ahmain.c
@@ -51,7 +51,7 @@ AhDisplayUsage (
     void);
 
 #define AH_UTILITY_NAME             "ACPI Help Utility"
-#define AH_SUPPORTED_OPTIONS        "aehikmopsuv"
+#define AH_SUPPORTED_OPTIONS        "adehikmopstuv"
 
 
 /******************************************************************************
@@ -75,6 +75,10 @@ AhDisplayUsage (
     ACPI_OPTION ("-a [Name/Prefix]",        "Find/Display both ASL operator and AML opcode name(s)");
     ACPI_OPTION ("-m [Name/Prefix]",        "Find/Display AML opcode name(s)");
 
+    ACPI_USAGE_TEXT ("\nACPI Values:\n");
+    ACPI_OPTION ("-e [HexValue]",           "Decode ACPICA exception code");
+    ACPI_OPTION ("-o [HexValue]",           "Decode hex AML opcode");
+
     ACPI_USAGE_TEXT ("\nASL (ACPI Source Language) Names and Symbols:\n");
     ACPI_OPTION ("-k [Name/Prefix]",        "Find/Display ASL non-operator keyword(s)");
     ACPI_OPTION ("-p [Name/Prefix]",        "Find/Display ASL predefined method name(s)");
@@ -82,12 +86,10 @@ AhDisplayUsage (
 
     ACPI_USAGE_TEXT ("\nOther ACPI Names:\n");
     ACPI_OPTION ("-i [Name/Prefix]",        "Find/Display ACPI/PNP Hardware ID(s)");
+    ACPI_OPTION ("-d",                      "Display iASL Preprocessor directives");
+    ACPI_OPTION ("-t",                      "Display supported ACPI tables");
     ACPI_OPTION ("-u",                      "Display ACPI-related UUIDs");
 
-    ACPI_USAGE_TEXT ("\nACPI Values:\n");
-    ACPI_OPTION ("-e [HexValue]",           "Decode ACPICA exception code");
-    ACPI_OPTION ("-o [HexValue]",           "Decode hex AML opcode");
-
     ACPI_USAGE_TEXT ("\nName/Prefix or HexValue not specified means \"Display All\"\n");
     ACPI_USAGE_TEXT ("\nDefault search with valid Name/Prefix and no options:\n");
     ACPI_USAGE_TEXT ("    Find ASL/AML operator names - if NamePrefix does not start with underscore\n");
@@ -133,6 +135,11 @@ main (
         DecodeType = AH_DECODE_ASL_AML;
         break;
 
+    case 'd':
+
+        DecodeType = AH_DISPLAY_DIRECTIVES;
+        break;
+
     case 'e':
 
         DecodeType = AH_DECODE_EXCEPTION;
@@ -168,6 +175,11 @@ main (
         DecodeType = AH_DECODE_ASL;
         break;
 
+    case 't':
+
+        DecodeType = AH_DISPLAY_TABLES;
+        break;
+
     case 'u':
 
         DecodeType = AH_DISPLAY_UUIDS;
@@ -235,7 +247,17 @@ main (
         AhDisplayUuids ();
         break;
 
-    default:
+    case AH_DISPLAY_TABLES:
+
+        AhDisplayTables ();
+        break;
+
+    case AH_DISPLAY_DIRECTIVES:
+
+        AhDisplayDirectives ();
+        break;
+
+   default:
 
         if (!Name)
         {