diff options
Diffstat (limited to 'sys/contrib/dev/acpica/utglobal.c')
| -rw-r--r-- | sys/contrib/dev/acpica/utglobal.c | 56 |
1 files changed, 20 insertions, 36 deletions
diff --git a/sys/contrib/dev/acpica/utglobal.c b/sys/contrib/dev/acpica/utglobal.c index bcd60b5..52be7a0 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: 171 $ + * $Revision: 172 $ * *****************************************************************************/ @@ -275,11 +275,11 @@ const NATIVE_CHAR *AcpiGbl_DbSleepStates[ACPI_NUM_SLEEP_STATES] = { const ACPI_PREDEFINED_NAMES AcpiGbl_PreDefinedNames[] = { - {"_GPE", INTERNAL_TYPE_SCOPE, NULL}, - {"_PR_", INTERNAL_TYPE_SCOPE, NULL}, + {"_GPE", ACPI_TYPE_LOCAL_SCOPE, NULL}, + {"_PR_", ACPI_TYPE_LOCAL_SCOPE, NULL}, {"_SB_", ACPI_TYPE_DEVICE, NULL}, - {"_SI_", INTERNAL_TYPE_SCOPE, NULL}, - {"_TZ_", INTERNAL_TYPE_SCOPE, NULL}, + {"_SI_", ACPI_TYPE_LOCAL_SCOPE, NULL}, + {"_TZ_", ACPI_TYPE_LOCAL_SCOPE, NULL}, {"_REV", ACPI_TYPE_INTEGER, "2"}, {"_OS_", ACPI_TYPE_STRING, ACPI_OS_NAME}, {"_GL_", ACPI_TYPE_MUTEX, "0"}, @@ -324,17 +324,10 @@ const UINT8 AcpiGbl_NsProperties[] = ACPI_NS_NORMAL, /* 23 Address Handler */ ACPI_NS_NEWSCOPE | ACPI_NS_LOCAL, /* 24 Resource Desc */ ACPI_NS_NEWSCOPE | ACPI_NS_LOCAL, /* 25 Resource Field */ - ACPI_NS_NORMAL, /* 26 DefFieldDefn */ - ACPI_NS_NORMAL, /* 27 BankFieldDefn */ - ACPI_NS_NORMAL, /* 28 IndexFieldDefn */ - ACPI_NS_NORMAL, /* 29 If */ - ACPI_NS_NORMAL, /* 30 Else */ - ACPI_NS_NORMAL, /* 31 While */ - ACPI_NS_NEWSCOPE, /* 32 Scope */ - ACPI_NS_LOCAL, /* 33 DefAny */ - ACPI_NS_NORMAL, /* 34 Extra */ - ACPI_NS_NORMAL, /* 35 Data */ - ACPI_NS_NORMAL /* 36 Invalid */ + ACPI_NS_NEWSCOPE, /* 26 Scope */ + ACPI_NS_NORMAL, /* 27 Extra */ + ACPI_NS_NORMAL, /* 28 Data */ + ACPI_NS_NORMAL /* 29 Invalid */ }; @@ -580,17 +573,10 @@ static const NATIVE_CHAR *AcpiGbl_NsTypeNames[] = /* printable names of AC /* 23 */ "AddrHandler", /* 24 */ "ResourceDesc", /* 25 */ "ResourceFld", - /* 26 */ "RegionFldDfn", - /* 27 */ "BankFldDfn", - /* 28 */ "IndexFldDfn", - /* 29 */ "If", - /* 30 */ "Else", - /* 31 */ "While", - /* 32 */ "Scope", - /* 33 */ "DefAny", - /* 34 */ "Extra", - /* 35 */ "Data", - /* 36 */ "Invalid" + /* 26 */ "Scope", + /* 27 */ "Extra", + /* 28 */ "Data", + /* 39 */ "Invalid" }; @@ -599,7 +585,7 @@ AcpiUtGetTypeName ( ACPI_OBJECT_TYPE Type) { - if (Type > INTERNAL_TYPE_INVALID) + if (Type > ACPI_TYPE_INVALID) { return ((NATIVE_CHAR *) AcpiGbl_BadType); } @@ -662,7 +648,7 @@ AcpiUtGetMutexName ( * * FUNCTION: AcpiUtValidObjectType * - * PARAMETERS: None. + * PARAMETERS: Type - Object type to be validated * * RETURN: TRUE if valid object type * @@ -675,13 +661,11 @@ AcpiUtValidObjectType ( ACPI_OBJECT_TYPE Type) { - if (Type > ACPI_TYPE_MAX) + if (Type > ACPI_TYPE_LOCAL_MAX) { - if ((Type < INTERNAL_TYPE_BEGIN) || - (Type > INTERNAL_TYPE_MAX)) - { - return (FALSE); - } + /* Note: Assumes all TYPEs are contiguous (external/local) */ + + return (FALSE); } return (TRUE); @@ -866,7 +850,7 @@ AcpiUtInitGlobals ( AcpiGbl_RootNodeStruct.Name.Integer = ACPI_ROOT_NAME; AcpiGbl_RootNodeStruct.Descriptor = ACPI_DESC_TYPE_NAMED; - AcpiGbl_RootNodeStruct.Type = ACPI_TYPE_ANY; + AcpiGbl_RootNodeStruct.Type = ACPI_TYPE_DEVICE; AcpiGbl_RootNodeStruct.Child = NULL; AcpiGbl_RootNodeStruct.Peer = NULL; AcpiGbl_RootNodeStruct.Object = NULL; |
