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>

2 files changed, 105 insertions, 99 deletions

diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/DECL.asl
index b7a600606..961b66e39 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/DECL.asl
@@ -1,74 +1,80 @@
-/*
- * 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.
+     */
+    /*
+     * Bug 130:
+     *
+     * SUMMARY: Reference to String works differently to like the references to Buffer and Package work
+     */
+    Method (MF19, 1, NotSerialized)
+    {
+        Local2 = DerefOf (Arg0)
+        Local2 [0x01] = 0x2B
+        /*		Store(0x2b, Index(DerefOf(arg0), 1)) */
+    }
 
-/*
- * Bug 130:
- *
- * SUMMARY: Reference to String works differently to like the references to Buffer and Package work
- */
+    Method (MF1A, 1, NotSerialized)
+    {
+        Local0 = RefOf (Arg0)
+        MF19 (Local0)
+    }
 
-	Method(mf19, 1)
-	{
-		Store(DerefOf(arg0), Local2)
-		Store(0x2b, Index(Local2, 1))
-//		Store(0x2b, Index(DerefOf(arg0), 1))
-	}
+    Method (MF1B, 0, NotSerialized)
+    {
+        /* Index of String */
 
-	Method(mf1a, 1)
-	{
-		Store(RefOf(arg0), Local0)
-		mf19(Local0)
-	}
+        MF1A (SD04)
+        If ((SD04 != "qwer0000"))
+        {
+            ERR ("", ZFFF, 0x36, 0x00, 0x00, SD04, "qwer0000")
+        }
 
-	Method(mf1b)
-	{
-		// Index of String
+        /* Index of Buffer */
 
-		mf1a(sd04)
-		if (LNotEqual(sd04, "qwer0000")) {
-			err("", zFFF, __LINE__, 0, 0, sd04, "qwer0000")
-		}
+        MF1A (BD08)
+        If ((BD08 != Buffer (0x04)
+                    {
+                         0x01, 0x77, 0x03, 0x04                           // .w..
+                    }))
+        {
+            ERR ("", ZFFF, 0x3D, 0x00, 0x00, BD08, Buffer (0x04)
+                {
+                     0x01, 0x77, 0x03, 0x04                           // .w..
+                })
+        }
 
-		// Index of Buffer
+        /* Index of Package */
 
-		mf1a(bd08)
-		if (LNotEqual(bd08, Buffer(4) {1,0x77,3,4})) {
-			err("", zFFF, __LINE__, 0, 0, bd08, Buffer(4) {1,0x77,3,4})
-		}
+        MF1A (PD0D)
+        Local0 = PD0D [0x01]
+        Local1 = DerefOf (Local0)
+        If ((Local1 != 0x77))
+        {
+            ERR ("", ZFFF, 0x48, 0x00, 0x00, Local1, 0x77)
+        }
+    }
 
-		// Index of Package
-
-		mf1a(pd0d)
-
-		Index(pd0d, 1, Local0)
-		Store(DerefOf(Local0), Local1)
-
-		if (LNotEqual(Local1, 0x77)) {
-			err("", zFFF, __LINE__, 0, 0, Local1, 0x77)
-		}
-	}
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/RUN.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/RUN.asl
index ac36f001d..d5509cbc8 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/RUN.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0130/RUN.asl
@@ -1,34 +1,34 @@
-/*
- * 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("Demo of bug 130", TCLD, 130, W017)) {
-	SRMT("mf1b")
-	mf1b()
-}
-FTTT()
+        /*
+         * 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 ("Demo of bug 130", TCLD, 0x82, W017))
+        {
+            SRMT ("mf1b")
+            MF1B ()
+        }
 
+        FTTT ()