diff options
Diffstat (limited to 'source/tools/acpihelp')
| -rw-r--r-- | source/tools/acpihelp/ahamlops.c | 16 | ||||
| -rw-r--r-- | source/tools/acpihelp/ahaslops.c | 22 |
2 files changed, 19 insertions, 19 deletions
diff --git a/source/tools/acpihelp/ahamlops.c b/source/tools/acpihelp/ahamlops.c index 70863e4ebd92..8ca28728c572 100644 --- a/source/tools/acpihelp/ahamlops.c +++ b/source/tools/acpihelp/ahamlops.c @@ -147,14 +147,14 @@ const AH_AML_OPCODE AmlOpcodeInfo[] = "DefOpRegion := OpRegionOp NameString RegionSpace RegionOffset RegionLen"}, {0x5B81, 0x5B81, "0x5B81", "FieldOp", "TermObject", "NameString ByteData", "FieldList", "DefField := FieldOp PkgLength NameString FieldFlags FieldList"}, - {0x5B82, 0x5B82, "0x5B82", "DeviceOp", "TermObject", "NameString", "ObjectList", - "DefDevice := DeviceOp PkgLength NameString ObjectList"}, - {0x5B83, 0x5B83, "0x5B83", "ProcessorOp", "TermObject", "NameString ByteData DWordData ByteData", "ObjectList", - "DefProcessor := ProcessorOp PkgLength NameString ProcId PblkAddr PblkLen ObjectList"}, - {0x5B84, 0x5B84, "0x5B84", "PowerResOp", "TermObject", "NameString ByteData WordData", "ObjectList", - "DefPowerRes := PowerResOp PkgLength NameString SystemLevel ResourceOrder ObjectList"}, - {0x5B85, 0x5B85, "0x5B85", "ThermalZoneOp", "TermObject", "NameString", "ObjectList", - "DefThermalZone := ThermalZoneOp PkgLength NameString ObjectList"}, + {0x5B82, 0x5B82, "0x5B82", "DeviceOp", "TermObject", "NameString", "TermList", + "DefDevice := DeviceOp PkgLength NameString TermList"}, + {0x5B83, 0x5B83, "0x5B83", "ProcessorOp", "TermObject", "NameString ByteData DWordData ByteData", "TermList", + "DefProcessor := ProcessorOp PkgLength NameString ProcId PblkAddr PblkLen TermList"}, + {0x5B84, 0x5B84, "0x5B84", "PowerResOp", "TermObject", "NameString ByteData WordData", "TermList", + "DefPowerRes := PowerResOp PkgLength NameString SystemLevel ResourceOrder TermList"}, + {0x5B85, 0x5B85, "0x5B85", "ThermalZoneOp", "TermObject", "NameString", "TermList", + "DefThermalZone := ThermalZoneOp PkgLength NameString TermList"}, {0x5B86, 0x5B86, "0x5B86", "IndexFieldOp", "TermObject", "NameString NameString ByteData", "FieldList", "DefIndexField := IndexFieldOp PkgLength NameString NameString FieldFlags FieldList"}, {0x5B87, 0x5B87, "0x5B87", "BankFieldOp", "TermObject", "NameString NameString TermArg ByteData", "FieldList", diff --git a/source/tools/acpihelp/ahaslops.c b/source/tools/acpihelp/ahaslops.c index 9fcca7d1ca28..39abc31b44f5 100644 --- a/source/tools/acpihelp/ahaslops.c +++ b/source/tools/acpihelp/ahaslops.c @@ -112,7 +112,7 @@ const AH_ASL_OPERATOR AslOperatorInfo[] = "Declare a Definition Block"}, {"DerefOf", "(Source) => Object", "Dereference an object reference"}, - {"Device", "(DeviceName) {ObjectList}", + {"Device", "(DeviceName) {TermList}", "Declare a bus/device object"}, {"Divide", "(Dividend, Divisor, Remainder, Result) => Integer", "Integer Divide"}, @@ -193,9 +193,9 @@ const AH_ASL_OPERATOR AslOperatorInfo[] = "ResourceSourceIndex, ResourceTypeKeyword, DescriptorName, " "RawDataBuffer() {VendorData}) {PinList}", "GPIO I/O Connection Resource Descriptor Macro"}, - {"I2cSerialBus", "(SlaveAddress, SlaveModeKeyword, ConnectionSpeed, " + {"I2cSerialBusV2", "(SlaveAddress, SlaveModeKeyword, ConnectionSpeed, " "AddressingModeKeyword, ResourceSource, " - "ResourceSourceIndex, ResourceTypeKeyword, DescriptorName, " + "ResourceSourceIndex, ResourceTypeKeyword, DescriptorName, Shared, " "RawDataBuffer() {VendorData})", "I2C Serial Bus Connection Resource Descriptor Macro"}, {"If", "(Predicate) {TermList}", @@ -295,9 +295,9 @@ const AH_ASL_OPERATOR AslOperatorInfo[] = "Integer Bitwise Or"}, {"Package", "(NumElements) {PackageList} => Package", "Declare a package object"}, - {"PowerResource", "(ResourceName, SystemLevel, ResourceOrder) {ObjectList}", + {"PowerResource", "(ResourceName, SystemLevel, ResourceOrder) {TermList}", "Declare a power resource object"}, - {"Processor", "(ProcessorName, ProcessorID, PBlockAddress, PblockLength) {ObjectList}", + {"Processor", "(ProcessorName, ProcessorID, PBlockAddress, PblockLength) {TermList}", "Declare a processor package"}, {"QWordIo", "(ResourceTypeKeyword, MinKeyword, MaxKeyword, DecodeKeyword, " "RangeTypeKeyword, AddressGranularity, " @@ -335,7 +335,7 @@ const AH_ASL_OPERATOR AslOperatorInfo[] = "Return from method execution"}, {"Revision", "=> Integer", "Constant revision object"}, - {"Scope", "(Location) {ObjectList}", + {"Scope", "(Location) {TermList}", "Open named scope "}, {"ShiftLeft", "(Source, ShiftCount, Result) => Integer", "Integer shift value left"}, @@ -347,11 +347,11 @@ const AH_ASL_OPERATOR AslOperatorInfo[] = "Get the size of a buffer}, string}, or package"}, {"Sleep", "(Milliseconds)", "Sleep n milliseconds (yields the processor)"}, - {"SpiSerialBus", "(DeviceSelection, PolarityKeyword, WireModeKeyword, " + {"SpiSerialBusV2", "(DeviceSelection, PolarityKeyword, WireModeKeyword, " "DataBitLength, SlaveModeKeyword, " "ConnectionSpeed, ClockPolarityKeyword, ClockPhaseKeyword, " "ResourceSource, ResourceSourceIndex, " - "ResourceTypeKeyword, DescriptorName, RawDataBuffer() {VendorData})", + "ResourceTypeKeyword, DescriptorName, Shared, RawDataBuffer() {VendorData})", "SPI Serial Bus Connection Resource Descriptor Macro"}, {"Stall", "(Microseconds)", "Delay n microseconds (does not yield the processor)"}, @@ -365,7 +365,7 @@ const AH_ASL_OPERATOR AslOperatorInfo[] = "Integer Subtract"}, {"Switch", "(Expression) {CaseTermList}", "Select code to execute based on expression value"}, - {"ThermalZone", "(ThermalZoneName) {ObjectList}", + {"ThermalZone", "(ThermalZoneName) {TermList}", "Declare a thermal zone package"}, {"Timer", "=> Integer", "Get 64-bit timer value"}, @@ -383,10 +383,10 @@ const AH_ASL_OPERATOR AslOperatorInfo[] = "Copy ASCII string from buffer"}, {"ToUuid", "(AsciiString) => Buffer", "Convert Ascii string to UUID"}, - {"UartSerialBus", "(ConnectionSpeed, ByteLengthKeyword, StopBitsKeyword, " + {"UartSerialBusV2", "(ConnectionSpeed, ByteLengthKeyword, StopBitsKeyword, " "LinesInUse, EndianKeyword, ParityKeyword, " "FlowControlKeyword, ReceiveBufferSize, TransmitBufferSize, ResourceSource, " - "ResourceSourceIndex, ResourceTypeKeyword, DescriptorName, " + "ResourceSourceIndex, ResourceTypeKeyword, DescriptorName, Shared, " "RawDataBuffer() {VendorData})", "UART Serial Bus Connection Resource Descriptor Macro"}, {"Unicode", "(String) => Buffer", |