diff options
Diffstat (limited to 'sys/contrib/dev/acpica/utglobal.c')
| -rw-r--r-- | sys/contrib/dev/acpica/utglobal.c | 69 |
1 files changed, 39 insertions, 30 deletions
diff --git a/sys/contrib/dev/acpica/utglobal.c b/sys/contrib/dev/acpica/utglobal.c index 52be7a0..2611ea2 100644 --- a/sys/contrib/dev/acpica/utglobal.c +++ b/sys/contrib/dev/acpica/utglobal.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: utglobal - Global variables for the ACPI subsystem - * $Revision: 172 $ + * $Revision: 180 $ * *****************************************************************************/ @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp. * All rights reserved. * * 2. License @@ -224,9 +224,9 @@ Unknown: /* Debug switch - level and trace mask */ #ifdef ACPI_DEBUG_OUTPUT -UINT32 AcpiDbgLevel = DEBUG_DEFAULT; +UINT32 AcpiDbgLevel = ACPI_DEBUG_DEFAULT; #else -UINT32 AcpiDbgLevel = NORMAL_DEFAULT; +UINT32 AcpiDbgLevel = ACPI_NORMAL_DEFAULT; #endif /* Debug switch - layer (component) mask */ @@ -238,6 +238,7 @@ UINT32 AcpiGbl_NestingLevel = 0; /* Debugger globals */ BOOLEAN AcpiGbl_DbTerminateThreads = FALSE; +BOOLEAN AcpiGbl_AbortMethod = FALSE; BOOLEAN AcpiGbl_MethodExecuting = FALSE; /* System flags */ @@ -250,9 +251,13 @@ BOOLEAN AcpiGbl_Shutdown = TRUE; const UINT8 AcpiGbl_DecodeTo8bit [8] = {1,2,4,8,16,32,64,128}; -const NATIVE_CHAR *AcpiGbl_DbSleepStates[ACPI_NUM_SLEEP_STATES] = { - "\\_S0_","\\_S1_","\\_S2_","\\_S3_", - "\\_S4_","\\_S5_","\\_S4B"}; +const char *AcpiGbl_DbSleepStates[ACPI_S_STATE_COUNT] = { + "\\_S0_", + "\\_S1_", + "\\_S2_", + "\\_S3_", + "\\_S4_", + "\\_S5_"}; /****************************************************************************** @@ -333,7 +338,7 @@ const UINT8 AcpiGbl_NsProperties[] = /* Hex to ASCII conversion table */ -static const NATIVE_CHAR AcpiGbl_HexToAscii[] = +static const char AcpiGbl_HexToAscii[] = {'0','1','2','3','4','5','6','7', '8','9','A','B','C','D','E','F'}; @@ -451,8 +456,9 @@ ACPI_FIXED_EVENT_INFO AcpiGbl_FixedEventInfo[ACPI_NUM_FIXED_EVENTS] = /* Region type decoding */ -const NATIVE_CHAR *AcpiGbl_RegionTypes[ACPI_NUM_PREDEFINED_REGIONS] = +const char *AcpiGbl_RegionTypes[ACPI_NUM_PREDEFINED_REGIONS] = { +/*! [Begin] no source code translation (keep these ASL Keywords as-is) */ "SystemMemory", "SystemIO", "PCI_Config", @@ -460,11 +466,12 @@ const NATIVE_CHAR *AcpiGbl_RegionTypes[ACPI_NUM_PREDEFINED_REGIONS] = "SMBus", "CMOS", "PCIBARTarget", - "DataTable", + "DataTable" +/*! [End] no source code translation !*/ }; -NATIVE_CHAR * +char * AcpiUtGetRegionName ( UINT8 SpaceId) { @@ -476,10 +483,10 @@ AcpiUtGetRegionName ( else if (SpaceId >= ACPI_NUM_PREDEFINED_REGIONS) { - return ("InvalidSpaceID"); + return ("InvalidSpaceId"); } - return ((NATIVE_CHAR *) AcpiGbl_RegionTypes[SpaceId]); + return ((char *) AcpiGbl_RegionTypes[SpaceId]); } @@ -497,7 +504,7 @@ AcpiUtGetRegionName ( /* Event type decoding */ -static const NATIVE_CHAR *AcpiGbl_EventTypes[ACPI_NUM_FIXED_EVENTS] = +static const char *AcpiGbl_EventTypes[ACPI_NUM_FIXED_EVENTS] = { "PM_Timer", "GlobalLock", @@ -507,7 +514,7 @@ static const NATIVE_CHAR *AcpiGbl_EventTypes[ACPI_NUM_FIXED_EVENTS] = }; -NATIVE_CHAR * +char * AcpiUtGetEventName ( UINT32 EventId) { @@ -517,7 +524,7 @@ AcpiUtGetEventName ( return ("InvalidEventID"); } - return ((NATIVE_CHAR *) AcpiGbl_EventTypes[EventId]); + return ((char *) AcpiGbl_EventTypes[EventId]); } @@ -542,10 +549,10 @@ AcpiUtGetEventName ( * indicatewhat type is actually going to be stored for this entry. */ -static const NATIVE_CHAR AcpiGbl_BadType[] = "UNDEFINED"; +static const char AcpiGbl_BadType[] = "UNDEFINED"; #define TYPE_NAME_LENGTH 12 /* Maximum length of each string */ -static const NATIVE_CHAR *AcpiGbl_NsTypeNames[] = /* printable names of ACPI types */ +static const char *AcpiGbl_NsTypeNames[] = /* printable names of ACPI types */ { /* 00 */ "Untyped", /* 01 */ "Integer", @@ -580,21 +587,21 @@ static const NATIVE_CHAR *AcpiGbl_NsTypeNames[] = /* printable names of AC }; -NATIVE_CHAR * +char * AcpiUtGetTypeName ( ACPI_OBJECT_TYPE Type) { if (Type > ACPI_TYPE_INVALID) { - return ((NATIVE_CHAR *) AcpiGbl_BadType); + return ((char *) AcpiGbl_BadType); } - return ((NATIVE_CHAR *) AcpiGbl_NsTypeNames[Type]); + return ((char *) AcpiGbl_NsTypeNames[Type]); } -NATIVE_CHAR * +char * AcpiUtGetObjectTypeName ( ACPI_OPERAND_OBJECT *ObjDesc) { @@ -627,7 +634,7 @@ AcpiUtGetObjectTypeName ( * ****************************************************************************/ -NATIVE_CHAR * +char * AcpiUtGetMutexName ( UINT32 MutexId) { @@ -768,11 +775,11 @@ AcpiUtInitGlobals ( AcpiGbl_MemoryLists[ACPI_MEM_LIST_OPERAND].ObjectSize = sizeof (ACPI_OPERAND_OBJECT); AcpiGbl_MemoryLists[ACPI_MEM_LIST_WALK].ObjectSize = sizeof (ACPI_WALK_STATE); - AcpiGbl_MemoryLists[ACPI_MEM_LIST_STATE].MaxCacheDepth = MAX_STATE_CACHE_DEPTH; - AcpiGbl_MemoryLists[ACPI_MEM_LIST_PSNODE].MaxCacheDepth = MAX_PARSE_CACHE_DEPTH; - AcpiGbl_MemoryLists[ACPI_MEM_LIST_PSNODE_EXT].MaxCacheDepth = MAX_EXTPARSE_CACHE_DEPTH; - AcpiGbl_MemoryLists[ACPI_MEM_LIST_OPERAND].MaxCacheDepth = MAX_OBJECT_CACHE_DEPTH; - AcpiGbl_MemoryLists[ACPI_MEM_LIST_WALK].MaxCacheDepth = MAX_WALK_CACHE_DEPTH; + AcpiGbl_MemoryLists[ACPI_MEM_LIST_STATE].MaxCacheDepth = ACPI_MAX_STATE_CACHE_DEPTH; + AcpiGbl_MemoryLists[ACPI_MEM_LIST_PSNODE].MaxCacheDepth = ACPI_MAX_PARSE_CACHE_DEPTH; + AcpiGbl_MemoryLists[ACPI_MEM_LIST_PSNODE_EXT].MaxCacheDepth = ACPI_MAX_EXTPARSE_CACHE_DEPTH; + AcpiGbl_MemoryLists[ACPI_MEM_LIST_OPERAND].MaxCacheDepth = ACPI_MAX_OBJECT_CACHE_DEPTH; + AcpiGbl_MemoryLists[ACPI_MEM_LIST_WALK].MaxCacheDepth = ACPI_MAX_WALK_CACHE_DEPTH; ACPI_MEM_TRACKING (AcpiGbl_MemoryLists[ACPI_MEM_LIST_GLOBAL].ListName = "Global Memory Allocation"); ACPI_MEM_TRACKING (AcpiGbl_MemoryLists[ACPI_MEM_LIST_NSNODE].ListName = "Namespace Nodes"); @@ -803,6 +810,10 @@ AcpiUtInitGlobals ( AcpiGbl_AcpiMutexInfo[i].UseCount = 0; } + /* GPE support */ + + AcpiGbl_GpeBlockListHead = NULL; + /* Global notify handlers */ AcpiGbl_SysNotify.Handler = NULL; @@ -840,8 +851,6 @@ AcpiUtInitGlobals ( /* Hardware oriented */ - AcpiGbl_GpeRegisterInfo = NULL; - AcpiGbl_GpeNumberInfo = NULL; AcpiGbl_EventsInitialized = FALSE; /* Namespace */ |
