ASLTS: converting files to ASL plus with converter

functional/control test case has been left unconverted for
readability of deeply nested control statements (if, switch, while)

Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>

3 files changed, 187 insertions, 194 deletions

diff --git a/tests/aslts/src/runtime/collections/complex/provoke/MAIN.asl b/tests/aslts/src/runtime/collections/complex/provoke/MAIN.asl
index 53339475f..c9fd01f94 100644
--- a/tests/aslts/src/runtime/collections/complex/provoke/MAIN.asl
+++ b/tests/aslts/src/runtime/collections/complex/provoke/MAIN.asl
@@ -25,32 +25,22 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-DefinitionBlock(
-	"provoke.aml",   // Output filename
-	"DSDT",     // Signature
-	0x02,       // DSDT Revision
-	"Intel",    // OEMID
-	"Many",     // TABLE ID
-	0x00000001  // OEM Revision
-	) {
-
-	// All declarations
-	Include("../../../../runtime/cntl/DECL.asl")
-	Include("../../../../runtime/collections/complex/provoke/provoke.asl")
-
-	Method(MAIN) {
-
-		// Initialization
-		STRT(0)
-
-		// Run verification methods
-
-		Include("../../../../runtime/collections/complex/provoke/RUN.asl")
-
-		// Final actions
-		Store(FNSH(), Local7)
-
-		return (Local7)
-	}
+DefinitionBlock ("provoke", "DSDT", 2, "Intel", "Many", 0x00000001)
+{
+    /* All declarations */
+    Include ("../../../../runtime/cntl/DECL.asl")
+    Include ("../../../../runtime/collections/complex/provoke/provoke.asl")
+    Method (MAIN, 0, NotSerialized)
+    {
+        /* Initialization */
+
+        STRT (0x00)
+        /* Run verification methods */
+        Include ("../../../../runtime/collections/complex/provoke/RUN.asl")
+        /* Final actions */
+
+        Store (FNSH (), Local7)
+        Return (Local7)
+    }
 }
+
diff --git a/tests/aslts/src/runtime/collections/complex/provoke/RUN.asl b/tests/aslts/src/runtime/collections/complex/provoke/RUN.asl
index d9135d23e..8edb95a16 100644
--- a/tests/aslts/src/runtime/collections/complex/provoke/RUN.asl
+++ b/tests/aslts/src/runtime/collections/complex/provoke/RUN.asl
@@ -1,33 +1,33 @@
-/*
- * Some or all of this work - Copyright (c) 2006 - 2017, 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.
- */
+        /*
+         * Some or all of this work - Copyright (c) 2006 - 2017, 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.
+         */
+        If (STTT ("Check operators under the known critical conditions", TCLC, 0x01, W00F))
+        {
+            PRV0 ()
+        }
 
-
-if (STTT("Check operators under the known critical conditions", TCLC, 1, W00f)) {
-	PRV0()
-}
-FTTT()
+        FTTT ()
diff --git a/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl b/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl
index 10647c9a5..860b62e20 100644
--- a/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl
+++ b/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl
@@ -1,134 +1,137 @@
-/*
- * Some or all of this work - Copyright (c) 2006 - 2017, 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.
- */
-
-/*
- * Check operators under the known critical conditions
- *
- * Collection of the tests which exersice the operators under the
- * known conditions. If some operator was observed failing under some
- * conditions, do the similar checkings for other operators under the
- * similar conditions too.
- */
-
-Name(z055, 55)
-
-// Meaningless zero valued parameter
-
-Method(m130, 1, Serialized)
-{
-	Name(B000, Buffer(2) {0x21, 0x21})
-
-	Store(0, Local0)
-
-	Store(ToString(B000, Local0), Local2)
-
-	if (LNotequal(Local0, 0)) {
-		err(arg0, z055, __LINE__, 0, 0, Local0, 0)
-	}
-
-	CH03(arg0, z055, 1, __LINE__, 0)
-}
-
-// Store-like actions affect the source objects passed as parameter
-
-Method(m131, 1)
-{
-	Decrement(arg0)
-	// Store(9, arg0)
-}
-
-// Operator updates the source object passed to method directly,
-// NOT as a reference to it.
-Method(m132, 1)
-{
-	Store(10, Local0)
-	m131(Local0)
-	if (LNotEqual(Local0, 10)){
-		err(arg0, z055, __LINE__, 0, 0, Local0, 10)
-	}
-
-	CH03(arg0, z055, 3, __LINE__, 0)
-}
-
-// Operator doesn't update the source object passed to method as a REFERENCE
-// to the object.
-Method(m133, 1)
-{
-	Store(10, Local0)
-	Store(RefOf(Local0), Local1)
-	m131(Local1)
-	if (LNotEqual(Local0, 9)){
-		err(arg0, z055, __LINE__, 0, 0, Local0, 9)
-	}
-
-	CH03(arg0, z055, 5, __LINE__, 0)
-}
-
-Method(m134, 1)
-{
-	Store(10, Local0)
-	m131(RefOf(Local0))
-	if (LNotEqual(Local0, 9)){
-		err(arg0, z055, __LINE__, 0, 0, Local0, 9)
-	}
-
-	CH03(arg0, z055, 7, __LINE__, 0)
-}
-
-Method(m135, 1)
-{
-	Store(5, arg0)
-}
-
-Method(m136, 1)
-{
-	Store(10, Local0)
-	m135(RefOf(Local0))
-	if (LNotEqual(Local0, 5)){
-		err(arg0, z055, __LINE__, 0, 0, Local0, 5)
-	}
-
-	CH03(arg0, z055, 9, __LINE__, 0)
-}
-
-// Run-method
-Method(PRV0,, Serialized)
-{
-	Name(ts, "PRV0")
-
-	SRMT("m130")
-	m130(ts)
-	SRMT("m132")
-	m132(ts)
-	SRMT("m133")
-	m133(ts)
-	SRMT("m134")
-	m134(ts)
-	SRMT("m136")
-	m136(ts)
-}
+    /*
+     * Some or all of this work - Copyright (c) 2006 - 2017, 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.
+     */
+    /*
+     * Check operators under the known critical conditions
+     *
+     * Collection of the tests which exersice the operators under the
+     * known conditions. If some operator was observed failing under some
+     * conditions, do the similar checkings for other operators under the
+     * similar conditions too.
+     */
+    Name (Z055, 0x37)
+    /* Meaningless zero valued parameter */
+
+    Method (M130, 1, Serialized)
+    {
+        Name (B000, Buffer (0x02)
+        {
+             0x21, 0x21                                       // !!
+        })
+        Local0 = 0x00
+        Local2 = ToString (B000, Local0)
+        If ((Local0 != 0x00))
+        {
+            ERR (Arg0, Z055, 0x33, 0x00, 0x00, Local0, 0x00)
+        }
+
+        CH03 (Arg0, Z055, 0x01, 0x36, 0x00)
+    }
+
+    /* Store-like actions affect the source objects passed as parameter */
+
+    Method (M131, 1, NotSerialized)
+    {
+        Arg0--
+        /* Store(9, arg0) */
+    }
+
+    /* Operator updates the source object passed to method directly, */
+    /* NOT as a reference to it. */
+    Method (M132, 1, NotSerialized)
+    {
+        Local0 = 0x0A
+        M131 (Local0)
+        If ((Local0 != 0x0A))
+        {
+            ERR (Arg0, Z055, 0x48, 0x00, 0x00, Local0, 0x0A)
+        }
+
+        CH03 (Arg0, Z055, 0x03, 0x4B, 0x00)
+    }
+
+    /* Operator doesn't update the source object passed to method as a REFERENCE */
+    /* to the object. */
+    Method (M133, 1, NotSerialized)
+    {
+        Local0 = 0x0A
+        Local1 = RefOf (Local0)
+        M131 (Local1)
+        If ((Local0 != 0x09))
+        {
+            ERR (Arg0, Z055, 0x56, 0x00, 0x00, Local0, 0x09)
+        }
+
+        CH03 (Arg0, Z055, 0x05, 0x59, 0x00)
+    }
+
+    Method (M134, 1, NotSerialized)
+    {
+        Local0 = 0x0A
+        M131 (RefOf (Local0))
+        If ((Local0 != 0x09))
+        {
+            ERR (Arg0, Z055, 0x61, 0x00, 0x00, Local0, 0x09)
+        }
+
+        CH03 (Arg0, Z055, 0x07, 0x64, 0x00)
+    }
+
+    Method (M135, 1, NotSerialized)
+    {
+        Arg0 = 0x05
+    }
+
+    Method (M136, 1, NotSerialized)
+    {
+        Local0 = 0x0A
+        M135 (RefOf (Local0))
+        If ((Local0 != 0x05))
+        {
+            ERR (Arg0, Z055, 0x71, 0x00, 0x00, Local0, 0x05)
+        }
+
+        CH03 (Arg0, Z055, 0x09, 0x74, 0x00)
+    }
+
+    /* Run-method */
+
+    Method (PRV0, 0, Serialized)
+    {
+        Name (TS, "PRV0")
+        SRMT ("m130")
+        M130 (TS)
+        SRMT ("m132")
+        M132 (TS)
+        SRMT ("m133")
+        M133 (TS)
+        SRMT ("m134")
+        M134 (TS)
+        SRMT ("m136")
+        M136 (TS)
+    }
+