diff options
Diffstat (limited to 'tests/aslts/src/runtime')
5 files changed, 4 insertions, 181 deletions
diff --git a/tests/aslts/src/runtime/cntl/common.asl b/tests/aslts/src/runtime/cntl/common.asl index bb0621815..9d6c77452 100644 --- a/tests/aslts/src/runtime/cntl/common.asl +++ b/tests/aslts/src/runtime/cntl/common.asl @@ -1712,7 +1712,6 @@ Name(TFN0, Package() { "ns-fullpath.asl", "scope.asl", "object.asl", - "order.asl", // below are incorrect yet: diff --git a/tests/aslts/src/runtime/collections/functional/module/RUN.asl b/tests/aslts/src/runtime/collections/functional/module/RUN.asl index cbecc6dfd..8a89e9b01 100644 --- a/tests/aslts/src/runtime/collections/functional/module/RUN.asl +++ b/tests/aslts/src/runtime/collections/functional/module/RUN.asl @@ -30,13 +30,7 @@ if (STTT("Module level code execution", TCLF, 14, W01a)) { SRMT("MLS0") MLS0() - SRMT("MLS1") - MLS1() SRMT("MLO0") MLO0() - SRMT("MLO1") - MLO1() - SRMT("MLD0") - MLD0() } FTTT() diff --git a/tests/aslts/src/runtime/collections/functional/module/object.asl b/tests/aslts/src/runtime/collections/functional/module/object.asl index 1e2cc86e9..19857cd80 100644 --- a/tests/aslts/src/runtime/collections/functional/module/object.asl +++ b/tests/aslts/src/runtime/collections/functional/module/object.asl @@ -31,8 +31,8 @@ */ /* - * Verify if Type1Opcode (ex., If) and Type2Opcode (ex., Store) is allowed - * under Device, PowerResource, Processor, or ThermalZone + * Verify if Type1Opcode (ex., If) is allowed under Device, PowerResource, + * Processor, or ThermalZone * * ASL spec state: * 1. DeviceTerm supports ObjectList for ACPI 1.0 ~ ACPI 6.1. @@ -113,68 +113,3 @@ Method(MLO0,, Serialized) err(ts, z181, 3, z181, 3, ml13, 2) } } - -/* Tests for Type2Opcode */ - -Name(ml14, 0) -Name(ml15, 0) -Name(ml16, 0) -Name(ml17, 0) - -Scope(\_SB) -{ - Device(dev1) - { - Store (1, ml14) - if (LEqual(ml14, 1)) { - Store(2, ml14) - } - PowerResource(pr01, 1, 0) - { - Store (1, ml15) - if (LEqual(ml15, 1)) { - Store(2, ml15) - } - } - } -} -Scope(\_PR) -{ - Processor(cpu1, 0, 0xFFFFFFFF, 0) - { - Store (1, ml16) - if (LEqual(ml16, 1)) { - Store(2, ml16) - } - } -} -Scope(\_TZ) -{ - ThermalZone(thz1) - { - Store (1, ml17) - if (LEqual(ml17, 1)) { - Store(2, ml17) - } - } -} - -Method(MLO1,, Serialized) -{ - Name(ts, "MLO1") - - Store("TEST: MLO1 Type2Opcode is executable under objects", Debug) - - if (LNotEqual(ml14, 2)) { - err(ts, z181, 4, z181, 4, ml14, 2) - } - if (LNotEqual(ml15, 2)) { - err(ts, z181, 5, z181, 5, ml15, 2) - } - if (LNotEqual(ml16, 2)) { - err(ts, z181, 6, z181, 6, ml16, 2) - } - if (LNotEqual(ml17, 2)) { - err(ts, z181, 7, z181, 7, ml17, 2) - } -} diff --git a/tests/aslts/src/runtime/collections/functional/module/order.asl b/tests/aslts/src/runtime/collections/functional/module/order.asl deleted file mode 100644 index 0b4380218..000000000 --- a/tests/aslts/src/runtime/collections/functional/module/order.asl +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Some or all of this work - Copyright (c) 2006 - 2016, Intel Corp. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of Intel Corporation nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * Module level execution order - */ - -/* - * Verify if module level opcode is executed right in place. - */ - -Name(z182, 182) - -/* Tests for Type2Opcode order */ - -Name(ml20, 0) -Name(ob01, 0) - -if (CondRefOf(ob01)) -{ - Store(1, ml20) - if (CondRefOf(ob02)) - { - Store(2, ml20) - } -} -Name(ob02, 0) - -Method(MLD0,, Serialized) -{ - Name(ts, "MLD0") - - Store("TEST: MLD0, Type2Opcode is executed right in place", Debug) - - if (LNotEqual(ml20, 1)) { - err(ts, z182, 6, z182, 6, ml20, 1) - } -} diff --git a/tests/aslts/src/runtime/collections/functional/module/scope.asl b/tests/aslts/src/runtime/collections/functional/module/scope.asl index d6835353c..cbe36b850 100644 --- a/tests/aslts/src/runtime/collections/functional/module/scope.asl +++ b/tests/aslts/src/runtime/collections/functional/module/scope.asl @@ -31,8 +31,8 @@ */ /* - * Verify if Type1Opcode (ex., If) and Type2Opcode (ex., Store) is allowed - * under DefinitionBlock or Scope + * Verify if Type1Opcode (ex., If) is allowed under DefinitionBlock or + * Scope * * ASL spec state: * 1. DefinitionBlockTerm supports TermList for ACPI 1.0 ~ 6.0. @@ -89,45 +89,3 @@ Method(MLS0,, Serialized) err(ts, z180, 2, z180, 2, ml02, 2) } } - -/* Tests for Type2Opcode */ - -Name(ml03, 0) -Name(ml04, 0) -Name(ml05, 0) - -Store (1, ml03) -if (LEqual(ml03, 1)) { - Store(2, ml03) -} -Scope(\) -{ - Store (1, ml04) - if (LEqual(ml04, 1)) { - Store(2, ml04) - } -} -Scope(\_SB) -{ - Store (1, ml05) - if (LEqual(ml05, 1)) { - Store(2, ml05) - } -} - -Method(MLS1,, Serialized) -{ - Name(ts, "MLS1") - - Store("TEST: MLS1, Type2Opcode is executable under scopes", Debug) - - if (LNotEqual(ml03, 2)) { - err(ts, z180, 3, z180, 3, ml03, 2) - } - if (LNotEqual(ml04, 2)) { - err(ts, z180, 4, z180, 4, ml04, 2) - } - if (LNotEqual(ml05, 2)) { - err(ts, z180, 5, z180, 5, ml05, 2) - } -} |