d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit was generated by cvs2svn to compensate for changes in r122945,

Browse Source 
which included commits to RCS files with non-trunk default branches.
This commit is contained in:
Nate Lawson 2003-11-21 21:24:31 +00:00
commit f4275c3682
2 changed files with 45 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/contrib/dev/acpica/dsmthdat.c
View File

@ -392,7 +392,6 @@ AcpiDsMethodDataSetValue (
{
ACPI_STATUS Status;
ACPI_NAMESPACE_NODE *Node;
ACPI_OPERAND_OBJECT *NewDesc = Object;
ACPI_FUNCTION_TRACE ("DsMethodDataSetValue");
@ -411,32 +410,17 @@ AcpiDsMethodDataSetValue (
return_ACPI_STATUS (Status);
}
/*
* If the object has just been created and is not attached to anything,
* (the reference count is 1), then we can just store it directly into
* the arg/local. Otherwise, we must copy it.
/*
* Increment ref count so object can't be deleted while installed.
* NOTE: We do not copy the object in order to preserve the call by
* reference semantics of ACPI Control Method invocation.
* (See ACPI Specification 2.0C)
*/
if (Object->Common.ReferenceCount > 1)
{
Status = AcpiUtCopyIobjectToIobject (Object, &NewDesc, WalkState);
if (ACPI_FAILURE (Status))
{
return_ACPI_STATUS (Status);
}
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Object Copied %p, new %p\n",
Object, NewDesc));
}
else
{
/* Increment ref count so object can't be deleted while installed */
AcpiUtAddReference (NewDesc);
}
AcpiUtAddReference (Object);
/* Install the object */
Node->Object = NewDesc;
Node->Object = Object;
return_ACPI_STATUS (Status);
}

40
sys/contrib/dev/acpica/utdelete.c
View File

@ -510,6 +510,7 @@ AcpiUtUpdateObjectReference (
UINT32 i;
ACPI_GENERIC_STATE *StateList = NULL;
ACPI_GENERIC_STATE *State;
ACPI_OPERAND_OBJECT *tmp;
ACPI_FUNCTION_TRACE_PTR ("UtUpdateObjectReference", Object);
@ -546,8 +547,15 @@ AcpiUtUpdateObjectReference (
{
case ACPI_TYPE_DEVICE:
AcpiUtUpdateRefCount (Object->Device.SystemNotify, Action);
AcpiUtUpdateRefCount (Object->Device.DeviceNotify, Action);
tmp = Object->Device.SystemNotify;
if (tmp && (tmp->Common.ReferenceCount <= 1) && Action == REF_DECREMENT)
Object->Device.SystemNotify = NULL;
AcpiUtUpdateRefCount (tmp, Action);
tmp = Object->Device.DeviceNotify;
if (tmp && (tmp->Common.ReferenceCount <= 1) && Action == REF_DECREMENT)
Object->Device.DeviceNotify = NULL;
AcpiUtUpdateRefCount (tmp, Action);
break;
@ -570,6 +578,10 @@ AcpiUtUpdateObjectReference (
{
goto ErrorExit;
}
tmp = Object->Package.Elements[i];
if (tmp && (tmp->Common.ReferenceCount <= 1) && Action == REF_DECREMENT)
Object->Package.Elements[i] = NULL;
}
break;
@ -582,6 +594,10 @@ AcpiUtUpdateObjectReference (
{
goto ErrorExit;
}
tmp = Object->BufferField.BufferObj;
if (tmp && (tmp->Common.ReferenceCount <= 1) && Action == REF_DECREMENT)
Object->BufferField.BufferObj = NULL;
break;
@ -593,6 +609,10 @@ AcpiUtUpdateObjectReference (
{
goto ErrorExit;
}
tmp = Object->Field.RegionObj;
if (tmp && (tmp->Common.ReferenceCount <= 1) && Action == REF_DECREMENT)
Object->Field.RegionObj = NULL;
break;
@ -605,12 +625,20 @@ AcpiUtUpdateObjectReference (
goto ErrorExit;
}
tmp = Object->BankField.BankObj;
if (tmp && (tmp->Common.ReferenceCount <= 1) && Action == REF_DECREMENT)
Object->BankField.BankObj = NULL;
Status = AcpiUtCreateUpdateStateAndPush (
Object->BankField.RegionObj, Action, &StateList);
if (ACPI_FAILURE (Status))
{
goto ErrorExit;
}
tmp = Object->BankField.RegionObj;
if (tmp && (tmp->Common.ReferenceCount <= 1) && Action == REF_DECREMENT)
Object->BankField.RegionObj = NULL;
break;
@ -623,12 +651,20 @@ AcpiUtUpdateObjectReference (
goto ErrorExit;
}
tmp = Object->IndexField.IndexObj;
if (tmp && (tmp->Common.ReferenceCount <= 1) && Action == REF_DECREMENT)
Object->IndexField.IndexObj = NULL;
Status = AcpiUtCreateUpdateStateAndPush (
Object->IndexField.DataObj, Action, &StateList);
if (ACPI_FAILURE (Status))
{
goto ErrorExit;
}
tmp = Object->IndexField.DataObj;
if (tmp && (tmp->Common.ReferenceCount <= 1) && Action == REF_DECREMENT)
Object->IndexField.DataObj = NULL;
break;