diff options
Diffstat (limited to 'sys/contrib/dev/acpica/nsobject.c')
-rw-r--r-- | sys/contrib/dev/acpica/nsobject.c | 55 |
1 files changed, 26 insertions, 29 deletions
diff --git a/sys/contrib/dev/acpica/nsobject.c b/sys/contrib/dev/acpica/nsobject.c index a6166c5..6ba1338 100644 --- a/sys/contrib/dev/acpica/nsobject.c +++ b/sys/contrib/dev/acpica/nsobject.c @@ -2,7 +2,7 @@ * * Module Name: nsobject - Utilities for objects attached to namespace * table entries - * $Revision: 73 $ + * $Revision: 78 $ * ******************************************************************************/ @@ -10,7 +10,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999, 2000, 2001, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp. * All rights reserved. * * 2. License @@ -126,7 +126,7 @@ #define _COMPONENT ACPI_NAMESPACE - MODULE_NAME ("nsobject") + ACPI_MODULE_NAME ("nsobject") /******************************************************************************* @@ -152,14 +152,14 @@ ACPI_STATUS AcpiNsAttachObject ( ACPI_NAMESPACE_NODE *Node, ACPI_OPERAND_OBJECT *Object, - ACPI_OBJECT_TYPE8 Type) + ACPI_OBJECT_TYPE Type) { ACPI_OPERAND_OBJECT *ObjDesc; ACPI_OPERAND_OBJECT *LastObjDesc; - ACPI_OBJECT_TYPE8 ObjectType = ACPI_TYPE_ANY; + ACPI_OBJECT_TYPE ObjectType = ACPI_TYPE_ANY; - FUNCTION_TRACE ("NsAttachObject"); + ACPI_FUNCTION_TRACE ("NsAttachObject"); /* @@ -169,7 +169,7 @@ AcpiNsAttachObject ( { /* Invalid handle */ - REPORT_ERROR (("NsAttachObject: Null NamedObj handle\n")); + ACPI_REPORT_ERROR (("NsAttachObject: Null NamedObj handle\n")); return_ACPI_STATUS (AE_BAD_PARAMETER); } @@ -177,15 +177,15 @@ AcpiNsAttachObject ( { /* Null object */ - REPORT_ERROR (("NsAttachObject: Null object, but type not ACPI_TYPE_ANY\n")); + ACPI_REPORT_ERROR (("NsAttachObject: Null object, but type not ACPI_TYPE_ANY\n")); return_ACPI_STATUS (AE_BAD_PARAMETER); } - if (!VALID_DESCRIPTOR_TYPE (Node, ACPI_DESC_TYPE_NAMED)) + if (ACPI_GET_DESCRIPTOR_TYPE (Node) != ACPI_DESC_TYPE_NAMED) { /* Not a name handle */ - REPORT_ERROR (("NsAttachObject: Invalid handle\n")); + ACPI_REPORT_ERROR (("NsAttachObject: Invalid handle\n")); return_ACPI_STATUS (AE_BAD_PARAMETER); } @@ -211,7 +211,7 @@ AcpiNsAttachObject ( * If the source object is a namespace Node with an attached object, * we will use that (attached) object */ - else if (VALID_DESCRIPTOR_TYPE (Object, ACPI_DESC_TYPE_NAMED) && + else if ((ACPI_GET_DESCRIPTOR_TYPE (Object) == ACPI_DESC_TYPE_NAMED) && ((ACPI_NAMESPACE_NODE *) Object)->Object) { /* @@ -259,7 +259,7 @@ AcpiNsAttachObject ( } - /* + /* * Handle objects with multiple descriptors - walk * to the end of the descriptor list */ @@ -301,7 +301,7 @@ AcpiNsDetachObject ( ACPI_OPERAND_OBJECT *ObjDesc; - FUNCTION_TRACE ("NsDetachObject"); + ACPI_FUNCTION_TRACE ("NsDetachObject"); ObjDesc = Node->Object; @@ -314,7 +314,7 @@ AcpiNsDetachObject ( /* Clear the entry in all cases */ Node->Object = NULL; - if (VALID_DESCRIPTOR_TYPE (ObjDesc, ACPI_DESC_TYPE_INTERNAL)) + if (ACPI_GET_DESCRIPTOR_TYPE (ObjDesc) == ACPI_DESC_TYPE_INTERNAL) { Node->Object = ObjDesc->Common.NextObject; if (Node->Object && @@ -328,8 +328,8 @@ AcpiNsDetachObject ( Node->Type = ACPI_TYPE_ANY; - ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Object=%p Value=%p Name %4.4s\n", - Node, ObjDesc, (char *) &Node->Name)); + ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Node %p [%4.4s] Object %p\n", + Node, (char *) &Node->Name, ObjDesc)); /* Remove one reference on the object (and all subobjects) */ @@ -353,7 +353,7 @@ ACPI_OPERAND_OBJECT * AcpiNsGetAttachedObject ( ACPI_NAMESPACE_NODE *Node) { - FUNCTION_TRACE_PTR ("NsGetAttachedObject", Node); + ACPI_FUNCTION_TRACE_PTR ("NsGetAttachedObject", Node); if (!Node) @@ -363,8 +363,8 @@ AcpiNsGetAttachedObject ( } if (!Node->Object || - ((!(VALID_DESCRIPTOR_TYPE (Node->Object, ACPI_DESC_TYPE_INTERNAL))) && - (!(VALID_DESCRIPTOR_TYPE (Node->Object, ACPI_DESC_TYPE_NAMED)))) || + ((ACPI_GET_DESCRIPTOR_TYPE (Node->Object) != ACPI_DESC_TYPE_INTERNAL) && + (ACPI_GET_DESCRIPTOR_TYPE (Node->Object) != ACPI_DESC_TYPE_NAMED)) || (Node->Object->Common.Type == INTERNAL_TYPE_DATA)) { return_PTR (NULL); @@ -389,7 +389,7 @@ ACPI_OPERAND_OBJECT * AcpiNsGetSecondaryObject ( ACPI_OPERAND_OBJECT *ObjDesc) { - FUNCTION_TRACE_PTR ("AcpiNsGetSecondaryObject", ObjDesc); + ACPI_FUNCTION_TRACE_PTR ("AcpiNsGetSecondaryObject", ObjDesc); if ((!ObjDesc) || @@ -408,11 +408,11 @@ AcpiNsGetSecondaryObject ( * * FUNCTION: AcpiNsAttachData * - * PARAMETERS: + * PARAMETERS: * * RETURN: Status * - * DESCRIPTION: + * DESCRIPTION: * ******************************************************************************/ @@ -427,7 +427,6 @@ AcpiNsAttachData ( ACPI_OPERAND_OBJECT *DataDesc; - /* */ PrevObjDesc = NULL; ObjDesc = Node->Object; @@ -475,11 +474,11 @@ AcpiNsAttachData ( * * FUNCTION: AcpiNsDetachData * - * PARAMETERS: + * PARAMETERS: * * RETURN: Status * - * DESCRIPTION: + * DESCRIPTION: * ******************************************************************************/ @@ -520,16 +519,15 @@ AcpiNsDetachData ( } - /******************************************************************************* * * FUNCTION: AcpiNsGetAttachedData * - * PARAMETERS: + * PARAMETERS: * * RETURN: Status * - * DESCRIPTION: + * DESCRIPTION: * ******************************************************************************/ @@ -559,4 +557,3 @@ AcpiNsGetAttachedData ( } - |