From cd3f1db755bab862daa7d890a21ae30626ccda30 Mon Sep 17 00:00:00 2001
From: Robert Moore <Robert.Moore@intel.com>
Date: Fri, 18 Jun 2010 14:52:34 -0700
Subject: [PATCH] iASL: Fully enable Data Table Compiler (DTC).

No option needed to invoke DTC. Compiler auto-detects ASl code
versus DT code.
---
 source/compiler/aslglobal.h  |  1 -
 source/compiler/aslmain.c    |  9 +--------
 source/compiler/aslstartup.c | 12 ------------
 tests/templates/templates.sh |  4 ++--
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/source/compiler/aslglobal.h b/source/compiler/aslglobal.h
index 9e3dbac63..3f600d842 100644
--- a/source/compiler/aslglobal.h
+++ b/source/compiler/aslglobal.h
@@ -197,7 +197,6 @@ ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_DisplayRemarks, TRUE);
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_DisplayOptimizations, FALSE);
 ASL_EXTERN UINT8                    ASL_INIT_GLOBAL (Gbl_WarningLevel, ASL_WARNING);
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_UseOriginalCompilerId, FALSE);
-ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_DataTableCompilerAvailable, FALSE);
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_VerboseTemplates, FALSE);
 ASL_EXTERN BOOLEAN                  ASL_INIT_GLOBAL (Gbl_DoTemplates, FALSE);
 
diff --git a/source/compiler/aslmain.c b/source/compiler/aslmain.c
index 1fd9fc5e6..e7f1ca123 100644
--- a/source/compiler/aslmain.c
+++ b/source/compiler/aslmain.c
@@ -167,7 +167,7 @@ AslDoResponseFile (
 
 
 #define ASL_TOKEN_SEPARATORS    " \t\n"
-#define ASL_SUPPORTED_OPTIONS   "@:2b:c:d^e:fgh^i^I:l^no:p:r:s:t:T:v:w:x:yz"
+#define ASL_SUPPORTED_OPTIONS   "@:2b:c:d^e:fgh^i^I:l^no:p:r:s:t:T:v:w:x:z"
 
 
 /*******************************************************************************
@@ -273,7 +273,6 @@ HelpMessage (
     printf ("  -n             Parse only, no output generation\n");
     printf ("  -ot            Display compile times\n");
     printf ("  -x<level>      Set debug level for trace output\n");
-    printf ("  -y             Temporary: Enable data table compiler\n");
     printf ("  -z             Do not insert new compiler ID for DataTables\n");
 }
 
@@ -852,12 +851,6 @@ AslDoOptions (
         break;
 
 
-    case 'y':
-
-        Gbl_DataTableCompilerAvailable = TRUE;
-        break;
-
-
     case 'z':
 
         Gbl_UseOriginalCompilerId = TRUE;
diff --git a/source/compiler/aslstartup.c b/source/compiler/aslstartup.c
index 68346d300..32c6ae4bf 100644
--- a/source/compiler/aslstartup.c
+++ b/source/compiler/aslstartup.c
@@ -463,17 +463,6 @@ AslDoOneFile (
      */
     case ASL_INPUT_TYPE_ASCII_DATA:
 
-        /*
-         * Require use of command-line option to enable the data table
-         * compiler -- for now, until development of the compiler is
-         * complete.
-         */
-        if (!Gbl_DataTableCompilerAvailable)
-        {
-            printf ("Data Table Compiler is not available yet\n");
-            return (AE_SUPPORT);
-        }
-
         Status = DtDoCompile ();
 
         if (Gbl_Signature)
@@ -489,7 +478,6 @@ AslDoOneFile (
      */
     case ASL_INPUT_TYPE_ASCII_ASL:
 
-
         /* ACPICA subsystem initialization */
 
         Status = AdInitialize ();
diff --git a/tests/templates/templates.sh b/tests/templates/templates.sh
index efe1510fd..06c08143d 100755
--- a/tests/templates/templates.sh
+++ b/tests/templates/templates.sh
@@ -17,7 +17,7 @@ echo "Using $ASL_COMPILER"
 # to ensure that they will emit and compile
 #
 $ASL_COMPILER -T ALL > /dev/null 2>&1
-$ASL_COMPILER -y *.asl > /dev/null 2>&1
+$ASL_COMPILER *.asl > /dev/null 2>&1
 
 rm -f *.aml *.asl *.dsl *.log
 
@@ -27,7 +27,7 @@ $ASL_COMPILER -vt -T ALL > /dev/null 2>&1
 
 # Compile the templates
 
-$ASL_COMPILER -y *.asl > /dev/null 2>&1
+$ASL_COMPILER *.asl > /dev/null 2>&1
 
 # Disassemble the compiled templates