Skip to content

Commit

Permalink
OSL: Add correct AcpiGbl_DebugTimeout export to allow acpiexec to link
Browse files Browse the repository at this point in the history
The AcpiGbl_DebugTimeout which is used by acpiexec -et option now is only
implemented in oswinxf.c and used for WIN32 builds. This makes it very
difficult to remember that we need to add this variable to other os
specific layer files in order for linking. This patch makes it a global
option dependent on ACPI_APPLICATION so that it can always be linked by the
applications. Lv Zheng.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
  • Loading branch information
Lv Zheng committed Jul 22, 2016
1 parent 1c49d21 commit 408198c
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 7 deletions.
1 change: 1 addition & 0 deletions source/include/acglobal.h
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,7 @@ ACPI_GLOBAL (const char, *AcpiGbl_PldShapeList[]);

ACPI_INIT_GLOBAL (ACPI_FILE, AcpiGbl_DebugFile, NULL);
ACPI_INIT_GLOBAL (ACPI_FILE, AcpiGbl_OutputFile, NULL);
ACPI_INIT_GLOBAL (BOOLEAN, AcpiGbl_DebugTimeout, FALSE);

/* Print buffer */

Expand Down
3 changes: 0 additions & 3 deletions source/os_specific/service_layers/osunixxf.c
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,6 @@
ACPI_MODULE_NAME ("osunixxf")


BOOLEAN AcpiGbl_DebugTimeout = FALSE;


/* Upcalls to AcpiExec */

void
Expand Down
3 changes: 0 additions & 3 deletions source/os_specific/service_layers/oswinxf.c
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,6 @@ ACPI_OS_SEMAPHORE_INFO AcpiGbl_Semaphores[ACPI_OS_MAX_SEMAPHORES];

#endif /* ACPI_SINGLE_THREADED */

BOOLEAN AcpiGbl_DebugTimeout = FALSE;


/******************************************************************************
*
* FUNCTION: AcpiOsTerminate
Expand Down
1 change: 0 additions & 1 deletion source/tools/acpiexec/aemain.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@
* Windows: The setargv.obj module must be linked in to automatically
* expand wildcards.
*/
extern BOOLEAN AcpiGbl_DebugTimeout;

/* Local prototypes */

Expand Down

0 comments on commit 408198c

Please sign in to comment.