diff options
Diffstat (limited to 'sys/contrib/dev/acpica/acmacros.h')
| -rw-r--r-- | sys/contrib/dev/acpica/acmacros.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/contrib/dev/acpica/acmacros.h b/sys/contrib/dev/acpica/acmacros.h index 1394c9c..8cfa916 100644 --- a/sys/contrib/dev/acpica/acmacros.h +++ b/sys/contrib/dev/acpica/acmacros.h @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acmacros.h - C macros for the entire subsystem. - * $Revision: 126 $ + * $Revision: 128 $ * *****************************************************************************/ @@ -182,7 +182,7 @@ #define ACPI_TO_POINTER(i) ACPI_PTR_ADD (void, (void *) NULL,(NATIVE_UINT)i) #define ACPI_TO_INTEGER(p) ACPI_PTR_DIFF (p,(void *) NULL) -#define ACPI_OFFSET(d,f) (ACPI_SIZE) ACPI_PTR_DIFF (&(((d *)0)->f),(void *) NULL) +#define ACPI_OFFSET(d,f) (ACPI_SIZE) ACPI_PTR_DIFF (&(((d *)0)->f),(void *) NULL) #define ACPI_FADT_OFFSET(f) ACPI_OFFSET (FADT_DESCRIPTOR, f) #define ACPI_CAST_PTR(t, p) ((t *)(void *)(p)) @@ -378,7 +378,7 @@ /* * Macros for the master AML opcode table */ -#if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUG) +#if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUG_OUTPUT) #define ACPI_OP(Name,PArgs,IArgs,ObjType,Class,Type,Flags) {Name,PArgs,IArgs,Flags,ObjType,Class,Type} #else #define ACPI_OP(Name,PArgs,IArgs,ObjType,Class,Type,Flags) {PArgs,IArgs,Flags,ObjType,Class,Type} @@ -444,11 +444,11 @@ /* * Error reporting. These versions add callers module and line#. Since - * _THIS_MODULE gets compiled out when ACPI_DEBUG isn't defined, only + * _THIS_MODULE gets compiled out when ACPI_DEBUG_OUTPUT isn't defined, only * use it in debug mode. */ -#ifdef ACPI_DEBUG +#ifdef ACPI_DEBUG_OUTPUT #define ACPI_REPORT_INFO(fp) {AcpiUtReportInfo(_THIS_MODULE,__LINE__,_COMPONENT); \ AcpiOsPrintf ACPI_PARAM_LIST(fp);} @@ -481,7 +481,7 @@ * Debug macros that are conditionally compiled */ -#ifdef ACPI_DEBUG +#ifdef ACPI_DEBUG_OUTPUT #define ACPI_MODULE_NAME(name) static char *_THIS_MODULE = name; @@ -616,9 +616,9 @@ /* * Some code only gets executed when the debugger is built in. * Note that this is entirely independent of whether the - * DEBUG_PRINT stuff (set by ACPI_DEBUG) is on, or not. + * DEBUG_PRINT stuff (set by ACPI_DEBUG_OUTPUT) is on, or not. */ -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER #define ACPI_DEBUGGER_EXEC(a) a #else #define ACPI_DEBUGGER_EXEC(a) @@ -627,7 +627,7 @@ /* * For 16-bit code, we want to shrink some things even though - * we are using ACPI_DEBUG to get the debug output + * we are using ACPI_DEBUG_OUTPUT to get the debug output */ #if ACPI_MACHINE_WIDTH == 16 #undef ACPI_DEBUG_ONLY_MEMBERS @@ -636,7 +636,7 @@ #endif -#ifdef ACPI_DEBUG +#ifdef ACPI_DEBUG_OUTPUT /* * 1) Set name to blanks * 2) Copy the object name |
