mirror of
https://github.com/acpica/acpica/
synced 2025-03-06 22:31:56 +03:00
Cleanup
date 2001.03.27.22.46.00; author rmoore1; state Exp;
This commit is contained in:
aystarik
parent
35e7812613
commit
d60b8884d3
@ -1,7 +1,7 @@
|
|||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
*
|
*
|
||||||
* Module Name: dsfield - Dispatcher field routines
|
* Module Name: dsfield - Dispatcher field routines
|
||||||
* $Revision: 1.32 $
|
* $Revision: 1.33 $
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
@ -143,7 +143,8 @@
|
|||||||
* FUNCTION: AcpiDsCreateField
|
* FUNCTION: AcpiDsCreateField
|
||||||
*
|
*
|
||||||
* PARAMETERS: Op - Op containing the Field definition and args
|
* PARAMETERS: Op - Op containing the Field definition and args
|
||||||
* RegionNode - Object for the containing Operation Region
|
* RegionNode - Object for the containing Operation Region
|
||||||
|
* ` WalkState - Current method state
|
||||||
*
|
*
|
||||||
* RETURN: Status
|
* RETURN: Status
|
||||||
*
|
*
|
||||||
@ -174,10 +175,8 @@ AcpiDsCreateField (
|
|||||||
if (!RegionNode)
|
if (!RegionNode)
|
||||||
{
|
{
|
||||||
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.Name,
|
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.Name,
|
||||||
ACPI_TYPE_REGION, IMODE_EXECUTE,
|
ACPI_TYPE_REGION, IMODE_EXECUTE,
|
||||||
NS_SEARCH_PARENT, WalkState,
|
NS_SEARCH_PARENT, WalkState, &RegionNode);
|
||||||
&RegionNode);
|
|
||||||
|
|
||||||
if (ACPI_FAILURE (Status))
|
if (ACPI_FAILURE (Status))
|
||||||
{
|
{
|
||||||
return_ACPI_STATUS (Status);
|
return_ACPI_STATUS (Status);
|
||||||
@ -210,9 +209,8 @@ AcpiDsCreateField (
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
AccessAttribute = (UINT8) Arg->Value.Integer;
|
AccessAttribute = (UINT8) Arg->Value.Integer;
|
||||||
FieldFlags = (UINT8)
|
FieldFlags = (UINT8) ((FieldFlags & FIELD_ACCESS_TYPE_MASK) ||
|
||||||
((FieldFlags & FIELD_ACCESS_TYPE_MASK) ||
|
((UINT8) (Arg->Value.Integer >> 8)));
|
||||||
((UINT8) (Arg->Value.Integer >> 8)));
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
||||||
@ -220,11 +218,9 @@ AcpiDsCreateField (
|
|||||||
|
|
||||||
Status = AcpiNsLookup (WalkState->ScopeInfo,
|
Status = AcpiNsLookup (WalkState->ScopeInfo,
|
||||||
(NATIVE_CHAR *) &((ACPI_PARSE2_OBJECT *)Arg)->Name,
|
(NATIVE_CHAR *) &((ACPI_PARSE2_OBJECT *)Arg)->Name,
|
||||||
INTERNAL_TYPE_DEF_FIELD,
|
INTERNAL_TYPE_DEF_FIELD, IMODE_LOAD_PASS1,
|
||||||
IMODE_LOAD_PASS1,
|
|
||||||
NS_NO_UPSEARCH | NS_DONT_OPEN_SCOPE,
|
NS_NO_UPSEARCH | NS_DONT_OPEN_SCOPE,
|
||||||
NULL, &Node);
|
NULL, &Node);
|
||||||
|
|
||||||
if (ACPI_FAILURE (Status))
|
if (ACPI_FAILURE (Status))
|
||||||
{
|
{
|
||||||
return_ACPI_STATUS (Status);
|
return_ACPI_STATUS (Status);
|
||||||
@ -237,7 +233,6 @@ AcpiDsCreateField (
|
|||||||
|
|
||||||
Status = AcpiAmlPrepDefFieldValue (Node, RegionNode, FieldFlags,
|
Status = AcpiAmlPrepDefFieldValue (Node, RegionNode, FieldFlags,
|
||||||
AccessAttribute, FieldBitPosition, Arg->Value.Size);
|
AccessAttribute, FieldBitPosition, Arg->Value.Size);
|
||||||
|
|
||||||
if (ACPI_FAILURE (Status))
|
if (ACPI_FAILURE (Status))
|
||||||
{
|
{
|
||||||
return_ACPI_STATUS (Status);
|
return_ACPI_STATUS (Status);
|
||||||
@ -261,7 +256,8 @@ AcpiDsCreateField (
|
|||||||
* FUNCTION: AcpiDsCreateBankField
|
* FUNCTION: AcpiDsCreateBankField
|
||||||
*
|
*
|
||||||
* PARAMETERS: Op - Op containing the Field definition and args
|
* PARAMETERS: Op - Op containing the Field definition and args
|
||||||
* RegionNode - Object for the containing Operation Region
|
* RegionNode - Object for the containing Operation Region
|
||||||
|
* ` WalkState - Current method state
|
||||||
*
|
*
|
||||||
* RETURN: Status
|
* RETURN: Status
|
||||||
*
|
*
|
||||||
@ -294,10 +290,8 @@ AcpiDsCreateBankField (
|
|||||||
if (!RegionNode)
|
if (!RegionNode)
|
||||||
{
|
{
|
||||||
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.Name,
|
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.Name,
|
||||||
ACPI_TYPE_REGION, IMODE_EXECUTE,
|
ACPI_TYPE_REGION, IMODE_EXECUTE,
|
||||||
NS_SEARCH_PARENT, WalkState,
|
NS_SEARCH_PARENT, WalkState, &RegionNode);
|
||||||
&RegionNode);
|
|
||||||
|
|
||||||
if (ACPI_FAILURE (Status))
|
if (ACPI_FAILURE (Status))
|
||||||
{
|
{
|
||||||
return_ACPI_STATUS (Status);
|
return_ACPI_STATUS (Status);
|
||||||
@ -309,11 +303,9 @@ AcpiDsCreateBankField (
|
|||||||
Arg = Arg->Next;
|
Arg = Arg->Next;
|
||||||
|
|
||||||
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.String,
|
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.String,
|
||||||
INTERNAL_TYPE_BANK_FIELD_DEFN,
|
INTERNAL_TYPE_BANK_FIELD_DEFN, IMODE_LOAD_PASS1,
|
||||||
IMODE_LOAD_PASS1,
|
NS_NO_UPSEARCH | NS_DONT_OPEN_SCOPE,
|
||||||
NS_NO_UPSEARCH | NS_DONT_OPEN_SCOPE,
|
NULL, &RegisterNode);
|
||||||
NULL, &RegisterNode);
|
|
||||||
|
|
||||||
if (ACPI_FAILURE (Status))
|
if (ACPI_FAILURE (Status))
|
||||||
{
|
{
|
||||||
return_ACPI_STATUS (Status);
|
return_ACPI_STATUS (Status);
|
||||||
@ -351,9 +343,8 @@ AcpiDsCreateBankField (
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
AccessAttribute = (UINT8) Arg->Value.Integer;
|
AccessAttribute = (UINT8) Arg->Value.Integer;
|
||||||
FieldFlags = (UINT8)
|
FieldFlags = (UINT8) ((FieldFlags & FIELD_ACCESS_TYPE_MASK) ||
|
||||||
((FieldFlags & FIELD_ACCESS_TYPE_MASK) ||
|
((UINT8) (Arg->Value.Integer >> 8)));
|
||||||
((UINT8) (Arg->Value.Integer >> 8)));
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
||||||
@ -361,11 +352,9 @@ AcpiDsCreateBankField (
|
|||||||
|
|
||||||
Status = AcpiNsLookup (WalkState->ScopeInfo,
|
Status = AcpiNsLookup (WalkState->ScopeInfo,
|
||||||
(NATIVE_CHAR *) &((ACPI_PARSE2_OBJECT *)Arg)->Name,
|
(NATIVE_CHAR *) &((ACPI_PARSE2_OBJECT *)Arg)->Name,
|
||||||
INTERNAL_TYPE_DEF_FIELD,
|
INTERNAL_TYPE_DEF_FIELD, IMODE_LOAD_PASS1,
|
||||||
IMODE_LOAD_PASS1,
|
|
||||||
NS_NO_UPSEARCH | NS_DONT_OPEN_SCOPE,
|
NS_NO_UPSEARCH | NS_DONT_OPEN_SCOPE,
|
||||||
NULL, &Node);
|
NULL, &Node);
|
||||||
|
|
||||||
if (ACPI_FAILURE (Status))
|
if (ACPI_FAILURE (Status))
|
||||||
{
|
{
|
||||||
return_ACPI_STATUS (Status);
|
return_ACPI_STATUS (Status);
|
||||||
@ -379,7 +368,6 @@ AcpiDsCreateBankField (
|
|||||||
Status = AcpiAmlPrepBankFieldValue (Node, RegionNode, RegisterNode,
|
Status = AcpiAmlPrepBankFieldValue (Node, RegionNode, RegisterNode,
|
||||||
BankValue, FieldFlags, AccessAttribute,
|
BankValue, FieldFlags, AccessAttribute,
|
||||||
FieldBitPosition, Arg->Value.Size);
|
FieldBitPosition, Arg->Value.Size);
|
||||||
|
|
||||||
if (ACPI_FAILURE (Status))
|
if (ACPI_FAILURE (Status))
|
||||||
{
|
{
|
||||||
return_ACPI_STATUS (Status);
|
return_ACPI_STATUS (Status);
|
||||||
@ -404,7 +392,8 @@ AcpiDsCreateBankField (
|
|||||||
* FUNCTION: AcpiDsCreateIndexField
|
* FUNCTION: AcpiDsCreateIndexField
|
||||||
*
|
*
|
||||||
* PARAMETERS: Op - Op containing the Field definition and args
|
* PARAMETERS: Op - Op containing the Field definition and args
|
||||||
* RegionNode - Object for the containing Operation Region
|
* RegionNode - Object for the containing Operation Region
|
||||||
|
* ` WalkState - Current method state
|
||||||
*
|
*
|
||||||
* RETURN: Status
|
* RETURN: Status
|
||||||
*
|
*
|
||||||
@ -436,10 +425,9 @@ AcpiDsCreateIndexField (
|
|||||||
/* First arg is the name of the Index register */
|
/* First arg is the name of the Index register */
|
||||||
|
|
||||||
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.String,
|
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.String,
|
||||||
ACPI_TYPE_ANY, IMODE_LOAD_PASS1,
|
ACPI_TYPE_ANY, IMODE_LOAD_PASS1,
|
||||||
NS_NO_UPSEARCH | NS_DONT_OPEN_SCOPE,
|
NS_NO_UPSEARCH | NS_DONT_OPEN_SCOPE,
|
||||||
NULL, &IndexRegisterNode);
|
NULL, &IndexRegisterNode);
|
||||||
|
|
||||||
if (ACPI_FAILURE (Status))
|
if (ACPI_FAILURE (Status))
|
||||||
{
|
{
|
||||||
return_ACPI_STATUS (Status);
|
return_ACPI_STATUS (Status);
|
||||||
@ -450,11 +438,9 @@ AcpiDsCreateIndexField (
|
|||||||
Arg = Arg->Next;
|
Arg = Arg->Next;
|
||||||
|
|
||||||
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.String,
|
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.String,
|
||||||
INTERNAL_TYPE_INDEX_FIELD_DEFN,
|
INTERNAL_TYPE_INDEX_FIELD_DEFN, IMODE_LOAD_PASS1,
|
||||||
IMODE_LOAD_PASS1,
|
NS_NO_UPSEARCH | NS_DONT_OPEN_SCOPE,
|
||||||
NS_NO_UPSEARCH | NS_DONT_OPEN_SCOPE,
|
NULL, &DataRegisterNode);
|
||||||
NULL, &DataRegisterNode);
|
|
||||||
|
|
||||||
if (ACPI_FAILURE (Status))
|
if (ACPI_FAILURE (Status))
|
||||||
{
|
{
|
||||||
return_ACPI_STATUS (Status);
|
return_ACPI_STATUS (Status);
|
||||||
@ -488,21 +474,18 @@ AcpiDsCreateIndexField (
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
AccessAttribute = (UINT8) Arg->Value.Integer;
|
AccessAttribute = (UINT8) Arg->Value.Integer;
|
||||||
FieldFlags = (UINT8)
|
FieldFlags = (UINT8) ((FieldFlags & FIELD_ACCESS_TYPE_MASK) ||
|
||||||
((FieldFlags & FIELD_ACCESS_TYPE_MASK) ||
|
((UINT8) (Arg->Value.Integer >> 8)));
|
||||||
((UINT8) (Arg->Value.Integer >> 8)));
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
||||||
case AML_NAMEDFIELD_OP:
|
case AML_NAMEDFIELD_OP:
|
||||||
|
|
||||||
Status = AcpiNsLookup (WalkState->ScopeInfo,
|
Status = AcpiNsLookup (WalkState->ScopeInfo,
|
||||||
(NATIVE_CHAR *) &((ACPI_PARSE2_OBJECT *)Arg)->Name,
|
(NATIVE_CHAR *) &((ACPI_PARSE2_OBJECT *)Arg)->Name,
|
||||||
INTERNAL_TYPE_INDEX_FIELD,
|
INTERNAL_TYPE_INDEX_FIELD, IMODE_LOAD_PASS1,
|
||||||
IMODE_LOAD_PASS1,
|
NS_NO_UPSEARCH | NS_DONT_OPEN_SCOPE,
|
||||||
NS_NO_UPSEARCH | NS_DONT_OPEN_SCOPE,
|
NULL, &Node);
|
||||||
NULL, &Node);
|
|
||||||
|
|
||||||
if (ACPI_FAILURE (Status))
|
if (ACPI_FAILURE (Status))
|
||||||
{
|
{
|
||||||
return_ACPI_STATUS (Status);
|
return_ACPI_STATUS (Status);
|
||||||
@ -513,10 +496,9 @@ AcpiDsCreateIndexField (
|
|||||||
* the object stack
|
* the object stack
|
||||||
*/
|
*/
|
||||||
|
|
||||||
Status = AcpiAmlPrepIndexFieldValue (Node, IndexRegisterNode, DataRegisterNode,
|
Status = AcpiAmlPrepIndexFieldValue (Node, IndexRegisterNode,
|
||||||
FieldFlags, AccessAttribute,
|
DataRegisterNode, FieldFlags, AccessAttribute,
|
||||||
FieldBitPosition, Arg->Value.Size);
|
FieldBitPosition, Arg->Value.Size);
|
||||||
|
|
||||||
if (ACPI_FAILURE (Status))
|
if (ACPI_FAILURE (Status))
|
||||||
{
|
{
|
||||||
return_ACPI_STATUS (Status);
|
return_ACPI_STATUS (Status);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user