diff options
| author | Erik Schmauss <erik.schmauss@intel.com> | 2017-07-21 16:56:48 -0700 |
|---|---|---|
| committer | Erik Schmauss <erik.schmauss@intel.com> | 2017-07-21 17:01:45 -0700 |
| commit | e5bbb5455f7129916678a041d3a17015df13334e (patch) | |
| tree | b0a7f18e569c587fcf0a23e02d0a1de7b609e32f /tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/Exc.asl | |
| parent | be18b4ea0507270d037243c968f510635a331e5a (diff) | |
| download | acpica-e5bbb5455f7129916678a041d3a17015df13334e.tar.gz | |
ASLTS: resolving conflict from rebasing
Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Diffstat (limited to 'tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/Exc.asl')
| -rw-r--r-- | tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/Exc.asl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/Exc.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/Exc.asl index 925787470..61d14faf3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/Exc.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0153/Exc.asl @@ -39,9 +39,9 @@ Method(md01,, Serialized) Name(pppp, Package(1){Buffer() {1,2,3,4}}) Name(i000, 0x5678) - CH03("", 0, 0x000, 0, 0) + CH03("", 0, 0x000, __LINE__, 0) Store(pppp, i000) - CH04("", 0, 47, 0, 0x001, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 0, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } // Package --> String @@ -51,9 +51,9 @@ Method(md02,, Serialized) Name(pppp, Package(1){Buffer() {1,2,3,4}}) Name(s000, "String") - CH03("", 0, 0x002, 0, 0) + CH03("", 0, 0x002, __LINE__, 0) Store(pppp, s000) - CH04("", 0, 47, 0, 0x003, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 0, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } // Package --> Buffer @@ -63,16 +63,16 @@ Method(md03,, Serialized) Name(pppp, Package(1){Buffer() {1,2,3,4}}) Name(b000, Buffer() {1,2,3,4}) - CH03("", 0, 0x004, 0, 0) + CH03("", 0, 0x004, __LINE__, 0) Store(pppp, b000) - CH04("", 0, 47, 0, 0x005, 0, 0) // AE_AML_OPERAND_TYPE + CH04("", 0, 47, 0, __LINE__, 0, 0) // AE_AML_OPERAND_TYPE } Method(md04) { - CH03("", 0, 0xf00, 0, 0) + CH03("", 0, 0xf00, __LINE__, 0) md01() md02() md03() - CH03("", 0, 0xf01, 0, 0) + CH03("", 0, 0xf01, __LINE__, 0) } |