From 8825041d5ebe9d75680cba96bf00efc0754b9683 Mon Sep 17 00:00:00 2001 From: Lv Zheng Date: Mon, 23 May 2016 23:06:53 +0800 Subject: OSL: Add correct AcpiGbl_DebugTimeout export to allow acpiexec to link 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 to add this variable to other os specificy layer files in order to link. This patch makes it a global option so that it can always be linked. Lv Zheng. Signed-off-by: Lv Zheng --- source/include/acpixf.h | 2 ++ source/os_specific/service_layers/osunixxf.c | 3 --- source/os_specific/service_layers/oswinxf.c | 3 --- source/tools/acpiexec/aemain.c | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/source/include/acpixf.h b/source/include/acpixf.h index 6ced00db7..4f3f74791 100644 --- a/source/include/acpixf.h +++ b/source/include/acpixf.h @@ -357,6 +357,8 @@ ACPI_GLOBAL (ACPI_TABLE_FADT, AcpiGbl_FADT); ACPI_GLOBAL (UINT32, AcpiCurrentGpeCount); ACPI_GLOBAL (BOOLEAN, AcpiGbl_SystemAwakeAndRunning); +ACPI_INIT_GLOBAL (BOOLEAN, AcpiGbl_DebugTimeout, FALSE); + /***************************************************************************** * diff --git a/source/os_specific/service_layers/osunixxf.c b/source/os_specific/service_layers/osunixxf.c index c3a66d7b3..f04b59e65 100644 --- a/source/os_specific/service_layers/osunixxf.c +++ b/source/os_specific/service_layers/osunixxf.c @@ -136,9 +136,6 @@ ACPI_MODULE_NAME ("osunixxf") -BOOLEAN AcpiGbl_DebugTimeout = FALSE; - - /* Upcalls to AcpiExec */ void diff --git a/source/os_specific/service_layers/oswinxf.c b/source/os_specific/service_layers/oswinxf.c index 78a0526c4..07f284492 100644 --- a/source/os_specific/service_layers/oswinxf.c +++ b/source/os_specific/service_layers/oswinxf.c @@ -172,9 +172,6 @@ ACPI_OS_SEMAPHORE_INFO AcpiGbl_Semaphores[ACPI_OS_MAX_SEMAPHORES]; #endif /* ACPI_SINGLE_THREADED */ -BOOLEAN AcpiGbl_DebugTimeout = FALSE; - - /****************************************************************************** * * FUNCTION: AcpiOsTerminate diff --git a/source/tools/acpiexec/aemain.c b/source/tools/acpiexec/aemain.c index a645ffa27..90b6cfc5b 100644 --- a/source/tools/acpiexec/aemain.c +++ b/source/tools/acpiexec/aemain.c @@ -131,7 +131,6 @@ * Windows: The setargv.obj module must be linked in to automatically * expand wildcards. */ -extern BOOLEAN AcpiGbl_DebugTimeout; /* Local prototypes */ -- cgit v1.2.1