From 4a5eacc7cc44503bd01f6420afceaa2256769fd7 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Fri, 29 Aug 2014 14:59:20 -0600 Subject: [PATCH] Refresh all of the patches needed. Signed-off-by: Al Stone --- aapits-linux.patch | 8 +- asllookup-miscompare.patch | 4 +- badcode.asl.result | 5 +- debian-big_endian.patch | 360 ++++++++++++++++++------------------- debian-unaligned.patch | 12 +- grammar.asl.result | 164 ++++++++++++++++- name-miscompare.patch | 4 +- re-enable-big-endian.patch | 4 +- 8 files changed, 363 insertions(+), 198 deletions(-) diff --git a/aapits-linux.patch b/aapits-linux.patch index 008ee0e..4f045dc 100644 --- a/aapits-linux.patch +++ b/aapits-linux.patch @@ -28,7 +28,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi return (AE_AML_REGION_LIMIT); } -@@ -1792,7 +1796,9 @@ +@@ -1799,7 +1801,9 @@ Path, Obj.Integer.Value, Value); #else printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n", @@ -39,7 +39,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi #endif Status = AE_ERROR; } -@@ -1871,7 +1877,7 @@ +@@ -1878,7 +1878,7 @@ { TestErrors++; printf ("Test Error: cannot allocate buffer of %d bytes\n", @@ -48,7 +48,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi return (AE_NO_MEMORY); } Results.Pointer = Object; -@@ -1952,7 +1956,8 @@ +@@ -1959,7 +1963,8 @@ { printf ("AtCheckBuffer: unexpected length %d of Buffer vs" " calculated %d bytes\n", @@ -58,7 +58,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi } /* Initialize the return buffer structure */ -@@ -1961,7 +1968,7 @@ +@@ -1968,7 +1973,7 @@ { TestErrors++; printf ("Test Error: cannot allocate buffer of %d bytes\n", diff --git a/asllookup-miscompare.patch b/asllookup-miscompare.patch index 9557b09..0067a22 100644 --- a/asllookup-miscompare.patch +++ b/asllookup-miscompare.patch @@ -1,7 +1,7 @@ diff -urN acpica-unix2-20140214/source/compiler/asllookup.c acpica-unix2-20140214-patch/source/compiler/asllookup.c --- acpica-unix2-20140214/source/compiler/asllookup.c 2014-02-14 16:23:33.000000000 -0700 +++ acpica-unix2-20140214-patch/source/compiler/asllookup.c 2014-02-27 11:50:52.168659866 -0700 -@@ -120,6 +120,7 @@ +@@ -119,6 +119,7 @@ { ACPI_NAMESPACE_NODE *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle); ACPI_NAMESPACE_NODE *Next; @@ -9,7 +9,7 @@ diff -urN acpica-unix2-20140214/source/compiler/asllookup.c acpica-unix2-2014021 /* Referenced flag is set during the namespace xref */ -@@ -163,8 +164,9 @@ +@@ -162,8 +163,9 @@ * Issue a remark even if it is a reserved name (starts * with an underscore). */ diff --git a/badcode.asl.result b/badcode.asl.result index 63cf833..a322adf 100644 --- a/badcode.asl.result +++ b/badcode.asl.result @@ -130,6 +130,9 @@ Warning 3104 - ^ Reserved method should not return a va badcode.asl 197: Return ("Unexpected Return Value") Warning 3104 - Reserved method should not return a value ^ (_Q22) +badcode.asl 203: Device (EC) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + badcode.asl 205: Method (_REG, 2) Warning 3079 - ^ _REG has no corresponding Operation Region @@ -242,4 +245,4 @@ Ignoring all errors, forcing AML file generation ASL Input: badcode.asl - 401 lines, 6935 bytes, 79 keywords AML Output: badcode.aml - 1184 bytes, 60 named objects, 19 executable opcodes -Compilation complete. 46 Errors, 21 Warnings, 11 Remarks, 16 Optimizations +Compilation complete. 46 Errors, 22 Warnings, 11 Remarks, 16 Optimizations diff --git a/debian-big_endian.patch b/debian-big_endian.patch index 6c03e76..eeea6d4 100644 --- a/debian-big_endian.patch +++ b/debian-big_endian.patch @@ -1,7 +1,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslcodegen.c --- acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian 2014-04-24 11:48:59.000000000 -0400 +++ acpica-unix2-20140424/source/compiler/aslcodegen.c 2014-06-06 20:43:34.711825238 -0400 -@@ -238,16 +238,12 @@ CgWriteAmlOpcode ( +@@ -237,16 +237,12 @@ CgWriteAmlOpcode ( ACPI_PARSE_OBJECT *Op) { UINT8 PkgLenFirstByte; @@ -24,7 +24,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac /* We expect some DEFAULT_ARGs, just ignore them */ -@@ -270,51 +266,52 @@ CgWriteAmlOpcode ( +@@ -269,51 +265,52 @@ CgWriteAmlOpcode ( /* Special opcodes for within a field definition */ @@ -88,7 +88,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac break; } -@@ -325,8 +322,8 @@ CgWriteAmlOpcode ( +@@ -324,8 +322,8 @@ CgWriteAmlOpcode ( if (Op->Asl.AmlPkgLenBytes == 1) { /* Simplest case -- no bytes to follow, just write the count */ @@ -99,7 +99,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac } else if (Op->Asl.AmlPkgLenBytes != 0) { -@@ -336,7 +333,7 @@ CgWriteAmlOpcode ( +@@ -335,7 +333,7 @@ CgWriteAmlOpcode ( */ PkgLenFirstByte = (UINT8) (((UINT32) (Op->Asl.AmlPkgLenBytes - 1) << 6) | @@ -108,7 +108,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac CgLocalWriteAmlData (Op, &PkgLenFirstByte, 1); -@@ -344,37 +341,44 @@ CgWriteAmlOpcode ( +@@ -343,37 +341,44 @@ CgWriteAmlOpcode ( * Shift the length over by the 4 bits we just stuffed * in the first byte */ @@ -166,7 +166,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac break; case AML_STRING_OP: -@@ -408,6 +412,7 @@ CgWriteTableHeader ( +@@ -407,6 +412,7 @@ CgWriteTableHeader ( ACPI_PARSE_OBJECT *Op) { ACPI_PARSE_OBJECT *Child; @@ -174,7 +174,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac /* AML filename */ -@@ -444,7 +449,7 @@ CgWriteTableHeader ( +@@ -443,7 +449,7 @@ CgWriteTableHeader ( /* OEM Revision */ Child = Child->Asl.Next; @@ -183,7 +183,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac /* Compiler ID */ -@@ -452,11 +457,12 @@ CgWriteTableHeader ( +@@ -451,11 +457,12 @@ CgWriteTableHeader ( /* Compiler version */ @@ -198,7 +198,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac TableHeader.Checksum = 0; CgLocalWriteAmlData (Op, &TableHeader, sizeof (ACPI_TABLE_HEADER)); -@@ -520,7 +526,10 @@ CgWriteNode ( +@@ -519,7 +526,10 @@ CgWriteNode ( ACPI_PARSE_OBJECT *Op) { ASL_RESOURCE_NODE *Rnode; @@ -210,7 +210,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac /* Always check for DEFAULT_ARG and other "Noop" nodes */ /* TBD: this may not be the best place for this check */ -@@ -538,13 +547,24 @@ CgWriteNode ( +@@ -537,13 +547,24 @@ CgWriteNode ( switch (Op->Asl.AmlOpcode) { case AML_RAW_DATA_BYTE: @@ -241,7 +241,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac diff -up acpica-unix2-20140424/source/compiler/aslopcodes.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslopcodes.c --- acpica-unix2-20140424/source/compiler/aslopcodes.c.debian-big_endian 2014-04-24 11:48:59.000000000 -0400 +++ acpica-unix2-20140424/source/compiler/aslopcodes.c 2014-06-06 20:43:34.711825238 -0400 -@@ -476,6 +476,7 @@ OpcDoUnicode ( +@@ -475,6 +476,7 @@ OpcDoUnicode ( UINT32 i; UINT8 *AsciiString; UINT16 *UnicodeString; @@ -249,7 +249,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslopcodes.c.debian-big_endian ac ACPI_PARSE_OBJECT *BufferLengthOp; -@@ -502,7 +503,8 @@ OpcDoUnicode ( +@@ -501,7 +503,8 @@ OpcDoUnicode ( for (i = 0; i < Count; i++) { @@ -262,7 +262,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslopcodes.c.debian-big_endian ac diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslrestype1.c --- acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian 2014-04-24 11:49:00.000000000 -0400 +++ acpica-unix2-20140424/source/compiler/aslrestype1.c 2014-06-06 20:43:34.711825238 -0400 -@@ -152,6 +152,11 @@ RsDoMemory24Descriptor ( +@@ -151,6 +152,11 @@ RsDoMemory24Descriptor ( ACPI_PARSE_OBJECT *MaxOp = NULL; ACPI_PARSE_OBJECT *LengthOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -274,7 +274,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a UINT32 i; -@@ -160,7 +165,8 @@ RsDoMemory24Descriptor ( +@@ -159,7 +165,8 @@ RsDoMemory24Descriptor ( Descriptor = Rnode->Buffer; Descriptor->Memory24.DescriptorType = ACPI_RESOURCE_NAME_MEMORY24; @@ -284,7 +284,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a /* Process all child initialization nodes */ -@@ -177,7 +183,7 @@ RsDoMemory24Descriptor ( +@@ -176,7 +183,7 @@ RsDoMemory24Descriptor ( case 1: /* Min Address */ @@ -293,7 +293,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Minimum)); MinOp = InitializerOp; -@@ -185,7 +191,7 @@ RsDoMemory24Descriptor ( +@@ -184,7 +191,7 @@ RsDoMemory24Descriptor ( case 2: /* Max Address */ @@ -302,7 +302,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.Maximum)); MaxOp = InitializerOp; -@@ -193,14 +199,14 @@ RsDoMemory24Descriptor ( +@@ -192,14 +199,14 @@ RsDoMemory24Descriptor ( case 3: /* Alignment */ @@ -319,7 +319,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (Memory24.AddressLength)); LengthOp = InitializerOp; -@@ -223,12 +229,17 @@ RsDoMemory24Descriptor ( +@@ -222,12 +229,17 @@ RsDoMemory24Descriptor ( /* Validate the Min/Max/Len/Align values (Alignment==0 means 64K) */ RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY24, @@ -341,7 +341,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a return (Rnode); } -@@ -259,6 +270,11 @@ RsDoMemory32Descriptor ( +@@ -258,6 +270,11 @@ RsDoMemory32Descriptor ( ACPI_PARSE_OBJECT *LengthOp = NULL; ACPI_PARSE_OBJECT *AlignOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -353,7 +353,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a UINT32 i; -@@ -267,7 +283,8 @@ RsDoMemory32Descriptor ( +@@ -266,7 +283,8 @@ RsDoMemory32Descriptor ( Descriptor = Rnode->Buffer; Descriptor->Memory32.DescriptorType = ACPI_RESOURCE_NAME_MEMORY32; @@ -363,7 +363,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a /* Process all child initialization nodes */ -@@ -284,7 +301,7 @@ RsDoMemory32Descriptor ( +@@ -283,7 +301,7 @@ RsDoMemory32Descriptor ( case 1: /* Min Address */ @@ -372,7 +372,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Minimum)); MinOp = InitializerOp; -@@ -292,7 +309,7 @@ RsDoMemory32Descriptor ( +@@ -291,7 +309,7 @@ RsDoMemory32Descriptor ( case 2: /* Max Address */ @@ -381,7 +381,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Maximum)); MaxOp = InitializerOp; -@@ -300,7 +317,7 @@ RsDoMemory32Descriptor ( +@@ -299,7 +317,7 @@ RsDoMemory32Descriptor ( case 3: /* Alignment */ @@ -390,7 +390,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a RsCreateDwordField (InitializerOp, ACPI_RESTAG_ALIGNMENT, CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.Alignment)); AlignOp = InitializerOp; -@@ -308,7 +325,7 @@ RsDoMemory32Descriptor ( +@@ -307,7 +325,7 @@ RsDoMemory32Descriptor ( case 4: /* Length */ @@ -399,7 +399,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (Memory32.AddressLength)); LengthOp = InitializerOp; -@@ -331,12 +348,17 @@ RsDoMemory32Descriptor ( +@@ -330,12 +348,17 @@ RsDoMemory32Descriptor ( /* Validate the Min/Max/Len/Align values */ RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY32, @@ -421,7 +421,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a return (Rnode); } -@@ -363,6 +385,7 @@ RsDoMemory32FixedDescriptor ( +@@ -362,6 +385,7 @@ RsDoMemory32FixedDescriptor ( AML_RESOURCE *Descriptor; ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; @@ -429,7 +429,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a UINT32 i; -@@ -371,7 +394,8 @@ RsDoMemory32FixedDescriptor ( +@@ -370,7 +394,8 @@ RsDoMemory32FixedDescriptor ( Descriptor = Rnode->Buffer; Descriptor->FixedMemory32.DescriptorType = ACPI_RESOURCE_NAME_FIXED_MEMORY32; @@ -439,7 +439,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a /* Process all child initialization nodes */ -@@ -388,14 +412,16 @@ RsDoMemory32FixedDescriptor ( +@@ -387,14 +412,16 @@ RsDoMemory32FixedDescriptor ( case 1: /* Address */ @@ -461,7 +461,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslrestype1i.c --- acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian 2014-04-24 11:49:00.000000000 -0400 +++ acpica-unix2-20140424/source/compiler/aslrestype1i.c 2014-06-06 20:43:34.711825238 -0400 -@@ -202,6 +202,8 @@ RsDoFixedDmaDescriptor ( +@@ -201,6 +202,8 @@ RsDoFixedDmaDescriptor ( AML_RESOURCE *Descriptor; ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; @@ -470,7 +470,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian UINT32 i; -@@ -220,14 +222,14 @@ RsDoFixedDmaDescriptor ( +@@ -219,14 +222,14 @@ RsDoFixedDmaDescriptor ( { case 0: /* DMA Request Lines [WORD] (_DMA) */ @@ -487,7 +487,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian RsCreateWordField (InitializerOp, ACPI_RESTAG_DMATYPE, CurrentByteOffset + ASL_RESDESC_OFFSET (FixedDma.Channels)); break; -@@ -252,6 +254,9 @@ RsDoFixedDmaDescriptor ( +@@ -251,6 +254,9 @@ RsDoFixedDmaDescriptor ( InitializerOp = RsCompleteNodeAndGetNext (InitializerOp); } @@ -497,7 +497,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian return (Rnode); } -@@ -279,6 +284,7 @@ RsDoFixedIoDescriptor ( +@@ -278,6 +284,7 @@ RsDoFixedIoDescriptor ( ACPI_PARSE_OBJECT *InitializerOp; ACPI_PARSE_OBJECT *AddressOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -505,7 +505,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian UINT32 i; -@@ -297,8 +303,7 @@ RsDoFixedIoDescriptor ( +@@ -296,8 +303,7 @@ RsDoFixedIoDescriptor ( { case 0: /* Base Address */ @@ -515,7 +515,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian RsCreateWordField (InitializerOp, ACPI_RESTAG_BASEADDRESS, CurrentByteOffset + ASL_RESDESC_OFFSET (FixedIo.Address)); AddressOp = InitializerOp; -@@ -328,11 +333,13 @@ RsDoFixedIoDescriptor ( +@@ -327,11 +333,13 @@ RsDoFixedIoDescriptor ( /* Error checks */ @@ -530,7 +530,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian return (Rnode); } -@@ -363,6 +370,8 @@ RsDoIoDescriptor ( +@@ -362,6 +370,8 @@ RsDoIoDescriptor ( ACPI_PARSE_OBJECT *LengthOp = NULL; ACPI_PARSE_OBJECT *AlignOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -539,7 +539,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian UINT32 i; -@@ -388,8 +397,7 @@ RsDoIoDescriptor ( +@@ -387,8 +397,7 @@ RsDoIoDescriptor ( case 1: /* Min Address */ @@ -549,7 +549,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Io.Minimum)); MinOp = InitializerOp; -@@ -397,8 +405,7 @@ RsDoIoDescriptor ( +@@ -396,8 +405,7 @@ RsDoIoDescriptor ( case 2: /* Max Address */ @@ -559,7 +559,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Io.Maximum)); MaxOp = InitializerOp; -@@ -439,12 +446,15 @@ RsDoIoDescriptor ( +@@ -438,12 +446,15 @@ RsDoIoDescriptor ( /* Validate the Min/Max/Len/Align values */ RsSmallAddressCheck (ACPI_RESOURCE_NAME_IO, @@ -577,7 +577,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian return (Rnode); } -@@ -565,9 +575,9 @@ RsDoIrqDescriptor ( +@@ -564,9 +575,9 @@ RsDoIrqDescriptor ( InitializerOp = RsCompleteNodeAndGetNext (InitializerOp); } @@ -589,7 +589,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian return (Rnode); } -@@ -667,6 +677,6 @@ RsDoIrqNoFlagsDescriptor ( +@@ -666,6 +677,6 @@ RsDoIrqNoFlagsDescriptor ( /* Now we can set the interrupt mask */ @@ -600,7 +600,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslrestype2.c --- acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian 2014-04-24 11:49:00.000000000 -0400 +++ acpica-unix2-20140424/source/compiler/aslrestype2.c 2014-06-06 20:43:34.711825238 -0400 -@@ -79,6 +79,7 @@ RsDoGeneralRegisterDescriptor ( +@@ -78,6 +79,7 @@ RsDoGeneralRegisterDescriptor ( AML_RESOURCE *Descriptor; ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; @@ -608,7 +608,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian a UINT32 i; -@@ -87,7 +88,9 @@ RsDoGeneralRegisterDescriptor ( +@@ -86,7 +88,9 @@ RsDoGeneralRegisterDescriptor ( Descriptor = Rnode->Buffer; Descriptor->GenericReg.DescriptorType = ACPI_RESOURCE_NAME_GENERIC_REGISTER; @@ -619,7 +619,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian a /* Process all child initialization nodes */ -@@ -118,7 +121,8 @@ RsDoGeneralRegisterDescriptor ( +@@ -117,7 +121,8 @@ RsDoGeneralRegisterDescriptor ( case 3: /* Register Address */ @@ -629,7 +629,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian a RsCreateQwordField (InitializerOp, ACPI_RESTAG_ADDRESS, CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.Address)); break; -@@ -176,6 +180,7 @@ RsDoInterruptDescriptor ( +@@ -175,6 +180,7 @@ RsDoInterruptDescriptor ( AML_RESOURCE *Rover = NULL; ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; @@ -637,7 +637,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian a UINT16 StringLength = 0; UINT32 OptionIndex = 0; UINT32 i; -@@ -222,7 +227,7 @@ RsDoInterruptDescriptor ( +@@ -221,7 +227,7 @@ RsDoInterruptDescriptor ( * Initial descriptor length -- may be enlarged if there are * optional fields present */ @@ -646,7 +646,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian a Descriptor->ExtendedIrq.InterruptCount = 0; Rover = ACPI_CAST_PTR (AML_RESOURCE, -@@ -330,10 +335,11 @@ RsDoInterruptDescriptor ( +@@ -329,10 +335,11 @@ RsDoInterruptDescriptor ( /* Save the integer and move pointer to the next one */ @@ -660,7 +660,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian a /* Case 7: First interrupt number in list */ -@@ -369,7 +375,7 @@ RsDoInterruptDescriptor ( +@@ -368,7 +375,7 @@ RsDoInterruptDescriptor ( { Rover->ByteItem = ResSourceIndex; Rover = ACPI_ADD_PTR (AML_RESOURCE, &(Rover->ByteItem), 1); @@ -669,7 +669,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian a } /* Add optional ResSource string if present */ -@@ -381,13 +387,14 @@ RsDoInterruptDescriptor ( +@@ -380,13 +387,14 @@ RsDoInterruptDescriptor ( Rover = ACPI_ADD_PTR ( AML_RESOURCE, &(Rover->ByteItem), StringLength); @@ -686,7 +686,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian a return (Rnode); } -@@ -438,7 +445,7 @@ RsDoVendorLargeDescriptor ( +@@ -437,7 +445,7 @@ RsDoVendorLargeDescriptor ( Descriptor = Rnode->Buffer; Descriptor->VendorLarge.DescriptorType = ACPI_RESOURCE_NAME_VENDOR_LARGE; @@ -698,7 +698,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian a diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslrestype2d.c --- acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian 2014-04-24 11:49:00.000000000 -0400 +++ acpica-unix2-20140424/source/compiler/aslrestype2d.c 2014-06-06 20:43:34.721825238 -0400 -@@ -83,7 +83,13 @@ RsDoDwordIoDescriptor ( +@@ -82,7 +83,13 @@ RsDoDwordIoDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; UINT16 StringLength = 0; @@ -712,7 +712,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian UINT8 *OptionalFields; UINT32 i; BOOLEAN ResSourceIndex = FALSE; -@@ -104,8 +110,7 @@ RsDoDwordIoDescriptor ( +@@ -103,8 +110,7 @@ RsDoDwordIoDescriptor ( * optional fields present */ OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS32); @@ -722,7 +722,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian sizeof (AML_RESOURCE_LARGE_HEADER)); /* Process all child initialization nodes */ -@@ -149,8 +154,7 @@ RsDoDwordIoDescriptor ( +@@ -148,8 +154,7 @@ RsDoDwordIoDescriptor ( case 5: /* Address Granularity */ @@ -732,7 +732,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY, CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity)); GranOp = InitializerOp; -@@ -158,8 +162,7 @@ RsDoDwordIoDescriptor ( +@@ -157,8 +162,7 @@ RsDoDwordIoDescriptor ( case 6: /* Address Min */ @@ -742,7 +742,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum)); MinOp = InitializerOp; -@@ -167,8 +170,7 @@ RsDoDwordIoDescriptor ( +@@ -166,8 +170,7 @@ RsDoDwordIoDescriptor ( case 7: /* Address Max */ @@ -752,7 +752,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum)); MaxOp = InitializerOp; -@@ -176,16 +178,14 @@ RsDoDwordIoDescriptor ( +@@ -175,16 +178,14 @@ RsDoDwordIoDescriptor ( case 8: /* Translation Offset */ @@ -771,7 +771,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength)); LengthOp = InitializerOp; -@@ -199,7 +199,7 @@ RsDoDwordIoDescriptor ( +@@ -198,7 +199,7 @@ RsDoDwordIoDescriptor ( OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer; OptionIndex++; @@ -780,7 +780,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian ResSourceIndex = TRUE; } break; -@@ -213,8 +213,7 @@ RsDoDwordIoDescriptor ( +@@ -212,8 +213,7 @@ RsDoDwordIoDescriptor ( { /* Found a valid ResourceSource */ @@ -790,7 +790,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian strcpy ((char *) &OptionalFields[OptionIndex], -@@ -274,13 +273,20 @@ RsDoDwordIoDescriptor ( +@@ -273,13 +273,20 @@ RsDoDwordIoDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -815,7 +815,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) + OptionIndex + StringLength; return (Rnode); -@@ -315,7 +321,13 @@ RsDoDwordMemoryDescriptor ( +@@ -314,7 +321,13 @@ RsDoDwordMemoryDescriptor ( ASL_RESOURCE_NODE *Rnode; UINT8 *OptionalFields; UINT16 StringLength = 0; @@ -829,7 +829,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian UINT32 i; BOOLEAN ResSourceIndex = FALSE; -@@ -335,11 +347,9 @@ RsDoDwordMemoryDescriptor ( +@@ -334,11 +347,9 @@ RsDoDwordMemoryDescriptor ( * optional fields present */ OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS32); @@ -842,7 +842,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian /* Process all child initialization nodes */ for (i = 0; InitializerOp; i++) -@@ -388,8 +398,7 @@ RsDoDwordMemoryDescriptor ( +@@ -387,8 +398,7 @@ RsDoDwordMemoryDescriptor ( case 6: /* Address Granularity */ @@ -852,7 +852,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY, CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity)); GranOp = InitializerOp; -@@ -397,8 +406,7 @@ RsDoDwordMemoryDescriptor ( +@@ -396,8 +406,7 @@ RsDoDwordMemoryDescriptor ( case 7: /* Min Address */ @@ -862,7 +862,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum)); MinOp = InitializerOp; -@@ -406,8 +414,7 @@ RsDoDwordMemoryDescriptor ( +@@ -405,8 +414,7 @@ RsDoDwordMemoryDescriptor ( case 8: /* Max Address */ @@ -872,7 +872,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum)); MaxOp = InitializerOp; -@@ -415,16 +422,14 @@ RsDoDwordMemoryDescriptor ( +@@ -414,16 +422,14 @@ RsDoDwordMemoryDescriptor ( case 9: /* Translation Offset */ @@ -891,7 +891,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength)); LengthOp = InitializerOp; -@@ -436,7 +441,7 @@ RsDoDwordMemoryDescriptor ( +@@ -435,7 +441,7 @@ RsDoDwordMemoryDescriptor ( { OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer; OptionIndex++; @@ -900,7 +900,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian ResSourceIndex = TRUE; } break; -@@ -448,8 +453,8 @@ RsDoDwordMemoryDescriptor ( +@@ -447,8 +453,8 @@ RsDoDwordMemoryDescriptor ( { if (StringLength) { @@ -911,7 +911,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian strcpy ((char *) &OptionalFields[OptionIndex], -@@ -510,13 +515,20 @@ RsDoDwordMemoryDescriptor ( +@@ -509,13 +515,20 @@ RsDoDwordMemoryDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -936,7 +936,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) + OptionIndex + StringLength; return (Rnode); -@@ -551,7 +563,13 @@ RsDoDwordSpaceDescriptor ( +@@ -550,7 +563,13 @@ RsDoDwordSpaceDescriptor ( ASL_RESOURCE_NODE *Rnode; UINT8 *OptionalFields; UINT16 StringLength = 0; @@ -950,7 +950,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian UINT32 i; BOOLEAN ResSourceIndex = FALSE; -@@ -570,8 +588,7 @@ RsDoDwordSpaceDescriptor ( +@@ -569,8 +588,7 @@ RsDoDwordSpaceDescriptor ( * optional fields present */ OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS32); @@ -960,7 +960,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian sizeof (AML_RESOURCE_LARGE_HEADER)); /* Process all child initialization nodes */ -@@ -620,8 +637,7 @@ RsDoDwordSpaceDescriptor ( +@@ -619,8 +637,7 @@ RsDoDwordSpaceDescriptor ( case 6: /* Address Granularity */ @@ -970,7 +970,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian RsCreateDwordField (InitializerOp, ACPI_RESTAG_GRANULARITY, CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Granularity)); GranOp = InitializerOp; -@@ -629,8 +645,7 @@ RsDoDwordSpaceDescriptor ( +@@ -628,8 +645,7 @@ RsDoDwordSpaceDescriptor ( case 7: /* Min Address */ @@ -980,7 +980,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian RsCreateDwordField (InitializerOp, ACPI_RESTAG_MINADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Minimum)); MinOp = InitializerOp; -@@ -638,8 +653,7 @@ RsDoDwordSpaceDescriptor ( +@@ -637,8 +653,7 @@ RsDoDwordSpaceDescriptor ( case 8: /* Max Address */ @@ -990,7 +990,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian RsCreateDwordField (InitializerOp, ACPI_RESTAG_MAXADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.Maximum)); MaxOp = InitializerOp; -@@ -647,16 +661,14 @@ RsDoDwordSpaceDescriptor ( +@@ -646,16 +661,14 @@ RsDoDwordSpaceDescriptor ( case 9: /* Translation Offset */ @@ -1009,7 +1009,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (Address32.AddressLength)); LengthOp = InitializerOp; -@@ -668,7 +680,7 @@ RsDoDwordSpaceDescriptor ( +@@ -667,7 +680,7 @@ RsDoDwordSpaceDescriptor ( { OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer; OptionIndex++; @@ -1018,7 +1018,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian ResSourceIndex = TRUE; } break; -@@ -680,8 +692,7 @@ RsDoDwordSpaceDescriptor ( +@@ -679,8 +692,7 @@ RsDoDwordSpaceDescriptor ( { if (StringLength) { @@ -1028,7 +1028,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian strcpy ((char *) &OptionalFields[OptionIndex], -@@ -728,13 +739,20 @@ RsDoDwordSpaceDescriptor ( +@@ -727,13 +739,20 @@ RsDoDwordSpaceDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -1056,7 +1056,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslrestype2e.c --- acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian 2014-04-24 11:49:00.000000000 -0400 +++ acpica-unix2-20140424/source/compiler/aslrestype2e.c 2014-06-06 20:43:34.721825238 -0400 -@@ -82,6 +82,13 @@ RsDoExtendedIoDescriptor ( +@@ -81,6 +82,13 @@ RsDoExtendedIoDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; UINT16 StringLength = 0; @@ -1070,7 +1070,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian UINT32 i; -@@ -96,9 +103,10 @@ RsDoExtendedIoDescriptor ( +@@ -95,9 +103,10 @@ RsDoExtendedIoDescriptor ( Descriptor->ExtAddress64.ResourceType = ACPI_ADDRESS_TYPE_IO_RANGE; Descriptor->ExtAddress64.RevisionID = AML_RESOURCE_EXTENDED_ADDRESS_REVISION; @@ -1083,7 +1083,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian /* Process all child initialization nodes */ -@@ -141,7 +149,7 @@ RsDoExtendedIoDescriptor ( +@@ -140,7 +149,7 @@ RsDoExtendedIoDescriptor ( case 5: /* Address Granularity */ @@ -1092,7 +1092,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY, CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity)); GranOp = InitializerOp; -@@ -149,7 +157,7 @@ RsDoExtendedIoDescriptor ( +@@ -148,7 +157,7 @@ RsDoExtendedIoDescriptor ( case 6: /* Address Min */ @@ -1101,7 +1101,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum)); MinOp = InitializerOp; -@@ -157,7 +165,7 @@ RsDoExtendedIoDescriptor ( +@@ -156,7 +165,7 @@ RsDoExtendedIoDescriptor ( case 7: /* Address Max */ @@ -1110,7 +1110,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum)); MaxOp = InitializerOp; -@@ -165,14 +173,14 @@ RsDoExtendedIoDescriptor ( +@@ -164,14 +173,14 @@ RsDoExtendedIoDescriptor ( case 8: /* Translation Offset */ @@ -1127,7 +1127,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength)); LengthOp = InitializerOp; -@@ -180,7 +188,7 @@ RsDoExtendedIoDescriptor ( +@@ -179,7 +188,7 @@ RsDoExtendedIoDescriptor ( case 10: /* Type-Specific Attributes */ @@ -1136,7 +1136,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES, CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific)); break; -@@ -216,13 +224,20 @@ RsDoExtendedIoDescriptor ( +@@ -215,13 +224,20 @@ RsDoExtendedIoDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -1161,7 +1161,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + StringLength; return (Rnode); } -@@ -255,6 +270,13 @@ RsDoExtendedMemoryDescriptor ( +@@ -254,6 +270,13 @@ RsDoExtendedMemoryDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; UINT16 StringLength = 0; @@ -1175,7 +1175,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian UINT32 i; -@@ -269,9 +291,10 @@ RsDoExtendedMemoryDescriptor ( +@@ -268,9 +291,10 @@ RsDoExtendedMemoryDescriptor ( Descriptor->ExtAddress64.ResourceType = ACPI_ADDRESS_TYPE_MEMORY_RANGE; Descriptor->ExtAddress64.RevisionID = AML_RESOURCE_EXTENDED_ADDRESS_REVISION; @@ -1188,7 +1188,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian /* Process all child initialization nodes */ -@@ -321,7 +344,7 @@ RsDoExtendedMemoryDescriptor ( +@@ -320,7 +344,7 @@ RsDoExtendedMemoryDescriptor ( case 6: /* Address Granularity */ @@ -1197,7 +1197,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY, CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity)); GranOp = InitializerOp; -@@ -329,7 +352,7 @@ RsDoExtendedMemoryDescriptor ( +@@ -328,7 +352,7 @@ RsDoExtendedMemoryDescriptor ( case 7: /* Min Address */ @@ -1206,7 +1206,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum)); MinOp = InitializerOp; -@@ -337,7 +360,7 @@ RsDoExtendedMemoryDescriptor ( +@@ -336,7 +360,7 @@ RsDoExtendedMemoryDescriptor ( case 8: /* Max Address */ @@ -1215,7 +1215,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum)); MaxOp = InitializerOp; -@@ -345,14 +368,14 @@ RsDoExtendedMemoryDescriptor ( +@@ -344,14 +368,14 @@ RsDoExtendedMemoryDescriptor ( case 9: /* Translation Offset */ @@ -1232,7 +1232,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength)); LengthOp = InitializerOp; -@@ -360,7 +383,7 @@ RsDoExtendedMemoryDescriptor ( +@@ -359,7 +383,7 @@ RsDoExtendedMemoryDescriptor ( case 11: /* Type-Specific Attributes */ @@ -1241,7 +1241,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES, CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific)); break; -@@ -397,13 +420,20 @@ RsDoExtendedMemoryDescriptor ( +@@ -396,13 +420,20 @@ RsDoExtendedMemoryDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -1266,7 +1266,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + StringLength; return (Rnode); } -@@ -436,6 +466,13 @@ RsDoExtendedSpaceDescriptor ( +@@ -435,6 +466,13 @@ RsDoExtendedSpaceDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; UINT16 StringLength = 0; @@ -1280,7 +1280,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian UINT32 i; -@@ -449,9 +486,10 @@ RsDoExtendedSpaceDescriptor ( +@@ -448,9 +486,10 @@ RsDoExtendedSpaceDescriptor ( Descriptor->ExtAddress64.DescriptorType = ACPI_RESOURCE_NAME_EXTENDED_ADDRESS64; Descriptor->ExtAddress64.RevisionID = AML_RESOURCE_EXTENDED_ADDRESS_REVISION; @@ -1293,7 +1293,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian /* Process all child initialization nodes */ -@@ -499,7 +537,7 @@ RsDoExtendedSpaceDescriptor ( +@@ -498,7 +537,7 @@ RsDoExtendedSpaceDescriptor ( case 6: /* Address Granularity */ @@ -1302,7 +1302,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY, CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity)); GranOp = InitializerOp; -@@ -507,7 +545,7 @@ RsDoExtendedSpaceDescriptor ( +@@ -506,7 +545,7 @@ RsDoExtendedSpaceDescriptor ( case 7: /* Min Address */ @@ -1311,7 +1311,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum)); MinOp = InitializerOp; -@@ -515,7 +553,7 @@ RsDoExtendedSpaceDescriptor ( +@@ -514,7 +553,7 @@ RsDoExtendedSpaceDescriptor ( case 8: /* Max Address */ @@ -1320,7 +1320,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum)); MaxOp = InitializerOp; -@@ -523,14 +561,14 @@ RsDoExtendedSpaceDescriptor ( +@@ -522,14 +561,14 @@ RsDoExtendedSpaceDescriptor ( case 9: /* Translation Offset */ @@ -1337,7 +1337,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength)); LengthOp = InitializerOp; -@@ -538,7 +576,7 @@ RsDoExtendedSpaceDescriptor ( +@@ -537,7 +576,7 @@ RsDoExtendedSpaceDescriptor ( case 11: /* Type-Specific Attributes */ @@ -1346,7 +1346,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES, CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific)); break; -@@ -560,13 +598,20 @@ RsDoExtendedSpaceDescriptor ( +@@ -559,13 +598,20 @@ RsDoExtendedSpaceDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -1374,7 +1374,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslrestype2q.c --- acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian 2014-04-24 11:49:00.000000000 -0400 +++ acpica-unix2-20140424/source/compiler/aslrestype2q.c 2014-06-06 20:43:34.721825238 -0400 -@@ -84,7 +84,13 @@ RsDoQwordIoDescriptor ( +@@ -83,7 +84,13 @@ RsDoQwordIoDescriptor ( ASL_RESOURCE_NODE *Rnode; UINT8 *OptionalFields; UINT16 StringLength = 0; @@ -1388,7 +1388,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian UINT32 i; BOOLEAN ResSourceIndex = FALSE; -@@ -104,8 +110,7 @@ RsDoQwordIoDescriptor ( +@@ -103,8 +110,7 @@ RsDoQwordIoDescriptor ( * optional fields present */ OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS64); @@ -1398,7 +1398,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian sizeof (AML_RESOURCE_LARGE_HEADER)); /* Process all child initialization nodes */ -@@ -149,7 +154,7 @@ RsDoQwordIoDescriptor ( +@@ -148,7 +154,7 @@ RsDoQwordIoDescriptor ( case 5: /* Address Granularity */ @@ -1407,7 +1407,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY, CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity)); GranOp = InitializerOp; -@@ -157,7 +162,7 @@ RsDoQwordIoDescriptor ( +@@ -156,7 +162,7 @@ RsDoQwordIoDescriptor ( case 6: /* Address Min */ @@ -1416,7 +1416,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum)); MinOp = InitializerOp; -@@ -165,7 +170,7 @@ RsDoQwordIoDescriptor ( +@@ -164,7 +170,7 @@ RsDoQwordIoDescriptor ( case 7: /* Address Max */ @@ -1425,7 +1425,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum)); MaxOp = InitializerOp; -@@ -173,14 +178,14 @@ RsDoQwordIoDescriptor ( +@@ -172,14 +178,14 @@ RsDoQwordIoDescriptor ( case 8: /* Translation Offset */ @@ -1442,7 +1442,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength)); LengthOp = InitializerOp; -@@ -192,7 +197,7 @@ RsDoQwordIoDescriptor ( +@@ -191,7 +197,7 @@ RsDoQwordIoDescriptor ( { OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer; OptionIndex++; @@ -1451,7 +1451,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian ResSourceIndex = TRUE; } break; -@@ -204,8 +209,7 @@ RsDoQwordIoDescriptor ( +@@ -203,8 +209,7 @@ RsDoQwordIoDescriptor ( { if (StringLength) { @@ -1461,7 +1461,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian strcpy ((char *) &OptionalFields[OptionIndex], -@@ -265,13 +269,20 @@ RsDoQwordIoDescriptor ( +@@ -264,13 +269,20 @@ RsDoQwordIoDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -1486,7 +1486,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) + OptionIndex + StringLength; return (Rnode); -@@ -306,7 +317,13 @@ RsDoQwordMemoryDescriptor ( +@@ -305,7 +317,13 @@ RsDoQwordMemoryDescriptor ( ASL_RESOURCE_NODE *Rnode; UINT8 *OptionalFields; UINT16 StringLength = 0; @@ -1500,7 +1500,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian UINT32 i; BOOLEAN ResSourceIndex = FALSE; -@@ -326,8 +343,7 @@ RsDoQwordMemoryDescriptor ( +@@ -325,8 +343,7 @@ RsDoQwordMemoryDescriptor ( * optional fields present */ OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS64); @@ -1510,7 +1510,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian sizeof (AML_RESOURCE_LARGE_HEADER)); /* Process all child initialization nodes */ -@@ -378,7 +394,7 @@ RsDoQwordMemoryDescriptor ( +@@ -377,7 +394,7 @@ RsDoQwordMemoryDescriptor ( case 6: /* Address Granularity */ @@ -1519,7 +1519,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY, CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity)); GranOp = InitializerOp; -@@ -386,7 +402,7 @@ RsDoQwordMemoryDescriptor ( +@@ -385,7 +402,7 @@ RsDoQwordMemoryDescriptor ( case 7: /* Min Address */ @@ -1528,7 +1528,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum)); MinOp = InitializerOp; -@@ -394,7 +410,7 @@ RsDoQwordMemoryDescriptor ( +@@ -393,7 +410,7 @@ RsDoQwordMemoryDescriptor ( case 8: /* Max Address */ @@ -1537,7 +1537,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum)); MaxOp = InitializerOp; -@@ -402,14 +418,14 @@ RsDoQwordMemoryDescriptor ( +@@ -401,14 +418,14 @@ RsDoQwordMemoryDescriptor ( case 9: /* Translation Offset */ @@ -1554,7 +1554,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength)); LengthOp = InitializerOp; -@@ -421,7 +437,7 @@ RsDoQwordMemoryDescriptor ( +@@ -420,7 +437,7 @@ RsDoQwordMemoryDescriptor ( { OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer; OptionIndex++; @@ -1563,7 +1563,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian ResSourceIndex = TRUE; } break; -@@ -433,8 +449,7 @@ RsDoQwordMemoryDescriptor ( +@@ -432,8 +449,7 @@ RsDoQwordMemoryDescriptor ( { if (StringLength) { @@ -1573,7 +1573,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian strcpy ((char *) &OptionalFields[OptionIndex], -@@ -495,13 +510,20 @@ RsDoQwordMemoryDescriptor ( +@@ -494,13 +510,20 @@ RsDoQwordMemoryDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -1598,7 +1598,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) + OptionIndex + StringLength; return (Rnode); -@@ -536,8 +558,14 @@ RsDoQwordSpaceDescriptor ( +@@ -535,8 +558,14 @@ RsDoQwordSpaceDescriptor ( ASL_RESOURCE_NODE *Rnode; UINT8 *OptionalFields; UINT16 StringLength = 0; @@ -1613,7 +1613,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian BOOLEAN ResSourceIndex = FALSE; -@@ -555,8 +583,7 @@ RsDoQwordSpaceDescriptor ( +@@ -554,8 +583,7 @@ RsDoQwordSpaceDescriptor ( * optional fields present */ OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS64); @@ -1623,7 +1623,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian sizeof (AML_RESOURCE_LARGE_HEADER)); /* Process all child initialization nodes */ -@@ -605,7 +632,7 @@ RsDoQwordSpaceDescriptor ( +@@ -604,7 +632,7 @@ RsDoQwordSpaceDescriptor ( case 6: /* Address Granularity */ @@ -1632,7 +1632,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY, CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Granularity)); GranOp = InitializerOp; -@@ -613,7 +640,7 @@ RsDoQwordSpaceDescriptor ( +@@ -612,7 +640,7 @@ RsDoQwordSpaceDescriptor ( case 7: /* Min Address */ @@ -1641,7 +1641,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Minimum)); MinOp = InitializerOp; -@@ -621,7 +648,7 @@ RsDoQwordSpaceDescriptor ( +@@ -620,7 +648,7 @@ RsDoQwordSpaceDescriptor ( case 8: /* Max Address */ @@ -1650,7 +1650,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.Maximum)); MaxOp = InitializerOp; -@@ -629,14 +656,14 @@ RsDoQwordSpaceDescriptor ( +@@ -628,14 +656,14 @@ RsDoQwordSpaceDescriptor ( case 9: /* Translation Offset */ @@ -1667,7 +1667,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (Address64.AddressLength)); LengthOp = InitializerOp; -@@ -648,7 +675,7 @@ RsDoQwordSpaceDescriptor ( +@@ -647,7 +675,7 @@ RsDoQwordSpaceDescriptor ( { OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer; OptionIndex++; @@ -1676,7 +1676,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian ResSourceIndex = TRUE; } break; -@@ -660,8 +687,7 @@ RsDoQwordSpaceDescriptor ( +@@ -659,8 +687,7 @@ RsDoQwordSpaceDescriptor ( { if (StringLength) { @@ -1686,7 +1686,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian strcpy ((char *) &OptionalFields[OptionIndex], -@@ -707,13 +733,20 @@ RsDoQwordSpaceDescriptor ( +@@ -706,13 +733,20 @@ RsDoQwordSpaceDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -1714,7 +1714,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslrestype2s.c --- acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian 2014-04-24 11:49:00.000000000 -0400 +++ acpica-unix2-20140424/source/compiler/aslrestype2s.c 2014-06-06 20:43:34.721825238 -0400 -@@ -293,6 +293,9 @@ RsDoGpioIntDescriptor ( +@@ -292,6 +293,9 @@ RsDoGpioIntDescriptor ( UINT16 VendorLength; UINT16 InterruptLength; UINT16 DescriptorSize; @@ -1724,7 +1724,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian UINT32 i; -@@ -348,21 +351,21 @@ RsDoGpioIntDescriptor ( +@@ -347,21 +351,21 @@ RsDoGpioIntDescriptor ( { case 0: /* Interrupt Mode - edge/level [Flag] (_MOD) */ @@ -1749,7 +1749,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_INTERRUPTSHARE, CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 3, 2); break; -@@ -376,7 +379,7 @@ RsDoGpioIntDescriptor ( +@@ -375,7 +379,7 @@ RsDoGpioIntDescriptor ( case 4: /* Debounce Timeout [WORD] (_DBT) */ @@ -1758,7 +1758,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian RsCreateWordField (InitializerOp, ACPI_RESTAG_DEBOUNCETIME, CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.DebounceTimeout)); break; -@@ -402,7 +405,7 @@ RsDoGpioIntDescriptor ( +@@ -401,7 +405,7 @@ RsDoGpioIntDescriptor ( case 7: /* Resource Usage (consumer/producer) */ @@ -1767,7 +1767,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian break; case 8: /* Resource Tag (Descriptor Name) */ -@@ -466,6 +469,10 @@ RsDoGpioIntDescriptor ( +@@ -465,6 +469,10 @@ RsDoGpioIntDescriptor ( InitializerOp = RsCompleteNodeAndGetNext (InitializerOp); } @@ -1778,7 +1778,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian return (Rnode); } -@@ -499,6 +506,10 @@ RsDoGpioIoDescriptor ( +@@ -498,6 +506,10 @@ RsDoGpioIoDescriptor ( UINT16 VendorLength; UINT16 InterruptLength; UINT16 DescriptorSize; @@ -1789,7 +1789,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian UINT32 i; -@@ -554,7 +565,7 @@ RsDoGpioIoDescriptor ( +@@ -553,7 +565,7 @@ RsDoGpioIoDescriptor ( { case 0: /* Share Type [Flags] (_SHR) */ @@ -1798,7 +1798,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian RsCreateBitField (InitializerOp, ACPI_RESTAG_INTERRUPTSHARE, CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 3); break; -@@ -568,21 +579,21 @@ RsDoGpioIoDescriptor ( +@@ -567,21 +579,21 @@ RsDoGpioIoDescriptor ( case 2: /* Debounce Timeout [WORD] (_DBT) */ @@ -1823,7 +1823,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_IORESTRICTION, CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 0, 2); break; -@@ -608,7 +619,7 @@ RsDoGpioIoDescriptor ( +@@ -607,7 +619,7 @@ RsDoGpioIoDescriptor ( case 7: /* Resource Usage (consumer/producer) */ @@ -1832,7 +1832,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian break; case 8: /* Resource Tag (Descriptor Name) */ -@@ -671,6 +682,11 @@ RsDoGpioIoDescriptor ( +@@ -670,6 +682,11 @@ RsDoGpioIoDescriptor ( InitializerOp = RsCompleteNodeAndGetNext (InitializerOp); } @@ -1844,7 +1844,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian return (Rnode); } -@@ -702,6 +718,9 @@ RsDoI2cSerialBusDescriptor ( +@@ -701,6 +718,9 @@ RsDoI2cSerialBusDescriptor ( UINT16 ResSourceLength; UINT16 VendorLength; UINT16 DescriptorSize; @@ -1854,7 +1854,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian UINT32 i; -@@ -749,7 +768,7 @@ RsDoI2cSerialBusDescriptor ( +@@ -748,7 +768,7 @@ RsDoI2cSerialBusDescriptor ( { case 0: /* Slave Address [WORD] (_ADR) */ @@ -1863,7 +1863,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS, CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.SlaveAddress)); break; -@@ -763,14 +782,14 @@ RsDoI2cSerialBusDescriptor ( +@@ -762,14 +782,14 @@ RsDoI2cSerialBusDescriptor ( case 2: /* Connection Speed [DWORD] (_SPE) */ @@ -1880,7 +1880,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE, CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.TypeSpecificFlags), 0); break; -@@ -818,6 +837,9 @@ RsDoI2cSerialBusDescriptor ( +@@ -817,6 +837,9 @@ RsDoI2cSerialBusDescriptor ( InitializerOp = RsCompleteNodeAndGetNext (InitializerOp); } @@ -1890,7 +1890,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian return (Rnode); } -@@ -849,6 +871,9 @@ RsDoSpiSerialBusDescriptor ( +@@ -848,6 +871,9 @@ RsDoSpiSerialBusDescriptor ( UINT16 ResSourceLength; UINT16 VendorLength; UINT16 DescriptorSize; @@ -1900,7 +1900,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian UINT32 i; -@@ -896,21 +921,21 @@ RsDoSpiSerialBusDescriptor ( +@@ -895,21 +921,21 @@ RsDoSpiSerialBusDescriptor ( { case 0: /* Device Selection [WORD] (_ADR) */ @@ -1925,7 +1925,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE, CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.TypeSpecificFlags), 0); break; -@@ -931,7 +956,7 @@ RsDoSpiSerialBusDescriptor ( +@@ -930,7 +956,7 @@ RsDoSpiSerialBusDescriptor ( case 5: /* Connection Speed [DWORD] (_SPE) */ @@ -1934,7 +1934,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED, CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.ConnectionSpeed)); break; -@@ -993,6 +1018,10 @@ RsDoSpiSerialBusDescriptor ( +@@ -992,6 +1018,10 @@ RsDoSpiSerialBusDescriptor ( InitializerOp = RsCompleteNodeAndGetNext (InitializerOp); } @@ -1945,7 +1945,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian return (Rnode); } -@@ -1024,6 +1053,10 @@ RsDoUartSerialBusDescriptor ( +@@ -1023,6 +1053,10 @@ RsDoUartSerialBusDescriptor ( UINT16 ResSourceLength; UINT16 VendorLength; UINT16 DescriptorSize; @@ -1956,7 +1956,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian UINT32 i; -@@ -1071,21 +1104,21 @@ RsDoUartSerialBusDescriptor ( +@@ -1070,21 +1104,21 @@ RsDoUartSerialBusDescriptor ( { case 0: /* Connection Speed (Baud Rate) [DWORD] (_SPE) */ @@ -1981,7 +1981,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_STOPBITS, CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 2, 2); break; -@@ -1099,7 +1132,7 @@ RsDoUartSerialBusDescriptor ( +@@ -1098,7 +1132,7 @@ RsDoUartSerialBusDescriptor ( case 4: /* Endianness [Flag] (_END) */ @@ -1990,7 +1990,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian RsCreateBitField (InitializerOp, ACPI_RESTAG_ENDIANNESS, CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 7); break; -@@ -1113,21 +1146,21 @@ RsDoUartSerialBusDescriptor ( +@@ -1112,21 +1146,21 @@ RsDoUartSerialBusDescriptor ( case 6: /* Flow Control [Flags] (_FLC) */ @@ -2015,7 +2015,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_TX, CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TxFifoSize)); break; -@@ -1185,5 +1218,10 @@ RsDoUartSerialBusDescriptor ( +@@ -1184,5 +1218,10 @@ RsDoUartSerialBusDescriptor ( InitializerOp = RsCompleteNodeAndGetNext (InitializerOp); } @@ -2029,7 +2029,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslrestype2w.c --- acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian 2014-04-24 11:49:00.000000000 -0400 +++ acpica-unix2-20140424/source/compiler/aslrestype2w.c 2014-06-06 20:43:34.721825238 -0400 -@@ -85,6 +85,12 @@ RsDoWordIoDescriptor ( +@@ -84,6 +85,12 @@ RsDoWordIoDescriptor ( UINT8 *OptionalFields; UINT16 StringLength = 0; UINT32 OptionIndex = 0; @@ -2042,7 +2042,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian UINT32 i; BOOLEAN ResSourceIndex = FALSE; -@@ -104,8 +110,7 @@ RsDoWordIoDescriptor ( +@@ -103,8 +110,7 @@ RsDoWordIoDescriptor ( * optional fields present */ OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS16); @@ -2052,7 +2052,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian sizeof (AML_RESOURCE_LARGE_HEADER)); /* Process all child initialization nodes */ -@@ -149,7 +154,7 @@ RsDoWordIoDescriptor ( +@@ -148,7 +154,7 @@ RsDoWordIoDescriptor ( case 5: /* Address Granularity */ @@ -2061,7 +2061,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY, CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity)); GranOp = InitializerOp; -@@ -157,7 +162,7 @@ RsDoWordIoDescriptor ( +@@ -156,7 +162,7 @@ RsDoWordIoDescriptor ( case 6: /* Address Min */ @@ -2070,7 +2070,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum)); MinOp = InitializerOp; -@@ -165,7 +170,7 @@ RsDoWordIoDescriptor ( +@@ -164,7 +170,7 @@ RsDoWordIoDescriptor ( case 7: /* Address Max */ @@ -2079,7 +2079,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum)); MaxOp = InitializerOp; -@@ -173,14 +178,14 @@ RsDoWordIoDescriptor ( +@@ -172,14 +178,14 @@ RsDoWordIoDescriptor ( case 8: /* Translation Offset */ @@ -2096,7 +2096,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength)); LengthOp = InitializerOp; -@@ -192,7 +197,7 @@ RsDoWordIoDescriptor ( +@@ -191,7 +197,7 @@ RsDoWordIoDescriptor ( { OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer; OptionIndex++; @@ -2105,7 +2105,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian ResSourceIndex = TRUE; } break; -@@ -204,8 +209,7 @@ RsDoWordIoDescriptor ( +@@ -203,8 +209,7 @@ RsDoWordIoDescriptor ( { if (StringLength) { @@ -2115,7 +2115,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian strcpy ((char *) &OptionalFields[OptionIndex], -@@ -265,13 +269,20 @@ RsDoWordIoDescriptor ( +@@ -264,13 +269,20 @@ RsDoWordIoDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -2140,7 +2140,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) + OptionIndex + StringLength; return (Rnode); -@@ -307,6 +318,12 @@ RsDoWordBusNumberDescriptor ( +@@ -306,6 +318,12 @@ RsDoWordBusNumberDescriptor ( UINT8 *OptionalFields; UINT16 StringLength = 0; UINT32 OptionIndex = 0; @@ -2153,7 +2153,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian UINT32 i; BOOLEAN ResSourceIndex = FALSE; -@@ -326,8 +343,7 @@ RsDoWordBusNumberDescriptor ( +@@ -325,8 +343,7 @@ RsDoWordBusNumberDescriptor ( * optional fields present */ OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS16); @@ -2163,7 +2163,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian sizeof (AML_RESOURCE_LARGE_HEADER)); /* Process all child initialization nodes */ -@@ -364,8 +380,7 @@ RsDoWordBusNumberDescriptor ( +@@ -363,8 +380,7 @@ RsDoWordBusNumberDescriptor ( case 4: /* Address Granularity */ @@ -2173,7 +2173,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY, CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity)); GranOp = InitializerOp; -@@ -373,8 +388,7 @@ RsDoWordBusNumberDescriptor ( +@@ -372,8 +388,7 @@ RsDoWordBusNumberDescriptor ( case 5: /* Min Address */ @@ -2183,7 +2183,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum)); MinOp = InitializerOp; -@@ -382,8 +396,7 @@ RsDoWordBusNumberDescriptor ( +@@ -381,8 +396,7 @@ RsDoWordBusNumberDescriptor ( case 6: /* Max Address */ @@ -2193,7 +2193,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum)); MaxOp = InitializerOp; -@@ -391,16 +404,14 @@ RsDoWordBusNumberDescriptor ( +@@ -390,16 +404,14 @@ RsDoWordBusNumberDescriptor ( case 7: /* Translation Offset */ @@ -2212,7 +2212,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength)); LengthOp = InitializerOp; -@@ -412,7 +423,7 @@ RsDoWordBusNumberDescriptor ( +@@ -411,7 +423,7 @@ RsDoWordBusNumberDescriptor ( { OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer; OptionIndex++; @@ -2221,7 +2221,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian ResSourceIndex = TRUE; } break; -@@ -424,8 +435,7 @@ RsDoWordBusNumberDescriptor ( +@@ -423,8 +435,7 @@ RsDoWordBusNumberDescriptor ( { if (StringLength) { @@ -2231,7 +2231,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian strcpy ((char *) &OptionalFields[OptionIndex], -@@ -471,13 +481,20 @@ RsDoWordBusNumberDescriptor ( +@@ -470,13 +481,20 @@ RsDoWordBusNumberDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -2256,7 +2256,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) + OptionIndex + StringLength; return (Rnode); -@@ -513,6 +530,12 @@ RsDoWordSpaceDescriptor ( +@@ -512,6 +530,12 @@ RsDoWordSpaceDescriptor ( UINT8 *OptionalFields; UINT16 StringLength = 0; UINT32 OptionIndex = 0; @@ -2269,7 +2269,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian UINT32 i; BOOLEAN ResSourceIndex = FALSE; -@@ -531,8 +554,7 @@ RsDoWordSpaceDescriptor ( +@@ -530,8 +554,7 @@ RsDoWordSpaceDescriptor ( * optional fields present */ OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS16); @@ -2279,7 +2279,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian sizeof (AML_RESOURCE_LARGE_HEADER)); /* Process all child initialization nodes */ -@@ -581,8 +603,7 @@ RsDoWordSpaceDescriptor ( +@@ -580,8 +603,7 @@ RsDoWordSpaceDescriptor ( case 6: /* Address Granularity */ @@ -2289,7 +2289,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian RsCreateWordField (InitializerOp, ACPI_RESTAG_GRANULARITY, CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Granularity)); GranOp = InitializerOp; -@@ -590,8 +611,7 @@ RsDoWordSpaceDescriptor ( +@@ -589,8 +611,7 @@ RsDoWordSpaceDescriptor ( case 7: /* Min Address */ @@ -2299,7 +2299,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian RsCreateWordField (InitializerOp, ACPI_RESTAG_MINADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Minimum)); MinOp = InitializerOp; -@@ -599,8 +619,7 @@ RsDoWordSpaceDescriptor ( +@@ -598,8 +619,7 @@ RsDoWordSpaceDescriptor ( case 8: /* Max Address */ @@ -2309,7 +2309,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian RsCreateWordField (InitializerOp, ACPI_RESTAG_MAXADDR, CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.Maximum)); MaxOp = InitializerOp; -@@ -608,16 +627,14 @@ RsDoWordSpaceDescriptor ( +@@ -607,16 +627,14 @@ RsDoWordSpaceDescriptor ( case 9: /* Translation Offset */ @@ -2328,7 +2328,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (Address16.AddressLength)); LengthOp = InitializerOp; -@@ -629,7 +646,7 @@ RsDoWordSpaceDescriptor ( +@@ -628,7 +646,7 @@ RsDoWordSpaceDescriptor ( { OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer; OptionIndex++; @@ -2337,7 +2337,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian ResSourceIndex = TRUE; } break; -@@ -641,8 +658,7 @@ RsDoWordSpaceDescriptor ( +@@ -640,8 +658,7 @@ RsDoWordSpaceDescriptor ( { if (StringLength) { @@ -2347,7 +2347,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian strcpy ((char *) &OptionalFields[OptionIndex], -@@ -688,13 +704,20 @@ RsDoWordSpaceDescriptor ( +@@ -687,13 +704,20 @@ RsDoWordSpaceDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -2415,7 +2415,7 @@ diff -up acpica-unix2-20140424/source/include/acmacros.h.debian-big_endian acpic diff -up acpica-unix2-20140424/source/include/platform/aclinux.h.debian-big_endian acpica-unix2-20140424/source/include/platform/aclinux.h --- acpica-unix2-20140424/source/include/platform/aclinux.h.debian-big_endian 2014-04-24 11:49:06.000000000 -0400 +++ acpica-unix2-20140424/source/include/platform/aclinux.h 2014-06-06 20:44:28.781825238 -0400 -@@ -155,6 +155,7 @@ +@@ -167,6 +167,7 @@ #include #include #include @@ -2423,7 +2423,7 @@ diff -up acpica-unix2-20140424/source/include/platform/aclinux.h.debian-big_endi /* Define/disable kernel-specific declarators */ -@@ -167,8 +168,7 @@ +@@ -179,8 +180,7 @@ #define ACPI_FLUSH_CPU_CACHE() #define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread)) @@ -2433,7 +2433,7 @@ diff -up acpica-unix2-20140424/source/include/platform/aclinux.h.debian-big_endi #define ACPI_MACHINE_WIDTH 64 #define COMPILER_DEPENDENT_INT64 long #define COMPILER_DEPENDENT_UINT64 unsigned long -@@ -179,6 +179,10 @@ +@@ -191,6 +191,10 @@ #define ACPI_USE_NATIVE_DIVIDE #endif diff --git a/debian-unaligned.patch b/debian-unaligned.patch index 56e206c..da639ae 100644 --- a/debian-unaligned.patch +++ b/debian-unaligned.patch @@ -19,7 +19,7 @@ diff --git a/source/compiler/asltree.c b/source/compiler/asltree.c index ebf87f3..fd859d7 100644 --- a/source/compiler/asltree.c +++ b/source/compiler/asltree.c -@@ -577,28 +577,31 @@ TrCreateValuedLeafNode ( +@@ -590,28 +590,31 @@ TrCreateValuedLeafNode ( "\nCreateValuedLeafNode Ln/Col %u/%u NewNode %p Op %s Value %8.8X%8.8X ", Op->Asl.LineNumber, Op->Asl.Column, Op, UtGetOpName(ParseOpcode), ACPI_FORMAT_UINT64 (Value)); @@ -56,7 +56,7 @@ index ebf87f3..fd859d7 100644 break; case PARSEOP_METHOD: -@@ -608,11 +610,13 @@ TrCreateValuedLeafNode ( +@@ -621,11 +624,13 @@ TrCreateValuedLeafNode ( case PARSEOP_INTEGER: @@ -74,7 +74,7 @@ diff --git a/source/components/executer/exoparg2.c b/source/components/executer/ index e55f40c..ed5b1fd 100644 --- a/source/components/executer/exoparg2.c +++ b/source/components/executer/exoparg2.c -@@ -175,6 +176,8 @@ AcpiExOpcode_2A_2T_1R ( +@@ -174,6 +176,8 @@ AcpiExOpcode_2A_2T_1R ( ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0]; ACPI_OPERAND_OBJECT *ReturnDesc1 = NULL; ACPI_OPERAND_OBJECT *ReturnDesc2 = NULL; @@ -83,7 +83,7 @@ index e55f40c..ed5b1fd 100644 ACPI_STATUS Status; -@@ -208,8 +211,10 @@ AcpiExOpcode_2A_2T_1R ( +@@ -207,8 +211,10 @@ AcpiExOpcode_2A_2T_1R ( Status = AcpiUtDivide (Operand[0]->Integer.Value, Operand[1]->Integer.Value, @@ -96,7 +96,7 @@ index e55f40c..ed5b1fd 100644 if (ACPI_FAILURE (Status)) { goto Cleanup; -@@ -283,6 +285,7 @@ AcpiExOpcode_2A_1T_1R ( +@@ -282,6 +285,7 @@ AcpiExOpcode_2A_1T_1R ( ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0]; ACPI_OPERAND_OBJECT *ReturnDesc = NULL; UINT64 Index; @@ -104,7 +104,7 @@ index e55f40c..ed5b1fd 100644 ACPI_STATUS Status = AE_OK; ACPI_SIZE Length = 0; -@@ -326,7 +333,8 @@ AcpiExOpcode_2A_1T_1R ( +@@ -325,7 +333,8 @@ AcpiExOpcode_2A_1T_1R ( Status = AcpiUtDivide (Operand[0]->Integer.Value, Operand[1]->Integer.Value, NULL, diff --git a/grammar.asl.result b/grammar.asl.result index aed0d5d..e7e454c 100644 --- a/grammar.asl.result +++ b/grammar.asl.result @@ -1,6 +1,24 @@ +grammar.asl 120: Device (A1) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 135: Device (A2) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 145: Device (A3) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 155: Device (A4) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 171: Device (IRES) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + grammar.asl 199: Name (_NPK, Package () Warning 3133 - ^ Unknown reserved name (_NPK) +grammar.asl 208: Device (RES) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + grammar.asl 389: Register (SystemIO, 0x08, 0x00, 0x00000000000000B2, , R000) Remark 2089 - Object is not referenced ^ (Name is within method [_CRS]) @@ -55,6 +73,12 @@ Remark 2089 - Object is not referenced ^ (Name is within method [_ grammar.asl 733: Method(_SRS) Warning 3102 - ^ Reserved method has too few arguments (_SRS requires 1) +grammar.asl 738: Device(EIO) +Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) + +grammar.asl 913: Device (DEV1) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + grammar.asl 949: Method (_ERR, 2) Warning 3102 - ^ Reserved method has too few arguments (_ERR requires 3) @@ -88,24 +112,138 @@ Error 6114 - ^ Result is not used, operator has no effec grammar.asl 1816: Method (COND) Warning 3115 - ^ Not all control paths return a value (COND) +grammar.asl 2002: Device (IFEL) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 2159: Device (NOSV) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 2580: Device (IDXF) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 2627: Device (NSTL) +Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) + +grammar.asl 2655: Device (RTBF) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 2753: Device (GPE2) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 2768: Device (PRW2) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 2816: Device (PRW1) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 2886: Device (RTLV) +Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) + grammar.asl 2990: Name (_CRS,0) Error 6105 - ^ Invalid object type for reserved name (_CRS: found Integer, Buffer required) +grammar.asl 3014: Device (RETP) +Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) + +grammar.asl 3050: Device (WHLR) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 3106: Device (ANDO) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 3380: Device (BRKP) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 3417: Device (ADSU) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 3510: Device (INDC) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 3608: Device (LOPS) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 3953: Device (FDSO) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 4117: Device (MLDV) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 4250: Device (NBIT) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 4486: Device (SHFT) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 4682: Device (XORD) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 5019: Device (CRBF) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 5097: Device (IDX4) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 5636: Device (EVNT) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 5864: Device (SZLV) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 5957: Device (BYTF) +Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) + +grammar.asl 5967: Device (C005) +Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) + +grammar.asl 5969: Device (C013) +Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) + grammar.asl 6024: Name (_HID, "*PNP0A06") Error 6061 - Invalid leading asterisk ^ (*PNP0A06) grammar.asl 6163: Name (C18C, Package (2) Remark 2063 - ^ Initializer list shorter than declared package length +grammar.asl 6187: Device (C19B) +Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) + +grammar.asl 6241: Device (DWDF) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 6282: Device (DVAX) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 6325: Device (IDX6) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 6349: Device (TST_) +Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) + +grammar.asl 6390: Device (IDX5) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + grammar.asl 6475: Name (_CRS, Buffer(26) {"\_SB_.PCI2._CRS..........."}) Warning 3046 - Invalid or unknown escape sequence ^ +grammar.asl 6706: Device (BITI) +Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) + grammar.asl 6814: And (Local0, 1, Local0) Error 6066 - ^ Method local variable is not initialized (Local0) grammar.asl 6900: Name (_HID, "*PNP0C0A") Error 6061 - Invalid leading asterisk ^ (*PNP0C0A) +grammar.asl 6909: Device (IDX3) +Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) + +grammar.asl 7054: Device(IDX7) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 7733: Device (MTCH) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + grammar.asl 7754: CreateDWordField (TMD0, 4, DMA0) Remark 2089 - Object is not referenced ^ (Name is within method [TEST]) @@ -118,9 +256,33 @@ Remark 2089 - Object is not referenced ^ (Name is within grammar.asl 7757: CreateDWordField (TMD0, 16, CHNF) Remark 2089 - Object is not referenced ^ (Name is within method [TEST]) +grammar.asl 7931: Device (WHLB) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + +grammar.asl 8292: Device (IDX2) +Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) + +grammar.asl 8675: Device (SIZO) +Warning 3141 - ^ Missing dependency (Device object requires a _HID or _ADR in same scope) + grammar.asl 8717: Name (PKG2, Package (4) Remark 2063 - ^ Initializer list shorter than declared package length +grammar.asl 9259: Device (MBIT) +Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) + +grammar.asl 9270: Device (MWRD) +Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) + +grammar.asl 9278: Device (MBYT) +Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) + +grammar.asl 9351: Device (SMIS) +Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) + +grammar.asl 9405: Device(CNDT) +Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) + Intel ACPI Component Architecture ASL Optimizing Compiler version VVVVVVVV-YYYY [XXXXXXXXXXX] @@ -131,4 +293,4 @@ Ignoring all errors, forcing AML file generation ASL Input: grammar.asl - 10281 lines, 228124 bytes, 4818 keywords AML Output: grammar.aml - 43476 bytes, 670 named objects, 4148 executable opcodes -Compilation complete. 6 Errors, 10 Warnings, 25 Remarks, 1105 Optimizations +Compilation complete. 6 Errors, 64 Warnings, 25 Remarks, 1105 Optimizations diff --git a/name-miscompare.patch b/name-miscompare.patch index 0d686db..c7b136f 100644 --- a/name-miscompare.patch +++ b/name-miscompare.patch @@ -7,7 +7,7 @@ made in the remainder of the function. diff -urN acpica-unix2-20130214/source/compiler/aslanalyze.c acpica-unix2-20130214-names/source/compiler/aslanalyze.c --- acpica-unix2-20130214/source/compiler/aslanalyze.c 2013-03-21 17:31:25.803324990 -0600 +++ acpica-unix2-20130214-names/source/compiler/aslanalyze.c 2013-03-21 17:43:45.357616802 -0600 -@@ -446,7 +446,7 @@ +@@ -445,7 +445,7 @@ /* Need a null-terminated string version of NameSeg */ @@ -16,7 +16,7 @@ diff -urN acpica-unix2-20130214/source/compiler/aslanalyze.c acpica-unix2-201302 Name[ACPI_NAME_SIZE] = 0; /* -@@ -473,7 +473,7 @@ +@@ -472,7 +472,7 @@ * We are now sure we have an _Lxx or _Exx. * Create the target name that would cause collision (Flip E/L) */ diff --git a/re-enable-big-endian.patch b/re-enable-big-endian.patch index 57cd43b..1619246 100644 --- a/re-enable-big-endian.patch +++ b/re-enable-big-endian.patch @@ -5,8 +5,8 @@ Al Stone diff -Naur acpica-unix2-20140424/source/compiler/aslmain.c acpica-unix2-20140424-patch/source/compiler/aslmain.c --- acpica-unix2-20140424/source/compiler/aslmain.c 2014-04-24 09:48:59.000000000 -0600 +++ acpica-unix2-20140424-patch/source/compiler/aslmain.c 2014-05-22 12:55:47.634904320 -0600 -@@ -329,18 +329,6 @@ - int Index2; +@@ -330,18 +330,6 @@ + int ReturnStatus = 0; - /*