Skip to content

Commit

Permalink
Headers: Update generation of the ACPICA library
Browse files Browse the repository at this point in the history
For windows only, ensure that debug output is disabled for
the "release" (non-debug) case.
  • Loading branch information
acpibob committed Mar 4, 2016
1 parent 9ed98dc commit 0af0f90
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 21 deletions.
2 changes: 1 addition & 1 deletion generate/msvc9/AcpiSubsystem.vcproj
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
FavorSizeOrSpeed="2"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\..\source\Include"
PreprocessorDefinitions="ACPI_LIBRARY;_WINDOWS;PROCESSOR_ARCHITECTURE=x86;WIN32"
PreprocessorDefinitions="ACPI_LIBRARY;_DEBUG;_WINDOWS;PROCESSOR_ARCHITECTURE=x86;WIN32"
StringPooling="true"
ExceptionHandling="0"
RuntimeLibrary="1"
Expand Down
41 changes: 21 additions & 20 deletions source/include/platform/acenv.h
Original file line number Diff line number Diff line change
Expand Up @@ -139,17 +139,28 @@
*
*****************************************************************************/

/* Common application configuration. All single threaded except for AcpiExec. */

#if (defined ACPI_ASL_COMPILER) || \
(defined ACPI_BIN_APP) || \
(defined ACPI_DUMP_APP) || \
(defined ACPI_HELP_APP) || \
(defined ACPI_NAMES_APP) || \
(defined ACPI_SRC_APP) || \
(defined ACPI_XTRACT_APP) || \
(defined ACPI_EXAMPLE_APP)
#define ACPI_APPLICATION
#define ACPI_SINGLE_THREADED
#endif

/* iASL configuration */

#ifdef ACPI_ASL_COMPILER
#define ACPI_APPLICATION
#define ACPI_DEBUG_OUTPUT
#define ACPI_CONSTANT_EVAL_ONLY
#define ACPI_LARGE_NAMESPACE_NODE
#define ACPI_DATA_TABLE_DISASSEMBLY
#define ACPI_SINGLE_THREADED
#define ACPI_32BIT_PHYSICAL_ADDRESS

#define ACPI_DISASSEMBLER 1
#endif

Expand All @@ -162,21 +173,6 @@
#define ACPI_DBG_TRACK_ALLOCATIONS
#endif

/*
* AcpiBin/AcpiDump/AcpiHelp/AcpiNames/AcpiSrc/AcpiXtract/Example
* configuration. All single threaded.
*/
#if (defined ACPI_BIN_APP) || \
(defined ACPI_DUMP_APP) || \
(defined ACPI_HELP_APP) || \
(defined ACPI_NAMES_APP) || \
(defined ACPI_SRC_APP) || \
(defined ACPI_XTRACT_APP) || \
(defined ACPI_EXAMPLE_APP)
#define ACPI_APPLICATION
#define ACPI_SINGLE_THREADED
#endif

/* AcpiHelp configuration. Error messages disabled. */

#ifdef ACPI_HELP_APP
Expand Down Expand Up @@ -211,11 +207,16 @@
#define ACPI_REDUCED_HARDWARE 1
#endif

/* Linkable ACPICA library */
/* Linkable ACPICA library. Two versions, one with full debug. */

#ifdef ACPI_LIBRARY
#define ACPI_USE_LOCAL_CACHE
#define ACPI_FULL_DEBUG
#define ACPI_DEBUGGER 1
#define ACPI_DISASSEMBLER 1

#ifdef _DEBUG
#define ACPI_DEBUG_OUTPUT
#endif
#endif

/* Common for all ACPICA applications */
Expand Down

0 comments on commit 0af0f90

Please sign in to comment.