Commit 93556118 authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki

ACPICA: Remove unnecessary conditional compilation

ACPICA commit eea1f0e561893b6d6417913b2d224082fe3a0a5e

Remove use of ACPI_DEBUGGER and ACPI_DISASSEMBLER where these
defines are used around entire modules.

Note: This type of code also causes problems with IDEs.

Link: https://github.com/acpica/acpica/commit/eea1f0e5Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 62fcce91
...@@ -123,7 +123,6 @@ acpi-y += \ ...@@ -123,7 +123,6 @@ acpi-y += \
rsaddr.o \ rsaddr.o \
rscalc.o \ rscalc.o \
rscreate.o \ rscreate.o \
rsdump.o \
rsdumpinfo.o \ rsdumpinfo.o \
rsinfo.o \ rsinfo.o \
rsio.o \ rsio.o \
...@@ -179,6 +178,7 @@ acpi-y += \ ...@@ -179,6 +178,7 @@ acpi-y += \
utxfmutex.o utxfmutex.o
acpi-$(ACPI_FUTURE_USAGE) += \ acpi-$(ACPI_FUTURE_USAGE) += \
rsdump.o \
utcache.o \ utcache.o \
utfileio.o \ utfileio.o \
utprint.o \ utprint.o \
......
...@@ -44,6 +44,12 @@ ...@@ -44,6 +44,12 @@
#ifndef __ACDEBUG_H__ #ifndef __ACDEBUG_H__
#define __ACDEBUG_H__ #define __ACDEBUG_H__
/* The debugger is used in conjunction with the disassembler most of time */
#ifdef ACPI_DISASSEMBLER
#include "acdisasm.h"
#endif
#define ACPI_DEBUG_BUFFER_SIZE 0x4000 /* 16K buffer for return objects */ #define ACPI_DEBUG_BUFFER_SIZE 0x4000 /* 16K buffer for return objects */
struct acpi_db_command_info { struct acpi_db_command_info {
......
...@@ -51,7 +51,6 @@ ACPI_MODULE_NAME("rsdump") ...@@ -51,7 +51,6 @@ ACPI_MODULE_NAME("rsdump")
/* /*
* All functions in this module are used by the AML Debugger only * All functions in this module are used by the AML Debugger only
*/ */
#if defined(ACPI_DEBUGGER)
/* Local prototypes */ /* Local prototypes */
static void acpi_rs_out_string(char *title, char *value); static void acpi_rs_out_string(char *title, char *value);
...@@ -565,5 +564,3 @@ static void acpi_rs_dump_word_list(u16 length, u16 *data) ...@@ -565,5 +564,3 @@ static void acpi_rs_dump_word_list(u16 length, u16 *data)
acpi_os_printf("%25s%2.2X : %4.4X\n", "Word", i, data[i]); acpi_os_printf("%25s%2.2X : %4.4X\n", "Word", i, data[i]);
} }
} }
#endif
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
#ifdef ACPI_LIBRARY #ifdef ACPI_LIBRARY
#define ACPI_USE_LOCAL_CACHE #define ACPI_USE_LOCAL_CACHE
#define ACPI_FUTURE_USAGE #define ACPI_FULL_DEBUG
#endif #endif
/* Common for all ACPICA applications */ /* Common for all ACPICA applications */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment