mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-01-13 21:09:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

AcpiHelp: Display expanded keyword info for all ASL operators.

Browse Source 
For any and all keywords associated with an ASL operator, display
the keyword info -- all possible values for the keyword.
This commit is contained in:
Robert Moore 2011-10-07 14:32:19 -07:00
parent cf5fef749b
commit b2be089f21
4 changed files with 105 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/tools/acpihelp/acpihelp.h
View File

@ -126,6 +126,7 @@
#include <sys/types.h>
#include <fcntl.h>
#include <ctype.h>
#include <string.h>
#ifdef WIN32
#include <io.h>
#include <direct.h>

2
source/tools/acpihelp/ahaslkey.c
View File

@ -139,7 +139,7 @@ const AH_ASL_KEYWORD AslKeywordInfo[] =
":= Compatibility | TypeA | TypeB | TypeF"},
{"InterruptTypeKeyword", "Interrupt Types",
":= Edge | Level"},
{"InterruptLevel", "Interrupt Active Types",
{"InterruptLevelKeyword", "Interrupt Active Types",
":= ActiveHigh | ActiveLow"},
{"IODecodeKeyword", "I/O Decoding - IO Resource Descriptor",
":= Decode16 | Decode10"},

76
source/tools/acpihelp/ahaslops.c
View File

@ -122,7 +122,7 @@
*/
const AH_ASL_OPERATOR AslOperatorInfo[] =
{
{"AccessAs", "(AccessType, AccessAttibute)",
{"AccessAs", "(AccessType, AccessAttribKeyword)",
"ChangeFieldUnitAccess"},
{"Acquire", "(SyncObject, TimeoutValue) => Boolean",
"Acquire a mutex"},
@ -134,7 +134,7 @@ const AH_ASL_OPERATOR AslOperatorInfo[] =
"Integer Bitwise And"},
{"Arg", "Arg0 - Arg6",
"Method argument data objects"},
{"BankField", "(RegionName, BankName, BankValue, AccessType, LockRule, UpdateRule) {FieldUnitList}",
{"BankField", "(RegionName, BankName, BankValue, AccessTypeKeyword, LockRuleKeyword, UpdateRuleKeyword) {FieldUnitList}",
"Declare fields in a banked configuration object"},
{"Break", NULL,
"Continue following the innermost enclosing While"},
@ -182,18 +182,18 @@ const AH_ASL_OPERATOR AslOperatorInfo[] =
"Declare a bus/device object"},
{"Divide", "(Dividend, Divisor, Remainder, Result) => Integer",
"Integer Divide"},
{"DMA", "(DmaType, IsBusMaster, DmaTransferSize, DescriptorName) {DmaChannelList} => Buffer",
{"DMA", "(DmaTypeKeyword, BusMasterKeyword, XferTypeKeyword, DescriptorName) {DmaChannelList} => Buffer",
"DMA Resource Descriptor macro"},
{"DWordIO", "(ResourceUsage, IsMinFixed, IsMaxFixed, Decode, ISARanges, AddressGranularity, "
{"DWordIO", "(ResourceTypeKeyword, MinKeyword, MaxKeyword, DecodeKeyword, RangeTypeKeyword, AddressGranularity, "
"AddressMinimum, AddressMaximum, AddressTranslation, RangeLength, ResourceSourceIndex, "
"ResourceSource, DescriptorName, TranslationType, TranslationDensity)",
"ResourceSource, DescriptorName, TypeKeyword, TranslationKeyword)",
"DWord IO Resource Descriptor macro"},
{"DWordMemory", "(ResourceUsage, Decode, IsMinFixed, IsMaxFixed, Cacheable, ReadAndWrite, "
{"DWordMemory", "(ResourceTypeKeyword, DecodeKeyword, MinKeyword, MaxKeyword, MemTypeKeyword, ReadWriteKeyword, "
"AddressGranularity, AddressMinimum, AddressMaximum, AddressTranslation, "
"RangeLength, ResourceSourceIndex, ResourceSource, DescriptorName, MemoryType, "
"TranslationType)",
"RangeLength, ResourceSourceIndex, ResourceSource, DescriptorName, AddressKeyword, "
"TypeKeyword)",
"DWord Memory Resource Descriptor macro"},
{"DWordSpace", "(ResourceType, ResourceUsage, Decode, IsMinFixed, IsMaxFixed, TypeSpecificFlags, "
{"DWordSpace", "(ResourceType, ResourceTypeKeyword, DecodeKeyword, MinKeyword, MaxKeyword, TypeSpecificFlags, "
"AddressGranularity, AddressMinimum, AddressMaximum, AddressTranslation, RangeLength, "
"ResourceSourceIndex, ResourceSource, DescriptorName)",
"DWord Space Resource Descriptor macro"},
@ -207,23 +207,23 @@ const AH_ASL_OPERATOR AslOperatorInfo[] =
"End Dependent Function Resource Descriptor macro"},
{"Event", "(EventName)",
"Declare an event synchronization object"},
{"ExtendedIO", "(ResourceUsage, IsMinFixed, IsMaxFixed, Decode, ISARanges, AddressGranularity, "
{"ExtendedIO", "(ResourceTypeKeyword, MinKeyword, MaxKeyword, DecodeKeyword, RangeTypeKeyword, AddressGranularity, "
"AddressMinimum, AddressMaximum, AddressTranslation, RangeLength, "
"TypeSpecificAttributes, DescriptorName, TranslationType, TranslationDensity)",
"TypeSpecificAttributes, DescriptorName, TypeKeyword, TranslationKeyword)",
"Extended IO Resource Descriptor macro"},
{"ExtendedMemory", "(ResourceUsage, Decode, IsMinFixed, IsMaxFixed, Cacheable, ReadAndWrite, "
{"ExtendedMemory", "(ResourceTypeKeyword, DecodeKeyword, MinKeyword, MaxKeyword, MemTypeKeyword, ReadWriteKeyword, "
"AddressGranularity, AddressMinimum, AddressMaximum, AddressTranslation, "
"RangeLength, TypeSpecificAttributes, DescriptorName, MemoryType, TranslationType)",
"RangeLength, TypeSpecificAttributes, DescriptorName, AddressKeyword, TypeKeyword)",
"Extended Memory Resource Descriptor macro"},
{"ExtendedSpace", "(ResourceType, ResourceUsage, Decode, IsMinFixed, IsMaxFixed, TypeSpecificFlags, "
{"ExtendedSpace", "(ResourceType, ResourceTypeKeyword, DecodeKeyword, MinKeyword, MaxKeyword, TypeSpecificFlags, "
"AddressGranularity, AddressMinimum, AddressMaximum, AddressTranslation, "
"RangeLength, TypeSpecificAttributes, DescriptorName)",
"Extended Space Resource Descriptor macro"},
{"External", "(ObjectName, ObjectType, ReturnType, ParameterTypes)",
{"External", "(ObjectName, ObjectTypeKeyword, ReturnType, ParameterTypes)",
"Declare external objects"},
{"Fatal", "(Type, Code, Arg)",
"Fatal error check"},
{"Field", "(RegionName, AccessType, LockRule, UpdateRule) {FieldUnitList}",
{"Field", "(RegionName, AccessTypeKeyword, LockRuleKeyword, UpdateRuleKeyword) {FieldUnitList}",
"Declare fields of an operation region object"},
{"FindSetLeftBit", "(Source, Result) => Integer",
"Index of first least significant bit set"},
@ -243,14 +243,14 @@ const AH_ASL_OPERATOR AslOperatorInfo[] =
"Increment a Integer"},
{"Index", "(Source, Index, Destination) => ObjectReference",
"Indexed Reference to member object"},
{"IndexField", "(IndexName, DataName, AccessType, LockRule, UpdateRule) {FieldUnitList}",
{"IndexField", "(IndexName, DataName, AccessTypeKeyword, LockRuleKeyword, UpdateRuleKeyword) {FieldUnitList}",
"Declare Index/Data Fields"},
{"Interrupt", "(ResourceUsage, EdgeLevel, ActiveLevel, Shared, ResourceSourceIndex, "
{"Interrupt", "(ResourceTypeKeyword, InterruptTypeKeyword, InterruptLevelKeyword, ShareTypeKeyword, ResourceSourceIndex, "
"ResourceSource, DescriptorName) {InterruptList} => Buffer",
"Interrupt Resource Descriptor macro"},
{"IO", "(Decode, AddressMin, AddressMax, AddressAlignment, RangeLength, DescriptorName) => Buffer",
{"IO", "(IODecodeKeyword, AddressMin, AddressMax, AddressAlignment, RangeLength, DescriptorName) => Buffer",
"IO Resource Descriptor macro"},
{"IRQ", "(EdgeLevel, ActiveLevel, Shared, DescriptorName) {InterruptList} => Buffer",
{"IRQ", "(InterruptTypeKeyword, InterruptLevelKeyword, ShareTypeKeyword, DescriptorName) {InterruptList} => Buffer",
"Interrupt Resource Descriptor macro"},
{"IRQNoFlags", "(DescriptorName) {InterruptList} => Buffer",
"Short Interrupt Resource Descriptor macro"},
@ -279,17 +279,17 @@ const AH_ASL_OPERATOR AslOperatorInfo[] =
"Method local data objects"},
{"LOr", "(Source1, Source2) => Boolean",
"Logical Or"},
{"Match", "(SearchPackage, Op1, MatchObject1, Op2, MatchObject2, StartIndex) => Ones | Integer",
{"Match", "(SearchPackage, MatchOpKeyword, MatchObject1, MatchOpKeyword, MatchObject2, StartIndex) => Ones | Integer",
"Search for match in package array"},
{"Memory24", "(ReadAndWrite, AddressMinimum, AddressMaximum, AddressAlignment, "
{"Memory24", "(ReadWriteKeyword, AddressMinimum, AddressMaximum, AddressAlignment, "
"RangeLength, DescriptorName)",
"Memory Resource Descriptor macro"},
{"Memory32", "(ReadAndWrite, AddressMinimum, AddressMaximum, AddressAlignment, "
{"Memory32", "(ReadWriteKeyword, AddressMinimum, AddressMaximum, AddressAlignment, "
"RangeLength, DescriptorName)",
"Memory Resource Descriptor macro"},
{"Memory32Fixed", "(ReadAndWrite, AddressBase, RangeLength, DescriptorName)",
{"Memory32Fixed", "(ReadWriteKeyword, AddressBase, RangeLength, DescriptorName)",
"Memory Resource Descriptor macro"},
{"Method", "(MethodName, NumArgs, SerializeRule, SyncLevel, ReturnType, ParameterTypes) "
{"Method", "(MethodName, NumArgs, SerializeRuleKeyword, SyncLevel, ReturnType, ParameterTypes) "
"{TermList}",
"Declare a control method"},
{"Mid", "(Source, Index, Length, Result) => Buffer or String",
@ -320,7 +320,7 @@ const AH_ASL_OPERATOR AslOperatorInfo[] =
"Constant One Object (1)"},
{"Ones", "=> Integer",
"Constant Ones Object (-1)"},
{"OperationRegion", "(RegionName, RegionSpace, Offset, Length)",
{"OperationRegion", "(RegionName, RegionSpaceKeyword, Offset, Length)",
"Declare an operational region"},
{"Or", "(Source1, Source2, Result) => Integer",
"Integer Bitwise Or"},
@ -330,17 +330,17 @@ const AH_ASL_OPERATOR AslOperatorInfo[] =
"Declare a power resource object"},
{"Processor", "(ProcessorName, ProcessorID, PBlockAddress, PblockLength) {ObjectList}",
"Declare a processor package"},
{"QWordIO", "(ResourceUsage, IsMinFixed, IsMaxFixed, Decode, ISARanges, AddressGranularity, "
{"QWordIO", "(ResourceTypeKeyword, MinKeyword, MaxKeyword, DecodeKeyword, RangeTypeKeyword, AddressGranularity, "
"AddressMinimum, AddressMaximum, AddressTranslation, RangeLength, "
"ResourceSourceIndex, ResourceSource, DescriptorName, TranslationType, "
"TranslationDensity)",
"ResourceSourceIndex, ResourceSource, DescriptorName, TypeKeyword, "
"TranslationKeyword)",
"QWord IO Resource Descriptor macro"},
{"QWordMemory", "(ResourceUsage, Decode, IsMinFixed, IsMaxFixed, Cacheable, ReadAndWrite, "
{"QWordMemory", "(ResourceTypeKeyword, DecodeKeyword, MinKeyword, MaxKeyword, MemTypeKeyword, ReadWriteKeyword, "
"AddressGranularity, AddressMinimum, AddressMaximum, AddressTranslation, "
"RangeLength, ResourceSourceIndex, ResourceSource, DescriptorName, MemoryType, "
"TranslationType)",
"RangeLength, ResourceSourceIndex, ResourceSource, DescriptorName, AddressKeyword, "
"TypeKeyword)",
"QWord Memory Resource Descriptor macro"},
{"QWordSpace", "(ResourceType, ResourceUsage, Decode, IsMinFixed, IsMaxFixed, TypeSpecificFlags, "
{"QWordSpace", "(ResourceType, ResourceTypeKeyword, DecodeKeyword, MinKeyword, MaxKeyword, TypeSpecificFlags, "
"AddressGranularity, AddressMinimum, AddressMaximum, AddressTranslation, "
"RangeLength, ResourceSourceIndex, ResourceSource, DescriptorName)",
"Qword Space Resource Descriptor macro"},
@ -413,16 +413,16 @@ const AH_ASL_OPERATOR AslOperatorInfo[] =
"Wait on an Event"},
{"While", "(Predicate) {TermList}",
"Conditional loop"},
{"WordBusNumber", "(ResourceUsage, IsMinFixed, IsMaxFixed, Decode, AddressGranularity, AddressMinimum, "
{"WordBusNumber", "(ResourceTypeKeyword, MinKeyword, MaxKeyword, DecodeKeyword, AddressGranularity, AddressMinimum, "
"AddressMaximum, AddressTranslation, RangeLength, ResourceSourceIndex, "
"ResourceSource, DescriptorName)",
"Word Bus number Resource Descriptor macro"},
{"WordIO", "(ResourceUsage, IsMinFixed, IsMaxFixed, Decode, ISARanges, AddressGranularity, "
{"WordIO", "(ResourceTypeKeyword, MinKeyword, MaxKeyword, DecodeKeyword, RangeTypeKeyword, AddressGranularity, "
"AddressMinimum, AddressMaximum, AddressTranslation, RangeLength, "
"ResourceSourceIndex, ResourceSource, DescriptorName, TranslationType, "
"TranslationDensity)",
"ResourceSourceIndex, ResourceSource, DescriptorName, TypeKeyword, "
"TranslationKeyword)",
"Word IO Resource Descriptor macro"},
{"WordSpace", "(ResourceType, ResourceUsage, Decode, IsMinFixed, IsMaxFixed, TypeSpecificFlags, "
{"WordSpace", "(ResourceType, ResourceTypeKeyword, DecodeKeyword, MinKeyword, MaxKeyword, TypeSpecificFlags, "
"AddressGranularity, AddressMinimum, AddressMaximum, AddressTranslation, "
"RangeLength, ResourceSourceIndex, ResourceSource, DescriptorName)",
"Word Space Resource Descriptor macro"},

66
source/tools/acpihelp/ahdecode.c
View File

@ -118,7 +118,11 @@
#define ACPI_CREATE_PREDEFINED_TABLE
#include "acpredef.h"
static char Gbl_Buffer[64];
#define BUFFER_LENGTH 128
#define LINE_BUFFER_LENGTH 512
static char Gbl_Buffer[BUFFER_LENGTH];
static char Gbl_LineBuffer[LINE_BUFFER_LENGTH];
static const char *AcpiRtypeNames[] =
{
"/Integer",
@ -153,6 +157,10 @@ static void
AhDisplayAslOperator (
const AH_ASL_OPERATOR *Op);
static void
AhDisplayOperatorKeywords (
const AH_ASL_OPERATOR *Op);
static void
AhDisplayAslKeyword (
const AH_ASL_KEYWORD *Op);
@ -728,6 +736,62 @@ AhDisplayAslOperator (
AhPrintOneField (18, 0, AH_MAX_ASL_LINE_LENGTH, Op->Syntax);
printf ("\n");
AhDisplayOperatorKeywords (Op);
printf ("\n");
}
/*******************************************************************************
*
* FUNCTION: AhDisplayOperatorKeywords
*
* PARAMETERS: Op - Pointer to ASL keyword with syntax info
*
* RETURN: None
*
* DESCRIPTION: Display any/all keywords that are associated with the ASL
* operator.
*
******************************************************************************/
static void
AhDisplayOperatorKeywords (
const AH_ASL_OPERATOR *Op)
{
char *Token;
char *Separators = "(){}, ";
BOOLEAN FirstKeyword = TRUE;
if (!Op || !Op->Syntax)
{
return;
}
/*
* Find all parameters that have the word "keyword" within, and then
* display the info about that keyword
*/
strcpy (Gbl_LineBuffer, Op->Syntax);
Token = strtok (Gbl_LineBuffer, Separators);
while (Token)
{
if (strstr (Token, "Keyword"))
{
if (FirstKeyword)
{
printf ("\n");
FirstKeyword = FALSE;
}
/* Found a keyword, display keyword information */
AhFindAslKeywords (Token);
}
Token = strtok (NULL, Separators);
}
}