mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-02-13 12:04:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix various formatting issues

Browse Source
This commit is contained in:
rmoore1 2006-05-16 20:14:38 +00:00
parent 6e787db082
commit 43c6f89d17
1 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
source/components/utilities/utdelete.c
View File

@ -1,7 +1,7 @@
/******************************************************************************* /*******************************************************************************
* *
* Module Name: utdelete - object deletion and reference count utilities * Module Name: utdelete - object deletion and reference count utilities
* $Revision: 1.116 $ * $Revision: 1.117 $
* *
******************************************************************************/ ******************************************************************************/
@ -295,17 +295,17 @@ AcpiUtDeleteInternalObj (
if (HandlerDesc) if (HandlerDesc)
{ {
if (HandlerDesc->AddressSpace.HandlerFlags & if (HandlerDesc->AddressSpace.HandlerFlags &
ACPI_ADDR_HANDLER_DEFAULT_INSTALLED) ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)
{ {
/* Deactivate region and free region context */ /* Deactivate region and free region context */
if (HandlerDesc->AddressSpace.Setup) if (HandlerDesc->AddressSpace.Setup)
{ {
(void) HandlerDesc->AddressSpace.Setup (Object, (void) HandlerDesc->AddressSpace.Setup (Object,
ACPI_REGION_DEACTIVATE, ACPI_REGION_DEACTIVATE,
HandlerDesc->AddressSpace.Context, HandlerDesc->AddressSpace.Context,
&SecondDesc->Extra.RegionContext); &SecondDesc->Extra.RegionContext);
} }
} }
AcpiUtRemoveReference (HandlerDesc); AcpiUtRemoveReference (HandlerDesc);
@ -340,14 +340,14 @@ AcpiUtDeleteInternalObj (
if (ObjPointer) if (ObjPointer)
{ {
ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS, "Deleting Object Subptr %p\n", ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS, "Deleting Object Subptr %p\n",
ObjPointer)); ObjPointer));
ACPI_FREE (ObjPointer); ACPI_FREE (ObjPointer);
} }
/* Now the object can be safely deleted */ /* Now the object can be safely deleted */
ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS, "Deleting Object %p [%s]\n", ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS, "Deleting Object %p [%s]\n",
Object, AcpiUtGetObjectTypeName (Object))); Object, AcpiUtGetObjectTypeName (Object)));
AcpiUtDeleteObjectDesc (Object); AcpiUtDeleteObjectDesc (Object);
return_VOID; return_VOID;
@ -425,12 +425,10 @@ AcpiUtUpdateRefCount (
NewCount = Count; NewCount = Count;
/* /*
* Perform the reference count action * Perform the reference count action (increment, decrement, force delete)
* (increment, decrement, or force delete)
*/ */
switch (Action) switch (Action)
{ {
case REF_INCREMENT: case REF_INCREMENT:
NewCount++; NewCount++;
@ -441,7 +439,6 @@ AcpiUtUpdateRefCount (
Object, NewCount)); Object, NewCount));
break; break;
case REF_DECREMENT: case REF_DECREMENT:
if (Count < 1) if (Count < 1)
@ -464,8 +461,7 @@ AcpiUtUpdateRefCount (
if (ACPI_GET_OBJECT_TYPE (Object) == ACPI_TYPE_METHOD) if (ACPI_GET_OBJECT_TYPE (Object) == ACPI_TYPE_METHOD)
{ {
ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS, ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS,
"Method Obj %p Refs=%X, [Decremented]\n", "Method Obj %p Refs=%X, [Decremented]\n", Object, NewCount));
Object, NewCount));
} }
Object->Common.ReferenceCount = NewCount; Object->Common.ReferenceCount = NewCount;
@ -473,22 +469,18 @@ AcpiUtUpdateRefCount (
{ {
AcpiUtDeleteInternalObj (Object); AcpiUtDeleteInternalObj (Object);
} }
break; break;
case REF_FORCE_DELETE: case REF_FORCE_DELETE:
ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS, ACPI_DEBUG_PRINT ((ACPI_DB_ALLOCATIONS,
"Obj %p Refs=%X, Force delete! (Set to 0)\n", "Obj %p Refs=%X, Force delete! (Set to 0)\n", Object, Count));
Object, Count));
NewCount = 0; NewCount = 0;
Object->Common.ReferenceCount = NewCount; Object->Common.ReferenceCount = NewCount;
AcpiUtDeleteInternalObj (Object); AcpiUtDeleteInternalObj (Object);
break; break;
default: default:
ACPI_ERROR ((AE_INFO, "Unknown action (%X)", Action)); ACPI_ERROR ((AE_INFO, "Unknown action (%X)", Action));
@ -501,13 +493,9 @@ AcpiUtUpdateRefCount (
*/ */
if (Count > ACPI_MAX_REFERENCE_COUNT) if (Count > ACPI_MAX_REFERENCE_COUNT)
{ {
ACPI_WARNING ((AE_INFO, ACPI_WARNING ((AE_INFO,
"Large Reference Count (%X) in object %p", "Large Reference Count (%X) in object %p", Count, Object));
Count, Object));
} }
return;
} }
@ -637,11 +625,11 @@ AcpiUtUpdateObjectReference (
case ACPI_TYPE_REGION: case ACPI_TYPE_REGION:
default: default:
break;/* No subobjects */ break; /* No subobjects for all other types */
} }
/* /*
* Now we can update the count in the main object. This can only * Now we can update the count in the main object. This can only
* happen after we update the sub-objects in case this causes the * happen after we update the sub-objects in case this causes the
* main object to be deleted. * main object to be deleted.
*/ */
@ -708,7 +696,7 @@ AcpiUtAddReference (
/* Increment the reference count */ /* Increment the reference count */
(void) AcpiUtUpdateObjectReference (Object, REF_INCREMENT); (void) AcpiUtUpdateObjectReference (Object, REF_INCREMENT);
return_VOID; return_VOID;
} }
@ -734,8 +722,8 @@ AcpiUtRemoveReference (
/* /*
* Allow a NULL pointer to be passed in, just ignore it. This saves * Allow a NULL pointer to be passed in, just ignore it. This saves
* each caller from having to check. Also, ignore NS nodes. * each caller from having to check. Also, ignore NS nodes.
* *
*/ */
if (!Object || if (!Object ||
@ -758,10 +746,10 @@ AcpiUtRemoveReference (
/* /*
* Decrement the reference count, and only actually delete the object * Decrement the reference count, and only actually delete the object
* if the reference count becomes 0. (Must also decrement the ref count * if the reference count becomes 0. (Must also decrement the ref count
* of all subobjects!) * of all subobjects!)
*/ */
(void) AcpiUtUpdateObjectReference (Object, REF_DECREMENT); (void) AcpiUtUpdateObjectReference (Object, REF_DECREMENT);
return_VOID; return_VOID;
} }