diff options
Diffstat (limited to 'source/tools/acpihelp/ahmain.c')
| -rw-r--r-- | source/tools/acpihelp/ahmain.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/source/tools/acpihelp/ahmain.c b/source/tools/acpihelp/ahmain.c index a34059802838..9be1f3b830b9 100644 --- a/source/tools/acpihelp/ahmain.c +++ b/source/tools/acpihelp/ahmain.c @@ -71,26 +71,26 @@ AhDisplayUsage ( ACPI_OPTION ("-h", "Display help"); ACPI_OPTION ("-v", "Display version information"); - printf ("\nAML (ACPI Machine Language) Names and Encodings:\n"); + ACPI_USAGE_TEXT ("\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_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)"); ACPI_OPTION ("-s [Name/Prefix]", "Find/Display ASL operator name(s)"); - printf ("\nOther ACPI Names:\n"); + ACPI_USAGE_TEXT ("\nOther ACPI Names:\n"); ACPI_OPTION ("-i [Name/Prefix]", "Find/Display ACPI/PNP Hardware ID(s)"); - printf ("\nACPI Values:\n"); + ACPI_USAGE_TEXT ("\nACPI Values:\n"); ACPI_OPTION ("-e [HexValue]", "Decode ACPICA exception code"); ACPI_OPTION ("-o [HexValue]", "Decode hex AML opcode"); - 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"); + 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"); + ACPI_USAGE_TEXT (" Find ASL predefined method names - if NamePrefix starts with underscore\n"); } @@ -112,6 +112,7 @@ main ( int j; + AcpiOsInitialize (); ACPI_DEBUG_INITIALIZE (); /* For debug version only */ printf (ACPI_COMMON_SIGNON (AH_UTILITY_NAME)); DecodeType = AH_DECODE_DEFAULT; @@ -124,7 +125,7 @@ main ( /* Command line options */ - while ((j = AcpiGetopt (argc, argv, AH_SUPPORTED_OPTIONS)) != EOF) switch (j) + while ((j = AcpiGetopt (argc, argv, AH_SUPPORTED_OPTIONS)) != ACPI_OPT_END) switch (j) { case 'a': |