Revert "source and test: update copyright notices to 2015"

This reverts commit 28a95326289ca5ee7cd95f8e8e809dc5564d9509.

Commit mistakenly changes file format to CRLF from default LF.

3 files changed, 155 insertions, 155 deletions

diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/DECL.asl
index a0f3a641d..3d165a197 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/DECL.asl
@@ -1,66 +1,66 @@
-/*

- * Some or all of this work - Copyright (c) 2006 - 2015, 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 143:

- *

- * SUMMARY: The ASL Compiler doesn't support more than two-element long list of ParameterTypes argument of Method

- */

-

-	Method(mf30, 2, Serialized, 0, IntObj, {IntObj, IntObj})

-	{

-		Return (Add(Arg0, Arg1))

-	}

-

-	Method(mf31, 1, Serialized, 0, {IntObj, StrObj, BuffObj}, IntObj)

-	{

-		Return (Arg0)

-	}

-

-	Method(mf32, 3, Serialized, 0, IntObj, {IntObj, StrObj, BuffObj})

-	{

-		Return (Add(Add(Arg0, Arg1), Arg2))

-	}

-

-	Method(mf33) {

-

-		Store(mf30(1, 2), Local0)

-		if (LNotEqual(Local0, 3)) {

-			err("", zFFF, 0x000, 0, 0, Local0, 3)

-		}

-

-		Store(mf31("FFFF"), Local0)

-		if (LNotEqual(Local0, "FFFF")) {

-			err("", zFFF, 0x001, 0, 0, Local0, "FFFF")

-		}

-

-		Store(mf32(3, "F", Buffer(1){0xff}), Local0)

-		if (LNotEqual(Local0, 0x111)) {

-			err("", zFFF, 0x002, 0, 0, Local0, 0x111)

-		}

-	}

+/*
+ * Some or all of this work - Copyright (c) 2006 - 2014, 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 143:
+ *
+ * SUMMARY: The ASL Compiler doesn't support more than two-element long list of ParameterTypes argument of Method
+ */
+
+	Method(mf30, 2, Serialized, 0, IntObj, {IntObj, IntObj})
+	{
+		Return (Add(Arg0, Arg1))
+	}
+
+	Method(mf31, 1, Serialized, 0, {IntObj, StrObj, BuffObj}, IntObj)
+	{
+		Return (Arg0)
+	}
+
+	Method(mf32, 3, Serialized, 0, IntObj, {IntObj, StrObj, BuffObj})
+	{
+		Return (Add(Add(Arg0, Arg1), Arg2))
+	}
+
+	Method(mf33) {
+
+		Store(mf30(1, 2), Local0)
+		if (LNotEqual(Local0, 3)) {
+			err("", zFFF, 0x000, 0, 0, Local0, 3)
+		}
+
+		Store(mf31("FFFF"), Local0)
+		if (LNotEqual(Local0, "FFFF")) {
+			err("", zFFF, 0x001, 0, 0, Local0, "FFFF")
+		}
+
+		Store(mf32(3, "F", Buffer(1){0xff}), Local0)
+		if (LNotEqual(Local0, 0x111)) {
+			err("", zFFF, 0x002, 0, 0, Local0, 0x111)
+		}
+	}
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/MAIN.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/MAIN.asl
index 4bfea936a..a8f4bac44 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/MAIN.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/MAIN.asl
@@ -1,55 +1,55 @@
-/*

- * Some or all of this work - Copyright (c) 2006 - 2015, 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.

- */

-

-DefinitionBlock(

-	"B143.aml",  // Output filename

-	"DSDT",     // Signature

-	0x02,       // DSDT Revision

-	"Intel",    // OEMID

-	"Many",     // TABLE ID

-	0x00000001  // OEM Revision

-	) {

-

-	// All declarations

-	Include("../../../../../runtime/cntl/DECL_5UP.asl")

-	Include("../../../../../runtime/collections/bdemo/ACPICA/0143/DECL.asl")

-

-	Method(MAIN) {

-

-		// Initialization

-		STRT(0)

-

-		// Run verification methods

-		Include("../../../../../runtime/collections/bdemo/ACPICA/0143/RUN.asl")

-

-		// Final actions

-		Store(FNSH(), Local7)

-

-		return (Local7)

-	}

-}

+/*
+ * Some or all of this work - Copyright (c) 2006 - 2014, 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.
+ */
+
+DefinitionBlock(
+	"B143.aml",  // Output filename
+	"DSDT",     // Signature
+	0x02,       // DSDT Revision
+	"Intel",    // OEMID
+	"Many",     // TABLE ID
+	0x00000001  // OEM Revision
+	) {
+
+	// All declarations
+	Include("../../../../../runtime/cntl/DECL_5UP.asl")
+	Include("../../../../../runtime/collections/bdemo/ACPICA/0143/DECL.asl")
+
+	Method(MAIN) {
+
+		// Initialization
+		STRT(0)
+
+		// Run verification methods
+		Include("../../../../../runtime/collections/bdemo/ACPICA/0143/RUN.asl")
+
+		// Final actions
+		Store(FNSH(), Local7)
+
+		return (Local7)
+	}
+}
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/RUN.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/RUN.asl
index a70bddce3..350280a6e 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/RUN.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0143/RUN.asl
@@ -1,34 +1,34 @@
-/*

- * Some or all of this work - Copyright (c) 2006 - 2015, 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 143", TCLD, 143, W017)) {

-	SRMT("mf33")

-	mf33()

-}

-FTTT()

-

+/*
+ * Some or all of this work - Copyright (c) 2006 - 2014, 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 143", TCLD, 143, W017)) {
+	SRMT("mf33")
+	mf33()
+}
+FTTT()
+