WebSVN – Kolibri OS – Diff – /drivers/devman/acpica/tools/acpiexec/aemain.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
+ *
 #endif
 #define _COMPONENT          PARSER
-        ACPI_MODULE_NAME    ("aemain")
+        ACPI_MODULE_NAME    ("aemain")
 UINT8           AcpiGbl_BatchMode = 0;
-UINT8           AcpiGbl_RegionFillValue = 0;
+UINT8                   AcpiGbl_RegionFillValue = 0;
-BOOLEAN         AcpiGbl_IgnoreErrors = FALSE;
+BOOLEAN                 AcpiGbl_IgnoreErrors = FALSE;
+BOOLEAN                 AcpiGbl_DbOpt_NoRegionSupport = FALSE;
+BOOLEAN                 AcpiGbl_DebugTimeout = FALSE;
-BOOLEAN         AcpiGbl_DbOpt_NoRegionSupport = FALSE;
-BOOLEAN         AcpiGbl_DebugTimeout = FALSE;
+static UINT8            AcpiGbl_BatchMode = 0;
-char            BatchBuffer[128];
+static char             BatchBuffer[128];
-AE_TABLE_DESC   *AeTableListHead = NULL;
+static AE_TABLE_DESC    *AeTableListHead = NULL;
 #define ASL_MAX_FILES   256
     printf ("\n");
     printf ("   -da                 Disable method abort on error\n");
     printf ("   -di                 Disable execution of STA/INI methods during init\n");
+    printf ("   -do                 Disable Operation Region address simulation\n");
-    printf ("   -do                 Disable Operation Region address simulation\n");
+    printf ("   -dr                 Disable repair of method return values\n");
     printf ("   -dt                 Disable allocation tracking (performance)\n");
     printf ("\n");
     ACPI_STATUS             Status;
     char                    *Ptr = BatchBuffer;
     char                    *Cmd = Ptr;
     UINT8                   Run = 0;
     AcpiGbl_MethodExecuting = FALSE;
     AcpiGbl_StepToNextCall = FALSE;
     char                    *FileSpecifier)
+{
 #ifdef WIN32
     void                    *DirInfo;
     char                    *Filename;
+    int                     FileCount;
     ACPI_STATUS             Status;
     UINT32                  InitFlags;
     ACPI_TABLE_HEADER       *Table = NULL;
     UINT32                  TableCount;
     AE_TABLE_DESC           *TableDesc;
-    char                    **FileList;
+    char                    **WildcardList;
     char                    *Filename;
     char                    *Directory;
     char                    *FullPathname;
 #ifdef _DEBUG
     _CrtSetDbgFlag (_CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_LEAK_CHECK_DF |
                     _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG));
-#endif
-    printf ("\nIntel ACPI Component Architecture\nAML Execution/Debug Utility");
+#endif
     printf (" version %8.8X", ((UINT32) ACPI_CA_VERSION));
-    printf (" [%s]\n\n",  __DATE__);
+    printf (ACPI_COMMON_SIGNON ("AML Execution/Debug Utility"));
     if (argc < 2)
+    {
         usage ();
     AcpiDbgLevel = ACPI_NORMAL_DEFAULT;
     AcpiDbgLayer = 0xFFFFFFFF;
     /* Init ACPI and start debugger thread */
     Status = AcpiInitializeSubsystem ();
-    AcpiInitializeSubsystem ();
+    AE_CHECK_OK (AcpiInitializeSubsystem, Status);
     /* Get the command line options */
     while ((j = AcpiGetopt (argc, argv, AE_SUPPORTED_OPTIONS)) != EOF) switch(j)
+    {
     case 'b':
         if (strlen (AcpiGbl_Optarg) > 127)
+        {
             printf ("**** The length of command line (%u) exceeded maximum (127)\n",
                 (UINT32) strlen (AcpiGbl_Optarg));
-            return -1;
+            return (-1);
         case 'o':
             AcpiGbl_DbOpt_NoRegionSupport = TRUE;
+            break;
+        case 'r':
+            AcpiGbl_DisableAutoRepair = TRUE;
             break;
         case 't':
             #ifdef ACPI_DBG_TRACK_ALLOCATIONS
                 AcpiGbl_DisableMemTracking = TRUE;
     case '?':
     case 'h':
     default:
         usage();
-        return -1;
+        return (-1);
+    }
                 return (Status);
+            }
             /* Expand wildcards (Windows only) */
-            FileList = AsDoWildcard (Directory, Filename);
+            WildcardList = AsDoWildcard (Directory, Filename);
-            if (!FileList)
+            if (!WildcardList)
+            {
-                return -1;
+                return (-1);
+            }
-            while (*FileList)
+            while (*WildcardList)
+            {
                 FullPathname = AcpiOsAllocate (
-                    strlen (Directory) + strlen (*FileList) + 1);
+                    strlen (Directory) + strlen (*WildcardList) + 1);
                 /* Construct a full path to the file */
                         AcpiFormatException (Status));
                     goto enterloop;
+                }
                 AcpiOsFree (FullPathname);
-                AcpiOsFree (*FileList);
+                AcpiOsFree (*WildcardList);
-                *FileList = NULL;
+                *WildcardList = NULL;
-                FileList++;
+                WildcardList++;
                 /*
                  * Ignore an FACS or RSDT, we can't use them.
         /* Build a local RSDT with all tables and let ACPICA process the RSDT */
         Status = AeBuildLocalTables (TableCount, AeTableListHead);
         if (ACPI_FAILURE (Status))
         {
-            return -1;
+            return (-1);
+        }
         Status = AeInstallTables ();
         if (ACPI_FAILURE (Status))
+        {
             printf ("**** Could not load ACPI tables, %s\n", AcpiFormatException (Status));
+            goto enterloop;
+        }
+         /*
-            goto enterloop;
+          * Install most of the handlers.
           * Override some default region handlers, especially SystemMemory
           */
-        Status = AeInstallHandlers ();
+        Status = AeInstallEarlyHandlers ();
         if (ACPI_FAILURE (Status))
+        {
-            goto enterloop;
-        }
+            goto enterloop;
+        }
         /*
-         * TBD:
+        /*
-         * Need a way to call this after the "LOAD" command
+         * TBD: Need a way to call this after the "LOAD" command
          */
+        {
             printf ("**** Could not InitializeObjects, %s\n", AcpiFormatException (Status));
             goto enterloop;
+        }
+        /*
+         * Install handlers for "device driver" space IDs (EC,SMBus, etc.)
+         * and fixed event handlers
+         */
         AeInstallLateHandlers ();
         AeMiscellaneousTests ();
+    }
+    {
         AcpiDbRunBatchMode ();
+    }
     else if (AcpiGbl_BatchMode == 2)
+    {
-        AcpiDbExecute (BatchBuffer, NULL, EX_NO_SINGLE_STEP);
+        AcpiDbExecute (BatchBuffer, NULL, NULL, EX_NO_SINGLE_STEP);
+    }
     else
+    {
         /* Enter the debugger command loop */
         AcpiDbUserCommands (ACPI_DEBUGGER_COMMAND_PROMPT, NULL);
     }

Subversion Repositories Kolibri OS

(root)/drivers/devman/acpica/tools/acpiexec/aemain.c @ 1498 – Rev 1498 → 2216