From 018c4178a255669bc29dddf58c52f0bf7f56cc7a Mon Sep 17 00:00:00 2001
From: mlin2 <mlin2>
Date: Sun, 3 Feb 2008 01:39:43 +0000
Subject: [PATCH] Delete multiple External declarations with the same name.
---
.../collections/bdemo/ACPICA/0258/DECL.asl | 2 -
.../collections/bdemo/ACPICA/0260/DECL.asl | 2 -
.../collections/functional/table/load.asl | 85 +++++++------------
3 files changed, 30 insertions(+), 59 deletions(-)
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl
index 391609f21..6152e34f6 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0258/DECL.asl
@@ -57,8 +57,6 @@ Field(R258, ByteAcc, NoLock, Preserve) {
Method(m17e)
{
- External(\AUXD.M000)
-
Store(B258, F258)
if (CondRefof(\AUXD, Local0)) {
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl
index dfcc6fbc9..e684546e5 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0260/DECL.asl
@@ -54,8 +54,6 @@ Method(m029)
RFU0, 0x210,
}
- External(\AUXD)
-
Method(m000)
diff --git a/tests/aslts/src/runtime/collections/functional/table/load.asl b/tests/aslts/src/runtime/collections/functional/table/load.asl
index 7315d37a7..a1fdac550 100644
--- a/tests/aslts/src/runtime/collections/functional/table/load.asl
+++ b/tests/aslts/src/runtime/collections/functional/table/load.asl
@@ -89,6 +89,35 @@
* defined in the Definition Block are not executed during load time")
*/
+ // Integer
+ External(\AUXD.INT0)
+ // String
+ External(\AUXD.STR0)
+ // Buffer
+ External(\AUXD.BUF0)
+ // Package
+ External(\AUXD.PAC0)
+ // Device
+ External(\AUXD.DEV0)
+ // Event
+ External(\AUXD.EVE0)
+ // Method
+ External(\AUXD.MMM0)
+ // Mutex
+ External(\AUXD.MTX0)
+ // Power Resource
+ External(\AUXD.PWR0)
+ // Processor
+ External(\AUXD.CPU0)
+ // Thermal Zone
+ External(\AUXD.TZN0)
+ // Buffer Field
+ External(\AUXD.BFL0)
+ // Field Unit
+ External(\AUXD.FLU0)
+ // OpRegion
+ External(\AUXD.OPR0)
+
Name(z174, 174)
Device(DTM0) {
@@ -1239,31 +1268,6 @@ Device(DTM0) {
Name(DDB0, 0)
Name(DDBH, 0)
- // Integer
- External(\AUXD.INT0)
- // String
- External(\AUXD.STR0)
- // Buffer
- External(\AUXD.BUF0)
- // Package
- External(\AUXD.PAC0)
- // Device
- External(\AUXD.DEV0)
- // Event
- External(\AUXD.EVE0)
- // Method
- External(\AUXD.MMM0)
- // Mutex
- External(\AUXD.MTX0)
- // Power Resource
- External(\AUXD.PWR0)
- // Processor
- External(\AUXD.CPU0)
- // Thermal Zone
- External(\AUXD.TZN0)
- // Buffer Field
- External(\AUXD.BFL0)
-
Concatenate(arg0, "-tstb", arg0)
Store(BUF3, RFU3)
@@ -1692,35 +1696,6 @@ Device(DTM0) {
Name(DDB1, 0)
Name(DDBH, 0)
- // Integer
- External(\AUXD.INT0)
- // String
- External(\AUXD.STR0)
- // Buffer
- External(\AUXD.BUF0)
- // Package
- External(\AUXD.PAC0)
- // Field Unit
- External(\AUXD.FLU0)
- // Device
- External(\AUXD.DEV0)
- // Event
- External(\AUXD.EVE0)
- // Method
- External(\AUXD.MMM0, MethodObj)
- // Mutex
- External(\AUXD.MTX0)
- // OpRegion
- External(\AUXD.OPR0)
- // Power Resource
- External(\AUXD.PWR0)
- // Processor
- External(\AUXD.CPU0)
- // Thermal Zone
- External(\AUXD.TZN0)
- // Buffer Field
- External(\AUXD.BFL0)
-
Method(m000, 4)
{
Concatenate(arg0, "-m000.", arg0)
@@ -2230,4 +2205,4 @@ Method(TLD1)
// referred by the namepath of the new Object in the Table loaded
SRMT("TLD1.tstj")
\DTM0.tstj(ts)
-}
\ No newline at end of file
+}