diff options
Diffstat (limited to 'source/tools/acpiexec/aemain.c')
| -rw-r--r-- | source/tools/acpiexec/aemain.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/source/tools/acpiexec/aemain.c b/source/tools/acpiexec/aemain.c index 78ef6aa105710..502684a473fc3 100644 --- a/source/tools/acpiexec/aemain.c +++ b/source/tools/acpiexec/aemain.c @@ -192,7 +192,6 @@ BOOLEAN AcpiGbl_VerboseHandlers = FALSE; UINT8 AcpiGbl_RegionFillValue = 0; BOOLEAN AcpiGbl_IgnoreErrors = FALSE; BOOLEAN AcpiGbl_AbortLoopOnTimeout = FALSE; -BOOLEAN AcpiGbl_DbOpt_NoRegionSupport = FALSE; UINT8 AcpiGbl_UseHwReducedFadt = FALSE; BOOLEAN AcpiGbl_DoInterfaceTests = FALSE; BOOLEAN AcpiGbl_LoadTestTables = FALSE; @@ -675,8 +674,6 @@ main ( signal (SIGSEGV, AeSignalHandler); } - AeProcessInitFile(); - /* The remaining arguments are filenames for ACPI tables */ if (!argv[AcpiGbl_Optind]) @@ -734,7 +731,21 @@ main ( goto EnterDebugger; } + /* Read the entire namespace initialization file if requested */ + + Status = AeProcessInitFile(); + if (ACPI_FAILURE (Status)) + { + ExitCode = -1; + goto ErrorExit; + } + Status = AeLoadTables (); + if (ACPI_FAILURE (Status)) + { + ExitCode = -1; + goto ErrorExit; + } /* * Exit namespace initialization for the "load namespace only" option. @@ -795,6 +806,7 @@ main ( goto EnterDebugger; } + AeDisplayUnusedInitFileItems (); AeMiscellaneousTests (); @@ -841,7 +853,9 @@ NormalExit: ErrorExit: AeLateTest (); - AcpiOsFree (AcpiGbl_InitEntries); + + AeDeleteInitFileList (); + (void) AcpiTerminate (); AcDeleteTableList (ListHead); return (ExitCode); |