diff options
Diffstat (limited to 'source/tools/acpihelp/ahmain.c')
| -rw-r--r-- | source/tools/acpihelp/ahmain.c | 41 |
1 files changed, 28 insertions, 13 deletions
diff --git a/source/tools/acpihelp/ahmain.c b/source/tools/acpihelp/ahmain.c index 1a8de1e4bade6..a340598028386 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 "ehikmopsv" +#define AH_SUPPORTED_OPTIONS "aehikmopsv" /****************************************************************************** @@ -67,24 +67,29 @@ AhDisplayUsage ( void) { - ACPI_USAGE_HEADER ("acpihelp <options> [NamePrefix | HexValue]"); + ACPI_USAGE_HEADER ("acpihelp <options> [Name/Prefix | HexValue]"); ACPI_OPTION ("-h", "Display help"); ACPI_OPTION ("-v", "Display version information"); - printf ("\nACPI Names and Symbols:\n"); - ACPI_OPTION ("-k [NamePrefix]", "Find/Display ASL non-operator keyword(s)"); - ACPI_OPTION ("-m [NamePrefix]", "Find/Display AML opcode name(s)"); - ACPI_OPTION ("-p [NamePrefix]", "Find/Display ASL predefined method name(s)"); - ACPI_OPTION ("-s [NamePrefix]", "Find/Display ASL operator name(s)"); + printf ("\nAML (ACPI Machine Language) Names and Encodings:\n"); + 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)"); + + printf ("\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)"); + ACPI_OPTION ("-s [Name/Prefix]", "Find/Display ASL operator name(s)"); + + printf ("\nOther ACPI Names:\n"); + ACPI_OPTION ("-i [Name/Prefix]", "Find/Display ACPI/PNP Hardware ID(s)"); printf ("\nACPI Values:\n"); ACPI_OPTION ("-e [HexValue]", "Decode ACPICA exception code"); - ACPI_OPTION ("-i", "Display known ACPI Device IDs (_HID)"); ACPI_OPTION ("-o [HexValue]", "Decode hex AML opcode"); - printf ("\nNamePrefix/HexValue not specified means \"Display All\"\n"); - printf ("\nDefault search with NamePrefix and no options:\n"); - printf (" Find ASL operator names - if NamePrefix does not start with underscore\n"); + printf ("\nName/Prefix or HexValue not specified means \"Display All\"\n"); + printf ("\nDefault search with valid Name/Prefix and no options:\n"); + printf (" Find ASL/AML operator names - if NamePrefix does not start with underscore\n"); printf (" Find ASL predefined method names - if NamePrefix starts with underscore\n"); } @@ -121,6 +126,11 @@ main ( while ((j = AcpiGetopt (argc, argv, AH_SUPPORTED_OPTIONS)) != EOF) switch (j) { + case 'a': + + DecodeType = AH_DECODE_ASL_AML; + break; + case 'e': DecodeType = AH_DECODE_EXCEPTION; @@ -173,6 +183,11 @@ main ( switch (DecodeType) { + case AH_DECODE_ASL_AML: + + AhFindAslAndAmlOperators (Name); + break; + case AH_DECODE_AML: AhFindAmlOpcode (Name); @@ -200,7 +215,7 @@ main ( case AH_DISPLAY_DEVICE_IDS: - AhDisplayDeviceIds (); + AhDisplayDeviceIds (Name); break; case AH_DECODE_EXCEPTION: @@ -222,7 +237,7 @@ main ( } else { - AhFindAslOperators (Name); + AhFindAslAndAmlOperators (Name); } break; } |