diff options
Diffstat (limited to 'source/compiler/aslrestype2q.c')
| -rw-r--r-- | source/compiler/aslrestype2q.c | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/source/compiler/aslrestype2q.c b/source/compiler/aslrestype2q.c index 0bd32e79b3bc..2e548e86cbf0 100644 --- a/source/compiler/aslrestype2q.c +++ b/source/compiler/aslrestype2q.c @@ -59,9 +59,7 @@ * * FUNCTION: RsDoQwordIoDescriptor * - * PARAMETERS: Op - Parent resource descriptor parse node - * CurrentByteOffset - Offset into the resource template AML - * buffer (to track references to the desc) + * PARAMETERS: Info - Parse Op and resource template offset * * RETURN: Completed resource node * @@ -71,8 +69,7 @@ ASL_RESOURCE_NODE * RsDoQwordIoDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset) + ASL_RESOURCE_INFO *Info) { AML_RESOURCE *Descriptor; ACPI_PARSE_OBJECT *InitializerOp; @@ -84,12 +81,14 @@ RsDoQwordIoDescriptor ( UINT8 *OptionalFields; UINT16 StringLength = 0; UINT32 OptionIndex = 0; + UINT32 CurrentByteOffset; UINT32 i; BOOLEAN ResSourceIndex = FALSE; - InitializerOp = Op->Asl.Child; + InitializerOp = Info->DescriptorTypeOp->Asl.Child; StringLength = RsGetStringDataLength (InitializerOp); + CurrentByteOffset = Info->CurrentByteOffset; Rnode = RsAllocateResourceNode ( sizeof (AML_RESOURCE_ADDRESS64) + 1 + StringLength); @@ -235,7 +234,7 @@ RsDoQwordIoDescriptor ( case 12: /* ResourceTag */ - UtAttachNamepathToOwner (Op, InitializerOp); + UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp); break; case 13: /* Type */ @@ -269,10 +268,10 @@ RsDoQwordIoDescriptor ( Descriptor->Address64.AddressLength, Descriptor->Address64.Granularity, Descriptor->Address64.Flags, - MinOp, MaxOp, LengthOp, GranOp, Op); + MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp); Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) + - OptionIndex + StringLength; + OptionIndex + StringLength; return (Rnode); } @@ -281,9 +280,7 @@ RsDoQwordIoDescriptor ( * * FUNCTION: RsDoQwordMemoryDescriptor * - * PARAMETERS: Op - Parent resource descriptor parse node - * CurrentByteOffset - Offset into the resource template AML - * buffer (to track references to the desc) + * PARAMETERS: Info - Parse Op and resource template offset * * RETURN: Completed resource node * @@ -293,8 +290,7 @@ RsDoQwordIoDescriptor ( ASL_RESOURCE_NODE * RsDoQwordMemoryDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset) + ASL_RESOURCE_INFO *Info) { AML_RESOURCE *Descriptor; ACPI_PARSE_OBJECT *InitializerOp; @@ -306,12 +302,14 @@ RsDoQwordMemoryDescriptor ( UINT8 *OptionalFields; UINT16 StringLength = 0; UINT32 OptionIndex = 0; + UINT32 CurrentByteOffset; UINT32 i; BOOLEAN ResSourceIndex = FALSE; - InitializerOp = Op->Asl.Child; + InitializerOp = Info->DescriptorTypeOp->Asl.Child; StringLength = RsGetStringDataLength (InitializerOp); + CurrentByteOffset = Info->CurrentByteOffset; Rnode = RsAllocateResourceNode ( sizeof (AML_RESOURCE_ADDRESS64) + 1 + StringLength); @@ -464,7 +462,7 @@ RsDoQwordMemoryDescriptor ( case 13: /* ResourceTag */ - UtAttachNamepathToOwner (Op, InitializerOp); + UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp); break; @@ -499,10 +497,10 @@ RsDoQwordMemoryDescriptor ( Descriptor->Address64.AddressLength, Descriptor->Address64.Granularity, Descriptor->Address64.Flags, - MinOp, MaxOp, LengthOp, GranOp, Op); + MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp); Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) + - OptionIndex + StringLength; + OptionIndex + StringLength; return (Rnode); } @@ -511,9 +509,7 @@ RsDoQwordMemoryDescriptor ( * * FUNCTION: RsDoQwordSpaceDescriptor * - * PARAMETERS: Op - Parent resource descriptor parse node - * CurrentByteOffset - Offset into the resource template AML - * buffer (to track references to the desc) + * PARAMETERS: Info - Parse Op and resource template offset * * RETURN: Completed resource node * @@ -523,8 +519,7 @@ RsDoQwordMemoryDescriptor ( ASL_RESOURCE_NODE * RsDoQwordSpaceDescriptor ( - ACPI_PARSE_OBJECT *Op, - UINT32 CurrentByteOffset) + ASL_RESOURCE_INFO *Info) { AML_RESOURCE *Descriptor; ACPI_PARSE_OBJECT *InitializerOp; @@ -536,12 +531,14 @@ RsDoQwordSpaceDescriptor ( UINT8 *OptionalFields; UINT16 StringLength = 0; UINT32 OptionIndex = 0; + UINT32 CurrentByteOffset; UINT32 i; BOOLEAN ResSourceIndex = FALSE; - InitializerOp = Op->Asl.Child; + InitializerOp = Info->DescriptorTypeOp->Asl.Child; StringLength = RsGetStringDataLength (InitializerOp); + CurrentByteOffset = Info->CurrentByteOffset; Rnode = RsAllocateResourceNode ( sizeof (AML_RESOURCE_ADDRESS64) + 1 + StringLength); @@ -691,7 +688,7 @@ RsDoQwordSpaceDescriptor ( case 13: /* ResourceTag */ - UtAttachNamepathToOwner (Op, InitializerOp); + UtAttachNamepathToOwner (Info->DescriptorTypeOp, InitializerOp); break; default: @@ -711,9 +708,9 @@ RsDoQwordSpaceDescriptor ( Descriptor->Address64.AddressLength, Descriptor->Address64.Granularity, Descriptor->Address64.Flags, - MinOp, MaxOp, LengthOp, GranOp, Op); + MinOp, MaxOp, LengthOp, GranOp, Info->DescriptorTypeOp); Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) + - OptionIndex + StringLength; + OptionIndex + StringLength; return (Rnode); } |