WebSVN – Kolibri OS – Diff – /drivers/devman/acpica/common/adisasm.c

 /******************************************************************************
+ *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2011, Intel Corp.
  * All rights reserved.
+ *
  * 2. License
+ *
 #define _COMPONENT          ACPI_TOOLS
         ACPI_MODULE_NAME    ("adisasm")
 extern int                  AslCompilerdebug;
-extern char                 *Gbl_ExternalFilename;
+extern int                  AslCompilerdebug;
     void                    *Handle);
 /* Local prototypes */
-void
+static void
-AdCreateTableHeader (
-    char                    *Filename,
-    ACPI_TABLE_HEADER       *Table);
-void
+AdCreateTableHeader (
-AdDisassemblerHeader (
+    char                    *Filename,
-    char                    *Filename);
+    ACPI_TABLE_HEADER       *Table);
-ACPI_STATUS
+static ACPI_STATUS
 AdDeferredParse (
     ACPI_PARSE_OBJECT       *Op,
     UINT8                   *Aml,
     UINT32                  AmlLength);
     BOOLEAN                 GetAllTables)
+{
     ACPI_STATUS             Status;
     char                    *DisasmFilename = NULL;
     char                    *ExternalFilename;
+    ACPI_EXTERNAL_FILE      *ExternalFileList = AcpiGbl_ExternalFileList;
     FILE                    *File = NULL;
     ACPI_TABLE_HEADER       *Table = NULL;
     ACPI_TABLE_HEADER       *ExternalTable;
     ACPI_OWNER_ID           OwnerId;
         /*
          * External filenames separated by commas
          * Example: iasl -e file1,file2,file3 -d xxx.aml
          */
-        if (Gbl_ExternalFilename)
+        while (ExternalFileList)
         {
-            ExternalFilename = strtok (Gbl_ExternalFilename, ",");
+            ExternalFilename = ExternalFileList->Path;
-            while (ExternalFilename)
+            if (!ACPI_STRCMP (ExternalFilename, Filename))
+            {
+                /* Next external file */
+                ExternalFileList = ExternalFileList->Next;
+                continue;
+            }
                 Status = AcpiDbGetTableFromFile (ExternalFilename, &ExternalTable);
                 if (ACPI_FAILURE (Status))
+                {
                     return Status;
                     AcpiDmFinishNamespaceLoad (AcpiGbl_ParseOpRoot,
                         AcpiGbl_RootNode, OwnerId);
                     AcpiPsDeleteParseTree (AcpiGbl_ParseOpRoot);
+                }
-                /* Next external file name */
+            /* Next external file */
-                ExternalFilename = strtok (NULL, ",");
+            ExternalFileList = ExternalFileList->Next;
+            }
             /* Clear external list generated by Scope in external tables */
-            /* Clear external list generated by Scope in external tables */
+        if (AcpiGbl_ExternalFileList)
+        {
             AcpiDmClearExternalList ();
     time (&Timer);
     /* Header and input table info */
-    AcpiOsPrintf ("/*\n * Intel ACPI Component Architecture\n");
+    AcpiOsPrintf ("/*\n");
-    AcpiOsPrintf (" * AML Disassembler version %8.8X\n", ACPI_CA_VERSION);
+    AcpiOsPrintf (ACPI_COMMON_HEADER ("AML Disassembler", " * "));
  * DESCRIPTION: Create the ASL table header, including ACPI CA signon with
  *              current time and date.
+ *
  *****************************************************************************/
-void
+static void
 AdCreateTableHeader (
     char                    *Filename,
     ACPI_TABLE_HEADER       *Table)
+{
     /*
      * Print file header and dump original table header
      */
     AdDisassemblerHeader (Filename);
-    AcpiOsPrintf (" *\n * Original Table Header:\n");
+    AcpiOsPrintf (" * Original Table Header:\n");
     AcpiOsPrintf (" *     Signature        \"%4.4s\"\n",    Table->Signature);
     AcpiOsPrintf (" *     Length           0x%8.8X (%u)\n", Table->Length, Table->Length);
     case 1:
         /* Revision of DSDT controls the ACPI integer width */
         if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_DSDT))
         {
-            AcpiOsPrintf (" **** ACPI 1.0, no 64-bit math support");
+            AcpiOsPrintf (" **** 32-bit table (V1), no 64-bit math support");
+        }
         break;
     AcpiOsPrintf (" *     OEM ID           \"%.6s\"\n",     Table->OemId);
     AcpiOsPrintf (" *     OEM Table ID     \"%.8s\"\n",     Table->OemTableId);
     AcpiOsPrintf (" *     OEM Revision     0x%8.8X (%u)\n", Table->OemRevision, Table->OemRevision);
     AcpiOsPrintf (" *     Compiler ID      \"%.4s\"\n",     Table->AslCompilerId);
     AcpiOsPrintf (" *     Compiler Version 0x%8.8X (%u)\n", Table->AslCompilerRevision, Table->AslCompilerRevision);
-    AcpiOsPrintf (" */\n");
+    AcpiOsPrintf (" */\n\n");
     /* Create AML output filename based on input filename */
  * DESCRIPTION: Parse one deferred opcode
  *              (Methods, operation regions, etc.)
+ *
  *****************************************************************************/
-ACPI_STATUS
+static ACPI_STATUS
 AdDeferredParse (
     ACPI_PARSE_OBJECT       *Op,
     UINT8                   *Aml,
     UINT32                  AmlLength)
+ *
  * DESCRIPTION: Parse the deferred opcodes (Methods, regions, etc.)
+ *
  *****************************************************************************/
-ACPI_STATUS
+static ACPI_STATUS
 AdParseDeferredOps (
     ACPI_PARSE_OBJECT       *Root)
+{
     ACPI_PARSE_OBJECT       *Op = Root;

Subversion Repositories Kolibri OS

(root)/drivers/devman/acpica/common/adisasm.c – Rev 1498 → 2216