WebSVN – Kolibri OS – Diff – /drivers/devman/acpica/compiler/aslstartup.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
+ *
  * 2.1. This is your license from Intel Corp. under its intellectual property
         ACPI_MODULE_NAME    ("aslstartup")
 #define ASL_MAX_FILES   256
-char                    *FileList[ASL_MAX_FILES];
-int                     FileCount;
+static char             *FileList[ASL_MAX_FILES];
-BOOLEAN                 AslToFile = TRUE;
+static BOOLEAN          AslToFile = TRUE;
-/* Local prototypes */
 static void
 AslInitializeGlobals (
-    void);
+/* Local prototypes */
 static char **
 AsDoWildcard (
     char                    *DirectoryPathname,
     char                    *FileSpecifier);
  *              allows multiple files to be disassembled and/or compiled.
+ *
  ******************************************************************************/
-static void
+void
 AslInitializeGlobals (
     void)
+{
     UINT32                  i;
+    }
     Gbl_Files[ASL_FILE_AML_OUTPUT].Filename = NULL;
     Gbl_Files[ASL_FILE_AML_OUTPUT].Handle = NULL;
+    Gbl_Files[ASL_FILE_SOURCE_OUTPUT].Filename = NULL;
+    Gbl_Files[ASL_FILE_SOURCE_OUTPUT].Handle = NULL;
+}
+{
 #ifdef WIN32
     void                    *DirInfo;
     char                    *Filename;
     int                     FileCount;
     FileCount = 0;
  *              non-ASCII characters), ASL file, or an ACPI Data Table file.
+ *
  ******************************************************************************/
-UINT8
+static UINT8
 AslDetectSourceFileType (
     ASL_FILE_INFO           *Info)
+{
     char                    *FileChar;
     UINT8                   Type;
         /* Shutdown compiler and ACPICA subsystem */
         AeClearErrorLog ();
-        AcpiTerminate ();
+        (void) AcpiTerminate ();
         /*
          * Gbl_Files[ASL_FILE_INPUT].Filename was replaced with the
      * Data Table Compilation
      */
     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)
+        {
      * ASL Compilation (Optional)
      */
     case ASL_INPUT_TYPE_ASCII_ASL:
         /* ACPICA subsystem initialization */
         Status = AdInitialize ();
         if (ACPI_FAILURE (Status))
+        {
             return (Status);
+        }
         Status = CmDoCompile ();
-        AcpiTerminate ();
+        (void) AcpiTerminate ();
         /*
  ******************************************************************************/
 ACPI_STATUS
 AslDoOnePathname (
-    char                    *Pathname)
+    char                    *Pathname,
+    ASL_PATHNAME_CALLBACK   PathCallback)
+{
     ACPI_STATUS             Status = AE_OK;
-    char                    **FileList;
+    char                    **WildcardList;
     char                    *Filename;
     char                    *FullPathname;
+    }
     /* Expand possible wildcard into a file list (Windows/DOS only) */
-    FileList = AsDoWildcard (Gbl_DirectoryPath, Filename);
+    WildcardList = AsDoWildcard (Gbl_DirectoryPath, Filename);
-    while (*FileList)
+    while (*WildcardList)
+    {
         FullPathname = ACPI_ALLOCATE (
-            strlen (Gbl_DirectoryPath) + strlen (*FileList) + 1);
+            strlen (Gbl_DirectoryPath) + strlen (*WildcardList) + 1);
         /* Construct a full path to the file */
         strcpy (FullPathname, Gbl_DirectoryPath);
-        strcat (FullPathname, *FileList);
+        strcat (FullPathname, *WildcardList);
+        }
         /* Save status from all compiles */
-        Status |= AslDoOneFile (FullPathname);
+        Status |= (*PathCallback) (FullPathname);
         ACPI_FREE (FullPathname);
-        ACPI_FREE (*FileList);
+        ACPI_FREE (*WildcardList);
-        *FileList = NULL;
+        *WildcardList = NULL;
-        FileList++;
+        WildcardList++;
+    }

Subversion Repositories Kolibri OS

(root)/drivers/devman/acpica/compiler/aslstartup.c – Rev 1498 → 2216