4c4
< * $Revision: 62 $
---
> * $Revision: 65 $
169c169
< if (Op->Opcode == AML_CREATE_FIELD_OP)
---
> if (Op->Common.AmlOpcode == AML_CREATE_FIELD_OP)
202c202
< Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.String,
---
> Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Common.Value.String,
214c214
< Op->Node = Node;
---
> Op->Common.Node = Node;
247,248c247,248
< 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;
290a291
> ACPI_INTEGER Position;
310c311
< switch (Arg->Opcode)
---
> switch (Arg->Common.AmlOpcode)
314,315c315,318
< 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)
321c324
< Info->FieldBitPosition += Arg->Value.Size;
---
> Info->FieldBitPosition = (UINT32) Position;
334c337
< ((UINT8) (Arg->Value.Integer32 >> 8)));
---
> ((UINT8) (Arg->Common.Value.Integer32 >> 8)));
336c339
< Info->Attribute = (UINT8) (Arg->Value.Integer32);
---
> Info->Attribute = (UINT8) (Arg->Common.Value.Integer32);
345c348
< (NATIVE_CHAR *) &((ACPI_PARSE2_OBJECT *)Arg)->Name,
---
> (NATIVE_CHAR *) &Arg->Named.Name,
356c359
< &((ACPI_PARSE2_OBJECT *)Arg)->Name));
---
> &Arg->Named.Name));
360,361c363,364
< Arg->Node = Info->FieldNode;
< Info->FieldBitLength = Arg->Value.Size;
---
> Arg->Common.Node = Info->FieldNode;
> Info->FieldBitLength = Arg->Common.Value.Size;
374,375c377,380
< 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)
389,390c394,395
< Arg->Opcode));
< return_ACPI_STATUS (AE_AML_ERROR);
---
> Arg->Common.AmlOpcode));
> return_ACPI_STATUS (AE_AML_BAD_OPCODE);
393c398
< Arg = Arg->Next;
---
> Arg = Arg->Common.Next;
420c425
< ACPI_STATUS Status = AE_AML_ERROR;
---
> ACPI_STATUS Status;
430c435
< Arg = Op->Value.Arg;
---
> Arg = Op->Common.Value.Arg;
433c438
< Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.Name,
---
> Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Common.Value.Name,
444,445c449,450
< Arg = Arg->Next;
< Info.FieldFlags = Arg->Value.Integer8;
---
> Arg = Arg->Common.Next;
> Info.FieldFlags = Arg->Common.Value.Integer8;
453c458
< Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Next);
---
> Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Common.Next);
479c484
< ACPI_STATUS Status = AE_AML_ERROR;
---
> ACPI_STATUS Status;
503a509,511
>
> default:
> return_ACPI_STATUS (AE_BAD_PARAMETER);
513c521
< if (Arg->Opcode == AML_INT_NAMEDFIELD_OP)
---
> if (Arg->Common.AmlOpcode == AML_INT_NAMEDFIELD_OP)
516c524
< (NATIVE_CHAR *) &((ACPI_PARSE2_OBJECT *)Arg)->Name,
---
> (NATIVE_CHAR *) &Arg->Named.Name,
528c536,540
< &((ACPI_PARSE2_OBJECT *)Arg)->Name));
---
> &Arg->Named.Name));
>
> /* Name already exists, just ignore this error */
>
> Status = AE_OK;
531c543
< Arg->Node = Node;
---
> Arg->Common.Node = Node;
536c548
< Arg = Arg->Next;
---
> Arg = Arg->Common.Next;
539c551
< return_ACPI_STATUS (Status);
---
> return_ACPI_STATUS (AE_OK);
563c575
< ACPI_STATUS Status = AE_AML_ERROR;
---
> ACPI_STATUS Status;
573c585
< Arg = Op->Value.Arg;
---
> Arg = Op->Common.Value.Arg;
576c588
< Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.Name,
---
> Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Common.Value.Name,
587,588c599,600
< Arg = Arg->Next;
< Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.String,
---
> Arg = Arg->Common.Next;
> Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Common.Value.String,
598,599c610,611
< Arg = Arg->Next;
< Info.BankValue = Arg->Value.Integer32;
---
> Arg = Arg->Common.Next;
> Info.BankValue = Arg->Common.Value.Integer32;
603,604c615,616
< Arg = Arg->Next;
< Info.FieldFlags = Arg->Value.Integer8;
---
> Arg = Arg->Common.Next;
> Info.FieldFlags = Arg->Common.Value.Integer8;
611c623
< Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Next);
---
> Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Common.Next);
647,648c659,660
< Arg = Op->Value.Arg;
< Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.String,
---
> Arg = Op->Common.Value.Arg;
> Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Common.Value.String,
658,659c670,671
< Arg = Arg->Next;
< Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Value.String,
---
> Arg = Arg->Common.Next;
> Status = AcpiNsLookup (WalkState->ScopeInfo, Arg->Common.Value.String,
669,670c681,682
< Arg = Arg->Next;
< Info.FieldFlags = Arg->Value.Integer8;
---
> Arg = Arg->Common.Next;
> Info.FieldFlags = Arg->Common.Value.Integer8;
678c690
< Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Next);
---
> Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Common.Next);