mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-03-09 15:51:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Removed all instances of NATIVE_CHAR due to disuse/inconsistent use.

Browse Source 
date	2002.12.10.21.00.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 16:56:27 +00:00
parent fbd62ddf56
commit d7233a2c01
2 changed files with 82 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
source/components/dispatcher/dsfield.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: dsfield - Dispatcher field routines
* $Revision: 1.62 $
* $Revision: 1.70 $
*
*****************************************************************************/
@ -166,7 +166,7 @@ AcpiDsCreateBufferField (
/* Get the NameString argument */
if (Op->Opcode == AML_CREATE_FIELD_OP)
if (Op->Common.AmlOpcode == AML_CREATE_FIELD_OP)
{
Arg = AcpiPsGetArg (Op, 3);
}
@ -199,11 +199,12 @@ AcpiDsCreateBufferField (
/*
* Enter the NameString into the namespace
*/
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.String,
INTERNAL_TYPE_DEF_ANY, ACPI_IMODE_LOAD_PASS1,
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Common.Value.String,
ACPI_TYPE_ANY, ACPI_IMODE_LOAD_PASS1,
Flags, WalkState, &(Node));
if (ACPI_FAILURE (Status))
{
ACPI_REPORT_NSERROR (Arg->Common.Value.String, Status);
return_ACPI_STATUS (Status);
}
@ -211,7 +212,7 @@ AcpiDsCreateBufferField (
* for now, we will put it in the "op" object that the parser uses, so we
* can get it again at the end of this scope
*/
Op->Node = Node;
Op->Common.Node = Node;
/*
* If there is no object attached to the node, this node was just created and
@ -244,8 +245,8 @@ AcpiDsCreateBufferField (
* operands must be evaluated.
*/
SecondDesc = ObjDesc->Common.NextObject;
SecondDesc->Extra.AmlStart = ((ACPI_PARSE2_OBJECT *) Op)->Data;
SecondDesc->Extra.AmlLength = ((ACPI_PARSE2_OBJECT *) Op)->Length;
SecondDesc->Extra.AmlStart = Op->Named.Data;
SecondDesc->Extra.AmlLength = Op->Named.Length;
ObjDesc->BufferField.Node = Node;
/* Attach constructed field descriptors to parent node */
@ -288,6 +289,7 @@ AcpiDsGetFieldNames (
ACPI_PARSE_OBJECT *Arg)
{
ACPI_STATUS Status;
ACPI_INTEGER Position;
ACPI_FUNCTION_TRACE_PTR ("DsGetFieldNames", Info);
@ -307,18 +309,20 @@ AcpiDsGetFieldNames (
* 2) AccessAs - changes the access mode
* 3) Name - Enters a new named field into the namespace
*/
switch (Arg->Opcode)
switch (Arg->Common.AmlOpcode)
{
case AML_INT_RESERVEDFIELD_OP:
if (((ACPI_INTEGER) Info->FieldBitPosition + Arg->Value.Size) >
ACPI_UINT32_MAX)
Position = (ACPI_INTEGER) Info->FieldBitPosition
+ (ACPI_INTEGER) Arg->Common.Value.Size;
if (Position > ACPI_UINT32_MAX)
{
ACPI_REPORT_ERROR (("Bit offset within field too large (> 0xFFFFFFFF)\n"));
return_ACPI_STATUS (AE_SUPPORT);
}
Info->FieldBitPosition += Arg->Value.Size;
Info->FieldBitPosition = (UINT32) Position;
break;
@ -331,9 +335,9 @@ AcpiDsGetFieldNames (
* In FieldFlags, preserve the flag bits other than the ACCESS_TYPE bits
*/
Info->FieldFlags = (UINT8) ((Info->FieldFlags & ~(AML_FIELD_ACCESS_TYPE_MASK)) |
((UINT8) (Arg->Value.Integer32 >> 8)));
((UINT8) (Arg->Common.Value.Integer32 >> 8)));
Info->Attribute = (UINT8) (Arg->Value.Integer32);
Info->Attribute = (UINT8) (Arg->Common.Value.Integer32);
break;
@ -342,23 +346,23 @@ AcpiDsGetFieldNames (
/* Lookup the name */
Status = AcpiNsLookup (WalkState->ScopeInfo,
(NATIVE_CHAR *) &((ACPI_PARSE2_OBJECT *)Arg)->Name,
(char *) &Arg->Named.Name,
Info->FieldType, ACPI_IMODE_EXECUTE, ACPI_NS_DONT_OPEN_SCOPE,
WalkState, &Info->FieldNode);
if (ACPI_FAILURE (Status))
{
ACPI_REPORT_NSERROR ((char *) &Arg->Named.Name, Status);
if (Status != AE_ALREADY_EXISTS)
{
return_ACPI_STATUS (Status);
}
ACPI_REPORT_ERROR (("Field name [%4.4s] already exists in current scope\n",
&((ACPI_PARSE2_OBJECT *)Arg)->Name));
/* Already exists, ignore error */
}
else
{
Arg->Node = Info->FieldNode;
Info->FieldBitLength = Arg->Value.Size;
Arg->Common.Node = Info->FieldNode;
Info->FieldBitLength = Arg->Common.Value.Size;
/* Create and initialize an object for the new Field Node */
@ -371,11 +375,13 @@ AcpiDsGetFieldNames (
/* Keep track of bit position for the next field */
if (((ACPI_INTEGER) Info->FieldBitPosition + Arg->Value.Size) >
ACPI_UINT32_MAX)
Position = (ACPI_INTEGER) Info->FieldBitPosition
+ (ACPI_INTEGER) Arg->Common.Value.Size;
if (Position > ACPI_UINT32_MAX)
{
ACPI_REPORT_ERROR (("Field [%4.4s] bit offset too large (> 0xFFFFFFFF)\n",
&Info->FieldNode->Name));
(char *) &Info->FieldNode->Name));
return_ACPI_STATUS (AE_SUPPORT);
}
@ -386,11 +392,11 @@ AcpiDsGetFieldNames (
default:
ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Invalid opcode in field list: %X\n",
Arg->Opcode));
return_ACPI_STATUS (AE_AML_ERROR);
Arg->Common.AmlOpcode));
return_ACPI_STATUS (AE_AML_BAD_OPCODE);
}
Arg = Arg->Next;
Arg = Arg->Common.Next;
}
return_ACPI_STATUS (AE_OK);
@ -417,7 +423,7 @@ AcpiDsCreateField (
ACPI_NAMESPACE_NODE *RegionNode,
ACPI_WALK_STATE *WalkState)
{
ACPI_STATUS Status = AE_AML_ERROR;
ACPI_STATUS Status;
ACPI_PARSE_OBJECT *Arg;
ACPI_CREATE_FIELD_INFO Info;
@ -427,30 +433,31 @@ AcpiDsCreateField (
/* First arg is the name of the parent OpRegion (must already exist) */
Arg = Op->Value.Arg;
Arg = Op->Common.Value.Arg;
if (!RegionNode)
{
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.Name,
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Common.Value.Name,
ACPI_TYPE_REGION, ACPI_IMODE_EXECUTE,
ACPI_NS_SEARCH_PARENT, WalkState, &RegionNode);
if (ACPI_FAILURE (Status))
{
ACPI_REPORT_NSERROR (Arg->Common.Value.Name, Status);
return_ACPI_STATUS (Status);
}
}
/* Second arg is the field flags */
Arg = Arg->Next;
Info.FieldFlags = Arg->Value.Integer8;
Arg = Arg->Common.Next;
Info.FieldFlags = Arg->Common.Value.Integer8;
Info.Attribute = 0;
/* Each remaining arg is a Named Field */
Info.FieldType = INTERNAL_TYPE_REGION_FIELD;
Info.FieldType = ACPI_TYPE_LOCAL_REGION_FIELD;
Info.RegionNode = RegionNode;
Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Next);
Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Common.Next);
return_ACPI_STATUS (Status);
}
@ -476,7 +483,7 @@ AcpiDsInitFieldObjects (
ACPI_PARSE_OBJECT *Op,
ACPI_WALK_STATE *WalkState)
{
ACPI_STATUS Status = AE_AML_ERROR;
ACPI_STATUS Status;
ACPI_PARSE_OBJECT *Arg = NULL;
ACPI_NAMESPACE_NODE *Node;
UINT8 Type = 0;
@ -489,18 +496,21 @@ AcpiDsInitFieldObjects (
{
case AML_FIELD_OP:
Arg = AcpiPsGetArg (Op, 2);
Type = INTERNAL_TYPE_REGION_FIELD;
Type = ACPI_TYPE_LOCAL_REGION_FIELD;
break;
case AML_BANK_FIELD_OP:
Arg = AcpiPsGetArg (Op, 4);
Type = INTERNAL_TYPE_BANK_FIELD;
Type = ACPI_TYPE_LOCAL_BANK_FIELD;
break;
case AML_INDEX_FIELD_OP:
Arg = AcpiPsGetArg (Op, 3);
Type = INTERNAL_TYPE_INDEX_FIELD;
Type = ACPI_TYPE_LOCAL_INDEX_FIELD;
break;
default:
return_ACPI_STATUS (AE_BAD_PARAMETER);
}
/*
@ -510,33 +520,35 @@ AcpiDsInitFieldObjects (
{
/* Ignore OFFSET and ACCESSAS terms here */
if (Arg->Opcode == AML_INT_NAMEDFIELD_OP)
if (Arg->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
{
Status = AcpiNsLookup (WalkState->ScopeInfo,
(NATIVE_CHAR *) &((ACPI_PARSE2_OBJECT *)Arg)->Name,
(char *) &Arg->Named.Name,
Type, ACPI_IMODE_LOAD_PASS1,
ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE | ACPI_NS_ERROR_IF_FOUND,
WalkState, &Node);
if (ACPI_FAILURE (Status))
{
ACPI_REPORT_NSERROR ((char *) &Arg->Named.Name, Status);
if (Status != AE_ALREADY_EXISTS)
{
return_ACPI_STATUS (Status);
}
ACPI_REPORT_ERROR (("Field name [%4.4s] already exists in current scope\n",
&((ACPI_PARSE2_OBJECT *)Arg)->Name));
/* Name already exists, just ignore this error */
Status = AE_OK;
}
Arg->Node = Node;
Arg->Common.Node = Node;
}
/* Move to next field in the list */
Arg = Arg->Next;
Arg = Arg->Common.Next;
}
return_ACPI_STATUS (Status);
return_ACPI_STATUS (AE_OK);
}
@ -560,7 +572,7 @@ AcpiDsCreateBankField (
ACPI_NAMESPACE_NODE *RegionNode,
ACPI_WALK_STATE *WalkState)
{
ACPI_STATUS Status = AE_AML_ERROR;
ACPI_STATUS Status;
ACPI_PARSE_OBJECT *Arg;
ACPI_CREATE_FIELD_INFO Info;
@ -570,45 +582,47 @@ AcpiDsCreateBankField (
/* First arg is the name of the parent OpRegion (must already exist) */
Arg = Op->Value.Arg;
Arg = Op->Common.Value.Arg;
if (!RegionNode)
{
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.Name,
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Common.Value.Name,
ACPI_TYPE_REGION, ACPI_IMODE_EXECUTE,
ACPI_NS_SEARCH_PARENT, WalkState, &RegionNode);
if (ACPI_FAILURE (Status))
{
ACPI_REPORT_NSERROR (Arg->Common.Value.Name, Status);
return_ACPI_STATUS (Status);
}
}
/* Second arg is the Bank Register (must already exist) */
/* Second arg is the Bank Register (Field) (must already exist) */
Arg = Arg->Next;
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.String,
INTERNAL_TYPE_BANK_FIELD_DEFN, ACPI_IMODE_EXECUTE,
Arg = Arg->Common.Next;
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Common.Value.String,
ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE,
ACPI_NS_SEARCH_PARENT, WalkState, &Info.RegisterNode);
if (ACPI_FAILURE (Status))
{
ACPI_REPORT_NSERROR (Arg->Common.Value.String, Status);
return_ACPI_STATUS (Status);
}
/* Third arg is the BankValue */
Arg = Arg->Next;
Info.BankValue = Arg->Value.Integer32;
Arg = Arg->Common.Next;
Info.BankValue = Arg->Common.Value.Integer32;
/* Fourth arg is the field flags */
Arg = Arg->Next;
Info.FieldFlags = Arg->Value.Integer8;
Arg = Arg->Common.Next;
Info.FieldFlags = Arg->Common.Value.Integer8;
/* Each remaining arg is a Named Field */
Info.FieldType = INTERNAL_TYPE_BANK_FIELD;
Info.FieldType = ACPI_TYPE_LOCAL_BANK_FIELD;
Info.RegionNode = RegionNode;
Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Next);
Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Common.Next);
return_ACPI_STATUS (Status);
}
@ -644,38 +658,39 @@ AcpiDsCreateIndexField (
/* First arg is the name of the Index register (must already exist) */
Arg = Op->Value.Arg;
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.String,
Arg = Op->Common.Value.Arg;
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Common.Value.String,
ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE,
ACPI_NS_SEARCH_PARENT, WalkState, &Info.RegisterNode);
if (ACPI_FAILURE (Status))
{
ACPI_REPORT_NSERROR (Arg->Common.Value.String, Status);
return_ACPI_STATUS (Status);
}
/* Second arg is the data register (must already exist) */
Arg = Arg->Next;
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.String,
INTERNAL_TYPE_INDEX_FIELD_DEFN, ACPI_IMODE_EXECUTE,
Arg = Arg->Common.Next;
Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Common.Value.String,
ACPI_TYPE_ANY, ACPI_IMODE_EXECUTE,
ACPI_NS_SEARCH_PARENT, WalkState, &Info.DataRegisterNode);
if (ACPI_FAILURE (Status))
{
ACPI_REPORT_NSERROR (Arg->Common.Value.String, Status);
return_ACPI_STATUS (Status);
}
/* Next arg is the field flags */
Arg = Arg->Next;
Info.FieldFlags = Arg->Value.Integer8;
Arg = Arg->Common.Next;
Info.FieldFlags = Arg->Common.Value.Integer8;
/* Each remaining arg is a Named Field */
Info.FieldType = INTERNAL_TYPE_INDEX_FIELD;
Info.FieldType = ACPI_TYPE_LOCAL_INDEX_FIELD;
Info.RegionNode = RegionNode;
Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Next);
Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Common.Next);
return_ACPI_STATUS (Status);
}

4
source/components/hardware/hwregs.c
View File

@ -3,7 +3,7 @@
*
* Module Name: hwregs - Read/write access functions for the various ACPI
* control and status registers.
* $Revision: 1.137 $
* $Revision: 1.138 $
*
******************************************************************************/
@ -239,7 +239,7 @@ AcpiGetSleepTypeData (
/*
* Evaluate the namespace object containing the values for this state
*/
Status = AcpiNsEvaluateByName ((NATIVE_CHAR *) AcpiGbl_DbSleepStates[SleepState],
Status = AcpiNsEvaluateByName ((char *) AcpiGbl_DbSleepStates[SleepState],
NULL, &ObjDesc);
if (ACPI_FAILURE (Status))
{