diff options
Diffstat (limited to 'sys/contrib/dev/acpica/acglobal.h')
| -rw-r--r-- | sys/contrib/dev/acpica/acglobal.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/contrib/dev/acpica/acglobal.h b/sys/contrib/dev/acpica/acglobal.h index d39861e..37d5c34 100644 --- a/sys/contrib/dev/acpica/acglobal.h +++ b/sys/contrib/dev/acpica/acglobal.h @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acglobal.h - Declarations for global variables - * $Revision: 128 $ + * $Revision: 130 $ * *****************************************************************************/ @@ -243,8 +243,12 @@ extern const NATIVE_CHAR *AcpiGbl_RegionTypes[ACPI_NUM_PREDEFINED_ ****************************************************************************/ #define NUM_NS_TYPES INTERNAL_TYPE_INVALID+1 -#define NUM_PREDEFINED_NAMES 9 +#if defined (ACPI_NO_METHOD_EXECUTION) || defined (ACPI_CONSTANT_EVAL_ONLY) +#define NUM_PREDEFINED_NAMES 10 +#else +#define NUM_PREDEFINED_NAMES 9 +#endif ACPI_EXTERN ACPI_NAMESPACE_NODE AcpiGbl_RootNodeStruct; ACPI_EXTERN ACPI_NAMESPACE_NODE *AcpiGbl_RootNode; @@ -252,7 +256,7 @@ ACPI_EXTERN ACPI_NAMESPACE_NODE *AcpiGbl_RootNode; extern const UINT8 AcpiGbl_NsProperties[NUM_NS_TYPES]; extern const ACPI_PREDEFINED_NAMES AcpiGbl_PreDefinedNames [NUM_PREDEFINED_NAMES]; -#ifdef ACPI_DEBUG +#ifdef ACPI_DEBUG_OUTPUT ACPI_EXTERN UINT32 AcpiGbl_CurrentNodeCount; ACPI_EXTERN UINT32 AcpiGbl_CurrentNodeSize; ACPI_EXTERN UINT32 AcpiGbl_MaxConcurrentNodeCount; @@ -336,7 +340,7 @@ ACPI_EXTERN BOOLEAN AcpiGbl_DbOpt_verbose; #endif -#ifdef ENABLE_DEBUGGER +#ifdef ACPI_DEBUGGER extern BOOLEAN AcpiGbl_MethodExecuting; extern BOOLEAN AcpiGbl_DbTerminateThreads; @@ -378,7 +382,7 @@ ACPI_EXTERN UINT32 AcpiGbl_SizeOfMethodTrees; ACPI_EXTERN UINT32 AcpiGbl_SizeOfNodeEntries; ACPI_EXTERN UINT32 AcpiGbl_SizeOfAcpiObjects; -#endif /* ENABLE_DEBUGGER */ +#endif /* ACPI_DEBUGGER */ #endif /* __ACGLOBAL_H__ */ |
