diff options
| author | Robert Moore <robert.moore@intel.com> | 2011-11-09 19:23:13 +0800 |
|---|---|---|
| committer | Lin Ming <ming.m.lin@intel.com> | 2011-11-10 10:10:23 +0800 |
| commit | 3075e9a7c11361633b6ebc15bfd696e0cd5aff74 (patch) | |
| tree | eb8ccf6a8ca1d6a0741bd238189f11a8276da086 /source/compiler/aslcompiler.y | |
| parent | 62b4cf70302e3ab611bf9c62defdc1a8c5e5cd83 (diff) | |
| download | acpica-3075e9a7c11361633b6ebc15bfd696e0cd5aff74.tar.gz | |
ACPI 5.0/iASL: Update to new RawDataBuffer object.
Changed from simple DataBuffer. Also migrate all VendorData generation
to a single function.
Diffstat (limited to 'source/compiler/aslcompiler.y')
| -rw-r--r-- | source/compiler/aslcompiler.y | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/compiler/aslcompiler.y b/source/compiler/aslcompiler.y index 7ed215d39..a07066c95 100644 --- a/source/compiler/aslcompiler.y +++ b/source/compiler/aslcompiler.y @@ -853,6 +853,7 @@ void * AslLocalAllocate (unsigned int Size); %type <n> OptionalFlowControl %type <n> OptionalDevicePolarity %type <n> OptionalBuffer_Last +%type <n> OptionalWordConst %type <n> TermArgItem %type <n> NameStringItem @@ -2619,9 +2620,16 @@ BufferTermData | StringData {} ; +OptionalWordConst + : {$$ = NULL;} + | WordConst {$$ = $1;} + ; + DataBufferTerm - : PARSEOP_DATABUFFER '{' {$<n>$ = TrCreateLeafNode (PARSEOP_DATABUFFER);} - ByteList '}' {$$ = TrLinkChildren ($<n>3,1,$4);} + : PARSEOP_DATABUFFER '(' {$<n>$ = TrCreateLeafNode (PARSEOP_DATABUFFER);} + OptionalWordConst + ')' '{' + ByteList '}' {$$ = TrLinkChildren ($<n>3,2,$4,$7);} | PARSEOP_DATABUFFER '(' error ')' {$$ = AslDoError(); yyclearin;} ; |