Print this page
update to acpica-unix2-20140114
acpica-unix2-20130823
PANKOVs restructure
*** 3,13 ****
* Module Name: utstate - state object support procedures
*
******************************************************************************/
/*
! * Copyright (C) 2000 - 2011, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
--- 3,13 ----
* Module Name: utstate - state object support procedures
*
******************************************************************************/
/*
! * Copyright (C) 2000 - 2014, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*** 105,123 ****
void
AcpiUtPushGenericState (
ACPI_GENERIC_STATE **ListHead,
ACPI_GENERIC_STATE *State)
{
! ACPI_FUNCTION_TRACE (UtPushGenericState);
/* Push the state object onto the front of the list (stack) */
State->Common.Next = *ListHead;
*ListHead = State;
!
! return_VOID;
}
/*******************************************************************************
*
--- 105,122 ----
void
AcpiUtPushGenericState (
ACPI_GENERIC_STATE **ListHead,
ACPI_GENERIC_STATE *State)
{
! ACPI_FUNCTION_ENTRY ();
/* Push the state object onto the front of the list (stack) */
State->Common.Next = *ListHead;
*ListHead = State;
! return;
}
/*******************************************************************************
*
*** 136,146 ****
ACPI_GENERIC_STATE **ListHead)
{
ACPI_GENERIC_STATE *State;
! ACPI_FUNCTION_TRACE (UtPopGenericState);
/* Remove the state object at the head of the list (stack) */
State = *ListHead;
--- 135,145 ----
ACPI_GENERIC_STATE **ListHead)
{
ACPI_GENERIC_STATE *State;
! ACPI_FUNCTION_ENTRY ();
/* Remove the state object at the head of the list (stack) */
State = *ListHead;
*** 149,159 ****
/* Update the list head */
*ListHead = State->Common.Next;
}
! return_PTR (State);
}
/*******************************************************************************
*
--- 148,158 ----
/* Update the list head */
*ListHead = State->Common.Next;
}
! return (State);
}
/*******************************************************************************
*
*** 207,225 ****
void)
{
ACPI_GENERIC_STATE *State;
! ACPI_FUNCTION_TRACE (UtCreateThreadState);
/* Create the generic state object */
State = AcpiUtCreateGenericState ();
if (!State)
{
! return_PTR (NULL);
}
/* Init fields specific to the update struct */
State->Common.DescriptorType = ACPI_DESC_TYPE_STATE_THREAD;
--- 206,224 ----
void)
{
ACPI_GENERIC_STATE *State;
! ACPI_FUNCTION_ENTRY ();
/* Create the generic state object */
State = AcpiUtCreateGenericState ();
if (!State)
{
! return (NULL);
}
/* Init fields specific to the update struct */
State->Common.DescriptorType = ACPI_DESC_TYPE_STATE_THREAD;
*** 231,241 ****
{
ACPI_ERROR ((AE_INFO, "Invalid zero ID from AcpiOsGetThreadId"));
State->Thread.ThreadId = (ACPI_THREAD_ID) 1;
}
! return_PTR ((ACPI_THREAD_STATE *) State);
}
/*******************************************************************************
*
--- 230,240 ----
{
ACPI_ERROR ((AE_INFO, "Invalid zero ID from AcpiOsGetThreadId"));
State->Thread.ThreadId = (ACPI_THREAD_ID) 1;
}
! return ((ACPI_THREAD_STATE *) State);
}
/*******************************************************************************
*
*** 258,285 ****
UINT16 Action)
{
ACPI_GENERIC_STATE *State;
! ACPI_FUNCTION_TRACE_PTR (UtCreateUpdateState, Object);
/* Create the generic state object */
State = AcpiUtCreateGenericState ();
if (!State)
{
! return_PTR (NULL);
}
/* Init fields specific to the update struct */
State->Common.DescriptorType = ACPI_DESC_TYPE_STATE_UPDATE;
State->Update.Object = Object;
State->Update.Value = Action;
!
! return_PTR (State);
}
/*******************************************************************************
*
--- 257,283 ----
UINT16 Action)
{
ACPI_GENERIC_STATE *State;
! ACPI_FUNCTION_ENTRY ();
/* Create the generic state object */
State = AcpiUtCreateGenericState ();
if (!State)
{
! return (NULL);
}
/* Init fields specific to the update struct */
State->Common.DescriptorType = ACPI_DESC_TYPE_STATE_UPDATE;
State->Update.Object = Object;
State->Update.Value = Action;
! return (State);
}
/*******************************************************************************
*
*** 301,330 ****
UINT16 Index)
{
ACPI_GENERIC_STATE *State;
! ACPI_FUNCTION_TRACE_PTR (UtCreatePkgState, InternalObject);
/* Create the generic state object */
State = AcpiUtCreateGenericState ();
if (!State)
{
! return_PTR (NULL);
}
/* Init fields specific to the update struct */
State->Common.DescriptorType = ACPI_DESC_TYPE_STATE_PACKAGE;
State->Pkg.SourceObject = (ACPI_OPERAND_OBJECT *) InternalObject;
State->Pkg.DestObject = ExternalObject;
State->Pkg.Index= Index;
State->Pkg.NumPackages = 1;
!
! return_PTR (State);
}
/*******************************************************************************
*
--- 299,327 ----
UINT16 Index)
{
ACPI_GENERIC_STATE *State;
! ACPI_FUNCTION_ENTRY ();
/* Create the generic state object */
State = AcpiUtCreateGenericState ();
if (!State)
{
! return (NULL);
}
/* Init fields specific to the update struct */
State->Common.DescriptorType = ACPI_DESC_TYPE_STATE_PACKAGE;
State->Pkg.SourceObject = (ACPI_OPERAND_OBJECT *) InternalObject;
State->Pkg.DestObject = ExternalObject;
State->Pkg.Index= Index;
State->Pkg.NumPackages = 1;
! return (State);
}
/*******************************************************************************
*
*** 344,370 ****
void)
{
ACPI_GENERIC_STATE *State;
! ACPI_FUNCTION_TRACE (UtCreateControlState);
/* Create the generic state object */
State = AcpiUtCreateGenericState ();
if (!State)
{
! return_PTR (NULL);
}
/* Init fields specific to the control struct */
State->Common.DescriptorType = ACPI_DESC_TYPE_STATE_CONTROL;
State->Common.State = ACPI_CONTROL_CONDITIONAL_EXECUTING;
!
! return_PTR (State);
}
/*******************************************************************************
*
--- 341,366 ----
void)
{
ACPI_GENERIC_STATE *State;
! ACPI_FUNCTION_ENTRY ();
/* Create the generic state object */
State = AcpiUtCreateGenericState ();
if (!State)
{
! return (NULL);
}
/* Init fields specific to the control struct */
State->Common.DescriptorType = ACPI_DESC_TYPE_STATE_CONTROL;
State->Common.State = ACPI_CONTROL_CONDITIONAL_EXECUTING;
! return (State);
}
/*******************************************************************************
*
*** 381,398 ****
void
AcpiUtDeleteGenericState (
ACPI_GENERIC_STATE *State)
{
! ACPI_FUNCTION_TRACE (UtDeleteGenericState);
/* Ignore null state */
if (State)
{
(void) AcpiOsReleaseObject (AcpiGbl_StateCache, State);
}
! return_VOID;
}
-
-
--- 377,392 ----
void
AcpiUtDeleteGenericState (
ACPI_GENERIC_STATE *State)
{
! ACPI_FUNCTION_ENTRY ();
/* Ignore null state */
if (State)
{
(void) AcpiOsReleaseObject (AcpiGbl_StateCache, State);
}
! return;
}