diff --git a/OPT_LDFLAGS.patch b/OPT_LDFLAGS.patch index 70ffaf4..0a01fcf 100644 --- a/OPT_LDFLAGS.patch +++ b/OPT_LDFLAGS.patch @@ -1,6 +1,7 @@ -diff -Naur acpica-unix2-20140926/generate/unix/Makefile.config acpica-unix2-20140926-patch/generate/unix/Makefile.config ---- acpica-unix2-20140926/generate/unix/Makefile.config 2014-09-26 12:02:29.000000000 -0600 -+++ acpica-unix2-20140926-patch/generate/unix/Makefile.config 2014-10-01 12:53:53.510530248 -0600 +Index: src/generate/unix/Makefile.config +=================================================================== +--- src.orig/generate/unix/Makefile.config ++++ src/generate/unix/Makefile.config @@ -23,6 +23,9 @@ # OPT_CFLAGS can be overridden on the make command line by # adding OPT_CFLAGS="..." to the invocation. @@ -11,7 +12,7 @@ diff -Naur acpica-unix2-20140926/generate/unix/Makefile.config acpica-unix2-2014 # Notes: # gcc should be version 4 or greater, otherwise some of the options # used will not be recognized. -@@ -43,7 +46,7 @@ +@@ -43,7 +46,7 @@ CC = gcc OBJDIR = obj BINDIR = bin COMPILEOBJ = $(CC) -c $(CFLAGS) $(OPT_CFLAGS) -o $@ $< @@ -20,7 +21,7 @@ diff -Naur acpica-unix2-20140926/generate/unix/Makefile.config acpica-unix2-2014 PREFIX ?= /usr INSTALLDIR = $(PREFIX)/bin UNAME_S := $(shell uname -s) -@@ -136,6 +139,11 @@ +@@ -140,6 +143,11 @@ ACPICA_HEADERS = \ OPT_CFLAGS ?= $(CWARNINGFLAGS) # diff --git a/aapits-linux.patch b/aapits-linux.patch index c553fbd..5ab8e6d 100644 --- a/aapits-linux.patch +++ b/aapits-linux.patch @@ -1,7 +1,8 @@ -diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapits/tests/aapits/atexec.c ---- acpica-unix2-20130626/tests/aapits/atexec.c 2013-01-17 12:48:28.000000000 -0700 -+++ acpica-unix2-20130626-aapits/tests/aapits/atexec.c 2013-07-25 13:44:23.023894441 -0600 -@@ -639,6 +639,7 @@ +Index: src/tests/aapits/atexec.c +=================================================================== +--- src.orig/tests/aapits/atexec.c ++++ src/tests/aapits/atexec.c +@@ -639,6 +639,7 @@ AtBuildLocalFADT2 ( } @@ -9,7 +10,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi /******************************************************************************* * * FUNCTION: AtBuildLocalRSDT -@@ -757,8 +758,9 @@ +@@ -757,6 +758,7 @@ AtBuildLocalRSDT ( LocalRSDT->Header.Checksum = (UINT8)~LocalRSDT->Header.Checksum; } } @@ -17,9 +18,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi /******************************************************************************* - * - * FUNCTION: AtBuildLocalXSDT -@@ -1424,7 +1426,7 @@ +@@ -1424,7 +1426,7 @@ AeRegionHandler ( ACPI_WARNING ((AE_INFO, "Request on [%4.4s] is beyond region limit Req-%X+%X, Base=%X, Len-%X\n", (RegionObject->Region.Node)->Name.Ascii, (UINT32) Address, @@ -28,7 +27,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi return (AE_AML_REGION_LIMIT); } -@@ -1799,7 +1801,9 @@ +@@ -1799,7 +1801,9 @@ AtCheckInteger( Path, Obj.Integer.Value, Value); #else printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n", @@ -39,7 +38,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi #endif Status = AE_ERROR; } -@@ -1878,7 +1878,7 @@ +@@ -1878,7 +1882,7 @@ AtCheckString( { TestErrors++; printf ("Test Error: cannot allocate buffer of %d bytes\n", @@ -48,7 +47,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi return (AE_NO_MEMORY); } Results.Pointer = Object; -@@ -1959,7 +1963,8 @@ +@@ -1959,7 +1963,8 @@ AtCheckBuffer( { printf ("AtCheckBuffer: unexpected length %d of Buffer vs" " calculated %d bytes\n", @@ -58,7 +57,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi } /* Initialize the return buffer structure */ -@@ -1968,7 +1973,7 @@ +@@ -1968,7 +1973,7 @@ AtCheckBuffer( { TestErrors++; printf ("Test Error: cannot allocate buffer of %d bytes\n", @@ -67,10 +66,11 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi return (AE_NO_MEMORY); } Results.Pointer = Object; -diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapits/tests/aapits/atinit.c ---- acpica-unix2-20130626/tests/aapits/atinit.c 2013-01-17 12:48:28.000000000 -0700 -+++ acpica-unix2-20130626-aapits/tests/aapits/atinit.c 2013-07-25 13:20:19.706705960 -0600 -@@ -3024,7 +3024,7 @@ +Index: src/tests/aapits/atinit.c +=================================================================== +--- src.orig/tests/aapits/atinit.c ++++ src/tests/aapits/atinit.c +@@ -3024,7 +3024,7 @@ AtInitTest0041(void) AapiErrors++; printf ("API Error: AcpiGetSystemInfo() returned" " Length %d, expected %d\n", @@ -79,7 +79,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapi return (AE_ERROR); } -@@ -3046,7 +3046,7 @@ +@@ -3046,7 +3046,7 @@ AtInitTest0041(void) AapiErrors++; printf ("API Error: AcpiGetSystemInfo() returned" " Length %d, expected %d\n", @@ -88,7 +88,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapi return (AE_ERROR); } -@@ -3066,7 +3066,7 @@ +@@ -3066,7 +3066,7 @@ AtInitTest0041(void) AapiErrors++; printf ("API Error: AcpiGetSystemInfo() returned" " Length %d, expected %d\n", @@ -97,7 +97,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapi return (AE_ERROR); } else if (OutBuffer.Pointer != &Info) -@@ -3149,7 +3149,7 @@ +@@ -3149,7 +3149,7 @@ AtInitTest0042(void) AapiErrors++; printf ("API Error: AcpiGetSystemInfo() returned" " Length %d, expected %d\n", @@ -106,7 +106,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapi return (AE_ERROR); } else if (OutBuffer.Pointer != &Info) -@@ -3214,7 +3214,7 @@ +@@ -3214,7 +3214,7 @@ AtInitTest0043(void) AapiErrors++; printf ("API Error: AcpiGetSystemInfo() returned" " Length %d, expected %d\n", @@ -115,10 +115,11 @@ diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapi return (AE_ERROR); } else -diff -urN acpica-unix2-20130626/tests/aapits/atmain.c acpica-unix2-20130626-aapits/tests/aapits/atmain.c ---- acpica-unix2-20130626/tests/aapits/atmain.c 2013-01-17 12:48:28.000000000 -0700 -+++ acpica-unix2-20130626-aapits/tests/aapits/atmain.c 2013-07-25 13:18:22.083323948 -0600 -@@ -346,7 +336,7 @@ +Index: src/tests/aapits/atmain.c +=================================================================== +--- src.orig/tests/aapits/atmain.c ++++ src/tests/aapits/atmain.c +@@ -345,7 +345,7 @@ ExecuteTest ( { printf ("ACPICA API TS err: test num %ld of test case %ld" " is not implemented\n", @@ -127,7 +128,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atmain.c acpica-unix2-20130626-aapi return (AtRetNotImpl); } -@@ -461,7 +451,7 @@ +@@ -460,7 +460,7 @@ main( if (test_case < 1 || test_case > AT_TEST_CASE_NUM) { printf ("ACPICA API TS err: test case %ld is out of range 1 - %d\n", @@ -136,7 +137,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atmain.c acpica-unix2-20130626-aapi return (AtRetBadParam); } -@@ -469,7 +459,7 @@ +@@ -468,7 +468,7 @@ main( if (test_num < 0 || test_num > AtTestCase[test_case].TestsNum) { printf ("ACPICA API TS err: test num %ld is out of range 0 - %d\n", @@ -144,11 +145,12 @@ diff -urN acpica-unix2-20130626/tests/aapits/atmain.c acpica-unix2-20130626-aapi + (long int) test_num, AtTestCase[test_case].TestsNum); return (AtRetBadParam); } - -diff -urN acpica-unix2-20130626/tests/aapits/atnamespace.c acpica-unix2-20130626-aapits/tests/aapits/atnamespace.c ---- acpica-unix2-20130626/tests/aapits/atnamespace.c 2013-01-17 12:48:28.000000000 -0700 -+++ acpica-unix2-20130626-aapits/tests/aapits/atnamespace.c 2013-07-25 13:24:15.366466707 -0600 -@@ -2535,7 +2535,8 @@ + +Index: src/tests/aapits/atnamespace.c +=================================================================== +--- src.orig/tests/aapits/atnamespace.c ++++ src/tests/aapits/atnamespace.c +@@ -2535,7 +2535,8 @@ AtGetObjectInfoTypeCommon( #else printf ("API Error: Address of %s (0x%llX) != (0x%llX)\n", PathNames[2 * i + 1], @@ -158,7 +160,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atnamespace.c acpica-unix2-20130626 #endif #else printf ("API Error: Address of %s (0x%X) != (0x%X)\n", -@@ -2908,7 +2909,8 @@ +@@ -2908,7 +2909,8 @@ AtGetNextObjectTypeCommon( TestErrors++; printf ("AtGetNextObjectTypeCommon: different numbers of entities" "in TypesNames (%d) and LevelTypes0000 (%d)\n", @@ -168,7 +170,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atnamespace.c acpica-unix2-20130626 return (AE_ERROR); } -@@ -4192,7 +4194,9 @@ +@@ -4192,7 +4194,9 @@ AtCheckHandlePathMapping( Pathname, Obj.Integer.Value, Value); #else printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n", @@ -179,7 +181,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atnamespace.c acpica-unix2-20130626 #endif Status = AE_ERROR; } -@@ -5199,7 +5203,7 @@ +@@ -5199,7 +5203,7 @@ AtGetNameExceptionTest( { AapiErrors++; printf ("API Error: AcpiOsAllocate(%d) returned NULL\n", @@ -188,10 +190,11 @@ diff -urN acpica-unix2-20130626/tests/aapits/atnamespace.c acpica-unix2-20130626 return (AE_ERROR); } } -diff -urN acpica-unix2-20130626/tests/aapits/atosxfctrl.c acpica-unix2-20130626-aapits/tests/aapits/atosxfctrl.c ---- acpica-unix2-20130626/tests/aapits/atosxfctrl.c 2013-01-17 12:48:28.000000000 -0700 -+++ acpica-unix2-20130626-aapits/tests/aapits/atosxfctrl.c 2013-07-25 13:30:00.375492751 -0600 -@@ -737,13 +737,15 @@ +Index: src/tests/aapits/atosxfctrl.c +=================================================================== +--- src.orig/tests/aapits/atosxfctrl.c ++++ src/tests/aapits/atosxfctrl.c +@@ -737,13 +737,15 @@ ACPI_OSXF_EMUL_REG #if ACPI_MACHINE_WIDTH == 64 #ifdef _MSC_VER printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%I64x\n", @@ -208,7 +211,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atosxfctrl.c acpica-unix2-20130626- return (NULL); } -@@ -764,15 +766,19 @@ +@@ -764,15 +766,19 @@ ACPI_OSXF_EMUL_REG #ifdef _MSC_VER printf("OsxfCtrlFingReg: intersection Regs (0x%I64x: 0x%x)" " and (0x%I64x: 0x%x)\n", @@ -229,7 +232,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atosxfctrl.c acpica-unix2-20130626- return (NULL); } } -@@ -786,13 +792,15 @@ +@@ -786,13 +792,15 @@ ACPI_OSXF_EMUL_REG #if ACPI_MACHINE_WIDTH == 64 #ifdef _MSC_VER printf("OsxfCtrlFingReg: no memory for Reg (0x%I64x: 0x%x)\n", @@ -246,7 +249,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atosxfctrl.c acpica-unix2-20130626- return (NULL); } Reg->Type = Type; -@@ -932,14 +940,19 @@ +@@ -932,14 +940,19 @@ OsxfCtrlRegService(UINT32 ServiceFlag) #if ACPI_MACHINE_WIDTH == 64 #ifdef _MSC_VER printf("%.2u (%s Address 0x%I64x: Width %.2u) r/w counts: %u/%u\n", @@ -267,10 +270,11 @@ diff -urN acpica-unix2-20130626/tests/aapits/atosxfctrl.c acpica-unix2-20130626- Reg = Reg->Next; i++; } -diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626-aapits/tests/aapits/atresource.c ---- acpica-unix2-20130626/tests/aapits/atresource.c 2013-01-17 12:48:29.000000000 -0700 -+++ acpica-unix2-20130626-aapits/tests/aapits/atresource.c 2013-07-25 13:25:49.423565947 -0600 -@@ -174,7 +174,7 @@ +Index: src/tests/aapits/atresource.c +=================================================================== +--- src.orig/tests/aapits/atresource.c ++++ src/tests/aapits/atresource.c +@@ -174,7 +174,7 @@ AtRsrcTest0000(void) AapiErrors++; printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d," " expected %d\n", @@ -279,7 +283,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626- return (AE_ERROR); } -@@ -490,7 +490,7 @@ +@@ -490,7 +490,7 @@ AtRsrcTest0005(void) AapiErrors++; printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d," " expected %d\n", @@ -288,7 +292,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626- return (AE_ERROR); } -@@ -689,7 +689,7 @@ +@@ -689,7 +689,7 @@ AtRsrcTest0007(void) AapiErrors++; printf ("Api Error: Resource->Length (%d) != %d\n", CurrentResource->Length, @@ -297,7 +301,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626- } if (CurrentResource->Data.Irq.Triggering != 0) /* Level-Triggered */ -@@ -981,7 +981,7 @@ +@@ -981,7 +981,7 @@ AtRsrcTest0012(void) AapiErrors++; printf ("API Error: AcpiGetPossibleResources(%s) returned Length %d," " expected %d\n", @@ -306,7 +310,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626- return (AE_ERROR); } -@@ -1923,7 +1923,7 @@ +@@ -1923,7 +1923,7 @@ AtRsrcTest0026(void) AapiErrors++; printf ("API Error: AcpiGetIrqRoutingTable(%s) returned Length %d," " expected %d\n", @@ -314,16 +318,4 @@ diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626- + Pathname, (int) OutBuffer.Length, 0xA48); return (AE_ERROR); } - -diff -urN acpica-unix2-20130626/tests/aapits/Makefile acpica-unix2-20130626-aapits/tests/aapits/Makefile ---- acpica-unix2-20130626/tests/aapits/Makefile 2013-01-17 12:48:29.000000000 -0700 -+++ acpica-unix2-20130626-aapits/tests/aapits/Makefile 2013-07-25 15:17:09.309236422 -0600 -@@ -199,7 +199,7 @@ - CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_APITS -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I../../source/include - - --acpiexec : $(patsubst %.c,%.o, $(SRCS)) -+$(PROG) : $(patsubst %.c,%.o, $(SRCS)) - $(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG) - CLEANFILES= $(PROG) diff --git a/aapits-makefile.patch b/aapits-makefile.patch deleted file mode 100644 index a1bcb65..0000000 --- a/aapits-makefile.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur acpica/tests/aapits/Makefile acpica-patch/tests/aapits/Makefile ---- acpica/tests/aapits/Makefile 2014-11-07 10:48:14.000000000 -0700 -+++ acpica-patch/tests/aapits/Makefile 2014-11-17 18:32:45.816167012 -0700 -@@ -16,6 +16,7 @@ - atosxfwrap.c \ - osunixxf.c \ - ../../source/common/ahids.c \ -+ ../../source/common/ahuuids.c \ - ../../source/common/cmfsize.c \ - ../../source/common/getopt.c \ - ../../source/components/hardware/hwtimer.c \ -@@ -45,6 +46,7 @@ - ../../source/components/disassembler/dmresrcs.c \ - ../../source/components/disassembler/dmutils.c \ - ../../source/components/disassembler/dmwalk.c \ -+ ../../source/components/disassembler/dmcstyle.c \ - ../../source/components/events/evevent.c \ - ../../source/components/events/evgpe.c \ - ../../source/components/events/evgpeblk.c \ -@@ -174,6 +176,7 @@ - ../../source/components/utilities/utexcep.c \ - ../../source/components/utilities/utfileio.c \ - ../../source/components/utilities/utglobal.c \ -+ ../../source/components/utilities/uthex.c \ - ../../source/components/utilities/utids.c \ - ../../source/components/utilities/utinit.c \ - ../../source/components/utilities/utlock.c \ -@@ -189,6 +192,7 @@ - ../../source/components/utilities/utstate.c \ - ../../source/components/utilities/utstring.c \ - ../../source/components/utilities/uttrack.c \ -+ ../../source/components/utilities/utuuid.c \ - ../../source/components/utilities/utxface.c \ - ../../source/components/utilities/utxferror.c \ - ../../source/components/utilities/utxfinit.c \ diff --git a/acpica-tools.spec b/acpica-tools.spec index 9c8e15b..431230f 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -1,5 +1,5 @@ Name: acpica-tools -Version: 20150204 +Version: 20150408 Release: 1%{?dist} Summary: ACPICA tools for the development and debug of ACPI tables @@ -28,11 +28,10 @@ Patch1: debian-unaligned.patch Patch2: name-miscompare.patch Patch3: aapits-linux.patch Patch4: asllookup-miscompare.patch -Patch5: aapits-makefile.patch -Patch6: re-enable-big-endian.patch -Patch7: OPT_LDFLAGS.patch -Patch8: int-format.patch -Patch9: f23-harden.patch +Patch5: re-enable-big-endian.patch +Patch6: OPT_LDFLAGS.patch +Patch7: int-format.patch +Patch8: f23-harden.patch BuildRequires: bison patchutils flex @@ -88,11 +87,10 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f - %patch2 -p1 -b .name-miscompare %patch3 -p1 -b .aapits-linux %patch4 -p1 -b .asllookup-miscompare -%patch5 -p1 -b .aapits-makefile -%patch6 -p1 -b .re-enable-big-endian -%patch7 -p1 -b .OPT_LDFLAGS -%patch8 -p1 -b .int-format -%patch9 -p1 -b .f23-harden +%patch5 -p1 -b .re-enable-big-endian +%patch6 -p1 -b .OPT_LDFLAGS +%patch7 -p1 -b .int-format +%patch8 -p1 -b .f23-harden cp -p %{SOURCE2} README.Fedora cp -p %{SOURCE3} iasl.1 @@ -197,6 +195,10 @@ fi %changelog +* Fri Apr 10 2015 Al Stone - 20150408-1 +- Update to latest upstream. Closes BZ#1190383 +- Refresh patches + * Mon Mar 2 2015 Al Stone - 20150204-1 - Update to latest upstream. Closes BZ#1190383 - Refresh patches diff --git a/asllookup-miscompare.patch b/asllookup-miscompare.patch index 0067a22..723e958 100644 --- a/asllookup-miscompare.patch +++ b/asllookup-miscompare.patch @@ -1,7 +1,8 @@ -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 -@@ -119,6 +119,7 @@ +Index: src/source/compiler/asllookup.c +=================================================================== +--- src.orig/source/compiler/asllookup.c ++++ src/source/compiler/asllookup.c +@@ -119,6 +119,7 @@ LkIsObjectUsed ( { ACPI_NAMESPACE_NODE *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle); ACPI_NAMESPACE_NODE *Next; @@ -9,7 +10,7 @@ diff -urN acpica-unix2-20140214/source/compiler/asllookup.c acpica-unix2-2014021 /* Referenced flag is set during the namespace xref */ -@@ -162,8 +163,9 @@ +@@ -162,8 +163,9 @@ LkIsObjectUsed ( * Issue a remark even if it is a reserved name (starts * with an underscore). */ diff --git a/debian-big_endian.patch b/debian-big_endian.patch index 0900859..9e17316 100644 --- a/debian-big_endian.patch +++ b/debian-big_endian.patch @@ -1,6 +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 +Index: src/source/compiler/aslcodegen.c +=================================================================== +--- src.orig/source/compiler/aslcodegen.c ++++ src/source/compiler/aslcodegen.c @@ -246,16 +246,12 @@ CgWriteAmlOpcode ( ACPI_PARSE_OBJECT *Op) { @@ -24,7 +25,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac /* We expect some DEFAULT_ARGs, just ignore them */ -@@ -278,51 +265,52 @@ CgWriteAmlOpcode ( +@@ -278,51 +274,52 @@ CgWriteAmlOpcode ( /* Special opcodes for within a field definition */ @@ -88,7 +89,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac break; } -@@ -333,8 +322,8 @@ CgWriteAmlOpcode ( +@@ -333,8 +330,8 @@ CgWriteAmlOpcode ( if (Op->Asl.AmlPkgLenBytes == 1) { /* Simplest case -- no bytes to follow, just write the count */ @@ -99,7 +100,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac } else if (Op->Asl.AmlPkgLenBytes != 0) { -@@ -344,7 +333,7 @@ CgWriteAmlOpcode ( +@@ -344,7 +341,7 @@ CgWriteAmlOpcode ( */ PkgLenFirstByte = (UINT8) (((UINT32) (Op->Asl.AmlPkgLenBytes - 1) << 6) | @@ -108,7 +109,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac CgLocalWriteAmlData (Op, &PkgLenFirstByte, 1); -@@ -352,37 +341,44 @@ CgWriteAmlOpcode ( +@@ -352,37 +349,44 @@ CgWriteAmlOpcode ( * Shift the length over by the 4 bits we just stuffed * in the first byte */ @@ -166,7 +167,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac break; case AML_STRING_OP: -@@ -416,6 +412,7 @@ CgWriteTableHeader ( +@@ -416,6 +420,7 @@ CgWriteTableHeader ( ACPI_PARSE_OBJECT *Op) { ACPI_PARSE_OBJECT *Child; @@ -174,7 +175,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac /* AML filename */ -@@ -452,7 +449,7 @@ CgWriteTableHeader ( +@@ -452,7 +457,7 @@ CgWriteTableHeader ( /* OEM Revision */ Child = Child->Asl.Next; @@ -183,12 +184,12 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac /* Compiler ID */ -@@ -460,11 +457,12 @@ CgWriteTableHeader ( +@@ -460,11 +465,12 @@ CgWriteTableHeader ( /* Compiler version */ -- TableHeader.AslCompilerRevision = ASL_REVISION; -+ DWord = ASL_REVISION; +- TableHeader.AslCompilerRevision = ACPI_CA_VERSION; ++ DWord = ACPI_CA_VERSION; + ACPI_MOVE_32_TO_32(&TableHeader.AslCompilerRevision, &DWord); /* Table length. Checksum zero for now, will rewrite later */ @@ -198,7 +199,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac TableHeader.Checksum = 0; CgLocalWriteAmlData (Op, &TableHeader, sizeof (ACPI_TABLE_HEADER)); -@@ -528,7 +526,10 @@ CgWriteNode ( +@@ -528,7 +534,10 @@ CgWriteNode ( ACPI_PARSE_OBJECT *Op) { ASL_RESOURCE_NODE *Rnode; @@ -210,7 +211,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 */ -@@ -546,13 +547,24 @@ CgWriteNode ( +@@ -546,13 +555,24 @@ CgWriteNode ( switch (Op->Asl.AmlOpcode) { case AML_RAW_DATA_BYTE: @@ -238,10 +239,11 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac case AML_RAW_DATA_BUFFER: -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 -@@ -531,6 +479,7 @@ OpcDoUnicode ( +Index: src/source/compiler/aslopcodes.c +=================================================================== +--- src.orig/source/compiler/aslopcodes.c ++++ src/source/compiler/aslopcodes.c +@@ -531,6 +531,7 @@ OpcDoUnicode ( UINT32 i; UINT8 *AsciiString; UINT16 *UnicodeString; @@ -249,7 +251,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslopcodes.c.debian-big_endian ac ACPI_PARSE_OBJECT *BufferLengthOp; -@@ -557,7 +505,8 @@ OpcDoUnicode ( +@@ -557,7 +558,8 @@ OpcDoUnicode ( for (i = 0; i < Count; i++) { @@ -259,10 +261,11 @@ 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 -@@ -143,6 +148,11 @@ RsDoMemory24Descriptor ( +Index: src/source/compiler/aslrestype1.c +=================================================================== +--- src.orig/source/compiler/aslrestype1.c ++++ src/source/compiler/aslrestype1.c +@@ -143,6 +143,11 @@ RsDoMemory24Descriptor ( ACPI_PARSE_OBJECT *LengthOp = NULL; ASL_RESOURCE_NODE *Rnode; UINT32 CurrentByteOffset; @@ -274,7 +277,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a UINT32 i; -@@ -152,7 +153,8 @@ RsDoMemory24Descriptor ( +@@ -152,7 +157,8 @@ RsDoMemory24Descriptor ( Descriptor = Rnode->Buffer; Descriptor->Memory24.DescriptorType = ACPI_RESOURCE_NAME_MEMORY24; @@ -284,7 +287,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a /* Process all child initialization nodes */ -@@ -169,7 +169,7 @@ RsDoMemory24Descriptor ( +@@ -169,7 +175,7 @@ RsDoMemory24Descriptor ( case 1: /* Min Address */ @@ -293,7 +296,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; -@@ -177,7 +177,7 @@ RsDoMemory24Descriptor ( +@@ -177,7 +183,7 @@ RsDoMemory24Descriptor ( case 2: /* Max Address */ @@ -302,7 +305,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; -@@ -185,14 +185,14 @@ RsDoMemory24Descriptor ( +@@ -185,14 +191,14 @@ RsDoMemory24Descriptor ( case 3: /* Alignment */ @@ -319,7 +322,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; -@@ -215,12 +220,17 @@ RsDoMemory24Descriptor ( +@@ -215,12 +221,17 @@ RsDoMemory24Descriptor ( /* Validate the Min/Max/Len/Align values (Alignment==0 means 64K) */ RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY24, @@ -341,7 +344,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a return (Rnode); } -@@ -249,6 +254,11 @@ RsDoMemory32Descriptor ( +@@ -249,6 +260,11 @@ RsDoMemory32Descriptor ( ACPI_PARSE_OBJECT *AlignOp = NULL; ASL_RESOURCE_NODE *Rnode; UINT32 CurrentByteOffset; @@ -353,7 +356,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a UINT32 i; -@@ -258,7 +259,8 @@ RsDoMemory32Descriptor ( +@@ -258,7 +274,8 @@ RsDoMemory32Descriptor ( Descriptor = Rnode->Buffer; Descriptor->Memory32.DescriptorType = ACPI_RESOURCE_NAME_MEMORY32; @@ -363,7 +366,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a /* Process all child initialization nodes */ -@@ -275,7 +275,7 @@ RsDoMemory32Descriptor ( +@@ -275,7 +292,7 @@ RsDoMemory32Descriptor ( case 1: /* Min Address */ @@ -372,7 +375,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; -@@ -283,7 +283,7 @@ RsDoMemory32Descriptor ( +@@ -283,7 +300,7 @@ RsDoMemory32Descriptor ( case 2: /* Max Address */ @@ -381,7 +384,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; -@@ -291,7 +291,7 @@ RsDoMemory32Descriptor ( +@@ -291,7 +308,7 @@ RsDoMemory32Descriptor ( case 3: /* Alignment */ @@ -390,7 +393,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; -@@ -299,7 +299,7 @@ RsDoMemory32Descriptor ( +@@ -299,7 +316,7 @@ RsDoMemory32Descriptor ( case 4: /* Length */ @@ -399,7 +402,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; -@@ -322,12 +327,17 @@ RsDoMemory32Descriptor ( +@@ -322,12 +339,17 @@ RsDoMemory32Descriptor ( /* Validate the Min/Max/Len/Align values */ RsSmallAddressCheck (ACPI_RESOURCE_NAME_MEMORY32, @@ -421,7 +424,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a return (Rnode); } -@@ -352,6 +353,7 @@ RsDoMemory32FixedDescriptor ( +@@ -352,6 +374,7 @@ RsDoMemory32FixedDescriptor ( ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; UINT32 CurrentByteOffset; @@ -429,7 +432,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a UINT32 i; -@@ -361,7 +362,8 @@ RsDoMemory32FixedDescriptor ( +@@ -361,7 +384,8 @@ RsDoMemory32FixedDescriptor ( Descriptor = Rnode->Buffer; Descriptor->FixedMemory32.DescriptorType = ACPI_RESOURCE_NAME_FIXED_MEMORY32; @@ -439,7 +442,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a /* Process all child initialization nodes */ -@@ -378,14 +380,16 @@ RsDoMemory32FixedDescriptor ( +@@ -378,14 +402,16 @@ RsDoMemory32FixedDescriptor ( case 1: /* Address */ @@ -458,10 +461,11 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength)); break; -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 -@@ -198,6 +200,8 @@ RsDoFixedDmaDescriptor ( +Index: src/source/compiler/aslrestype1i.c +=================================================================== +--- src.orig/source/compiler/aslrestype1i.c ++++ src/source/compiler/aslrestype1i.c +@@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor ( ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; UINT32 CurrentByteOffset; @@ -470,7 +474,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian UINT32 i; -@@ -217,14 +217,14 @@ RsDoFixedDmaDescriptor ( +@@ -217,14 +219,14 @@ RsDoFixedDmaDescriptor ( { case 0: /* DMA Request Lines [WORD] (_DMA) */ @@ -487,7 +491,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; -@@ -249,6 +252,9 @@ RsDoFixedDmaDescriptor ( +@@ -249,6 +251,9 @@ RsDoFixedDmaDescriptor ( InitializerOp = RsCompleteNodeAndGetNext (InitializerOp); } @@ -497,7 +501,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian return (Rnode); } -@@ -274,6 +275,7 @@ RsDoFixedIoDescriptor ( +@@ -274,6 +279,7 @@ RsDoFixedIoDescriptor ( ACPI_PARSE_OBJECT *AddressOp = NULL; ASL_RESOURCE_NODE *Rnode; UINT32 CurrentByteOffset; @@ -505,7 +509,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian UINT32 i; -@@ -293,8 +292,7 @@ RsDoFixedIoDescriptor ( +@@ -293,8 +299,7 @@ RsDoFixedIoDescriptor ( { case 0: /* Base Address */ @@ -515,7 +519,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; -@@ -324,11 +326,13 @@ RsDoFixedIoDescriptor ( +@@ -324,11 +329,13 @@ RsDoFixedIoDescriptor ( /* Error checks */ @@ -530,7 +534,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian return (Rnode); } -@@ -357,6 +359,8 @@ RsDoIoDescriptor ( +@@ -357,6 +364,8 @@ RsDoIoDescriptor ( ACPI_PARSE_OBJECT *AlignOp = NULL; ASL_RESOURCE_NODE *Rnode; UINT32 CurrentByteOffset; @@ -539,7 +543,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian UINT32 i; -@@ -383,8 +382,7 @@ RsDoIoDescriptor ( +@@ -383,8 +392,7 @@ RsDoIoDescriptor ( case 1: /* Min Address */ @@ -549,7 +553,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; -@@ -392,8 +391,7 @@ RsDoIoDescriptor ( +@@ -392,8 +400,7 @@ RsDoIoDescriptor ( case 2: /* Max Address */ @@ -559,7 +563,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; -@@ -434,12 +437,15 @@ RsDoIoDescriptor ( +@@ -434,12 +441,15 @@ RsDoIoDescriptor ( /* Validate the Min/Max/Len/Align values */ RsSmallAddressCheck (ACPI_RESOURCE_NAME_IO, @@ -577,7 +581,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian return (Rnode); } -@@ -559,9 +559,9 @@ RsDoIrqDescriptor ( +@@ -559,9 +569,9 @@ RsDoIrqDescriptor ( InitializerOp = RsCompleteNodeAndGetNext (InitializerOp); } @@ -589,7 +593,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian return (Rnode); } -@@ -660,6 +660,6 @@ RsDoIrqNoFlagsDescriptor ( +@@ -660,6 +670,6 @@ RsDoIrqNoFlagsDescriptor ( /* Now we can set the interrupt mask */ @@ -597,10 +601,11 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian + ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask); return (Rnode); } -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 -@@ -76,6 +77,7 @@ RsDoGeneralRegisterDescriptor ( +Index: src/source/compiler/aslrestype2.c +=================================================================== +--- src.orig/source/compiler/aslrestype2.c ++++ src/source/compiler/aslrestype2.c +@@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor ( ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; UINT32 CurrentByteOffset; @@ -608,7 +613,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian a UINT32 i; -@@ -85,7 +87,9 @@ RsDoGeneralRegisterDescriptor ( +@@ -85,7 +86,9 @@ RsDoGeneralRegisterDescriptor ( Descriptor = Rnode->Buffer; Descriptor->GenericReg.DescriptorType = ACPI_RESOURCE_NAME_GENERIC_REGISTER; @@ -619,7 +624,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian a /* Process all child initialization nodes */ -@@ -116,7 +117,8 @@ RsDoGeneralRegisterDescriptor ( +@@ -116,7 +119,8 @@ RsDoGeneralRegisterDescriptor ( case 3: /* Register Address */ @@ -629,7 +634,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; -@@ -171,6 +172,7 @@ RsDoInterruptDescriptor ( +@@ -171,6 +175,7 @@ RsDoInterruptDescriptor ( AML_RESOURCE *Rover = NULL; ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; @@ -637,7 +642,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian a UINT16 StringLength = 0; UINT32 OptionIndex = 0; UINT32 CurrentByteOffset; -@@ -219,7 +219,7 @@ RsDoInterruptDescriptor ( +@@ -219,7 +224,7 @@ RsDoInterruptDescriptor ( * Initial descriptor length -- may be enlarged if there are * optional fields present */ @@ -646,7 +651,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian a Descriptor->ExtendedIrq.InterruptCount = 0; Rover = ACPI_CAST_PTR (AML_RESOURCE, -@@ -327,10 +328,11 @@ RsDoInterruptDescriptor ( +@@ -327,10 +332,11 @@ RsDoInterruptDescriptor ( /* Save the integer and move pointer to the next one */ @@ -660,7 +665,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian a /* Case 7: First interrupt number in list */ -@@ -366,7 +366,7 @@ RsDoInterruptDescriptor ( +@@ -366,7 +372,7 @@ RsDoInterruptDescriptor ( { Rover->ByteItem = ResSourceIndex; Rover = ACPI_ADD_PTR (AML_RESOURCE, &(Rover->ByteItem), 1); @@ -669,7 +674,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian a } /* Add optional ResSource string if present */ -@@ -378,13 +379,14 @@ RsDoInterruptDescriptor ( +@@ -378,13 +384,14 @@ RsDoInterruptDescriptor ( Rover = ACPI_ADD_PTR ( AML_RESOURCE, &(Rover->ByteItem), StringLength); @@ -686,7 +691,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian a return (Rnode); } -@@ -432,7 +432,7 @@ RsDoVendorLargeDescriptor ( +@@ -432,7 +439,7 @@ RsDoVendorLargeDescriptor ( Descriptor = Rnode->Buffer; Descriptor->VendorLarge.DescriptorType = ACPI_RESOURCE_NAME_VENDOR_LARGE; @@ -695,10 +700,11 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian a /* Point to end-of-descriptor for vendor data */ -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 -@@ -79,7 +85,13 @@ RsDoDwordIoDescriptor ( +Index: src/source/compiler/aslrestype2d.c +=================================================================== +--- src.orig/source/compiler/aslrestype2d.c ++++ src/source/compiler/aslrestype2d.c +@@ -79,7 +79,13 @@ RsDoDwordIoDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; UINT16 StringLength = 0; @@ -712,7 +718,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian UINT8 *OptionalFields; UINT32 CurrentByteOffset; UINT32 i; -@@ -102,8 +101,7 @@ RsDoDwordIoDescriptor ( +@@ -102,8 +108,7 @@ RsDoDwordIoDescriptor ( * optional fields present */ OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS32); @@ -722,7 +728,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian sizeof (AML_RESOURCE_LARGE_HEADER)); /* Process all child initialization nodes */ -@@ -147,8 +146,7 @@ RsDoDwordIoDescriptor ( +@@ -147,8 +152,7 @@ RsDoDwordIoDescriptor ( case 5: /* Address Granularity */ @@ -732,7 +738,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; -@@ -156,8 +155,7 @@ RsDoDwordIoDescriptor ( +@@ -156,8 +160,7 @@ RsDoDwordIoDescriptor ( case 6: /* Address Min */ @@ -742,7 +748,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; -@@ -165,8 +164,7 @@ RsDoDwordIoDescriptor ( +@@ -165,8 +168,7 @@ RsDoDwordIoDescriptor ( case 7: /* Address Max */ @@ -752,7 +758,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; -@@ -174,16 +172,14 @@ RsDoDwordIoDescriptor ( +@@ -174,16 +176,14 @@ RsDoDwordIoDescriptor ( case 8: /* Translation Offset */ @@ -780,7 +786,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian ResSourceIndex = TRUE; } break; -@@ -211,8 +210,7 @@ RsDoDwordIoDescriptor ( +@@ -211,8 +211,7 @@ RsDoDwordIoDescriptor ( { /* Found a valid ResourceSource */ @@ -790,7 +796,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian strcpy ((char *) &OptionalFields[OptionIndex], -@@ -272,13 +279,20 @@ RsDoDwordIoDescriptor ( +@@ -272,13 +271,20 @@ RsDoDwordIoDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -829,7 +835,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian UINT32 CurrentByteOffset; UINT32 i; BOOLEAN ResSourceIndex = FALSE; -@@ -332,11 +330,9 @@ RsDoDwordMemoryDescriptor ( +@@ -332,11 +344,9 @@ RsDoDwordMemoryDescriptor ( * optional fields present */ OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS32); @@ -842,7 +848,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian /* Process all child initialization nodes */ for (i = 0; InitializerOp; i++) -@@ -385,8 +384,7 @@ RsDoDwordMemoryDescriptor ( +@@ -385,8 +395,7 @@ RsDoDwordMemoryDescriptor ( case 6: /* Address Granularity */ @@ -852,7 +858,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; -@@ -394,8 +3926,7 @@ RsDoDwordMemoryDescriptor ( +@@ -394,8 +403,7 @@ RsDoDwordMemoryDescriptor ( case 7: /* Min Address */ @@ -862,7 +868,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; -@@ -403,8 +402,7 @@ RsDoDwordMemoryDescriptor ( +@@ -403,8 +411,7 @@ RsDoDwordMemoryDescriptor ( case 8: /* Max Address */ @@ -872,7 +878,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; -@@ -412,16 +410,14 @@ RsDoDwordMemoryDescriptor ( +@@ -412,16 +419,14 @@ RsDoDwordMemoryDescriptor ( case 9: /* Translation Offset */ @@ -891,7 +897,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; -@@ -433,7 +433,7 @@ RsDoDwordMemoryDescriptor ( +@@ -433,7 +438,7 @@ RsDoDwordMemoryDescriptor ( { OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer; OptionIndex++; @@ -900,7 +906,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian ResSourceIndex = TRUE; } break; -@@ -445,8 +445,8 @@ RsDoDwordMemoryDescriptor ( +@@ -445,8 +450,8 @@ RsDoDwordMemoryDescriptor ( { if (StringLength) { @@ -911,7 +917,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian strcpy ((char *) &OptionalFields[OptionIndex], -@@ -507,13 +514,20 @@ RsDoDwordMemoryDescriptor ( +@@ -507,13 +512,20 @@ RsDoDwordMemoryDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -936,7 +942,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) + OptionIndex + StringLength; return (Rnode); -@@ -545,7 +551,13 @@ RsDoDwordSpaceDescriptor ( +@@ -545,7 +557,13 @@ RsDoDwordSpaceDescriptor ( ASL_RESOURCE_NODE *Rnode; UINT8 *OptionalFields; UINT16 StringLength = 0; @@ -950,7 +956,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian UINT32 CurrentByteOffset; UINT32 i; BOOLEAN ResSourceIndex = FALSE; -@@ -566,8 +565,7 @@ RsDoDwordSpaceDescriptor ( +@@ -566,8 +584,7 @@ RsDoDwordSpaceDescriptor ( * optional fields present */ OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS32); @@ -960,7 +966,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian sizeof (AML_RESOURCE_LARGE_HEADER)); /* Process all child initialization nodes */ -@@ -616,8 +615,7 @@ RsDoDwordSpaceDescriptor ( +@@ -616,8 +633,7 @@ RsDoDwordSpaceDescriptor ( case 6: /* Address Granularity */ @@ -970,7 +976,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; -@@ -625,8 +624,7 @@ RsDoDwordSpaceDescriptor ( +@@ -625,8 +641,7 @@ RsDoDwordSpaceDescriptor ( case 7: /* Min Address */ @@ -980,7 +986,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; -@@ -634,8 +633,7 @@ RsDoDwordSpaceDescriptor ( +@@ -634,8 +649,7 @@ RsDoDwordSpaceDescriptor ( case 8: /* Max Address */ @@ -990,7 +996,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; -@@ -643,16 +641,14 @@ RsDoDwordSpaceDescriptor ( +@@ -643,16 +657,14 @@ RsDoDwordSpaceDescriptor ( case 9: /* Translation Offset */ @@ -1009,7 +1015,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; -@@ -664,7 +664,7 @@ RsDoDwordSpaceDescriptor ( +@@ -664,7 +676,7 @@ RsDoDwordSpaceDescriptor ( { OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer; OptionIndex++; @@ -1018,7 +1024,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian ResSourceIndex = TRUE; } break; -@@ -676,8 +675,7 @@ RsDoDwordSpaceDescriptor ( +@@ -676,8 +688,7 @@ RsDoDwordSpaceDescriptor ( { if (StringLength) { @@ -1028,7 +1034,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian strcpy ((char *) &OptionalFields[OptionIndex], -@@ -724,13 +731,20 @@ RsDoDwordSpaceDescriptor ( +@@ -724,13 +735,20 @@ RsDoDwordSpaceDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -1053,10 +1059,11 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) + OptionIndex + StringLength; return (Rnode); -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 -@@ -78,6 +85,13 @@ RsDoExtendedIoDescriptor ( +Index: src/source/compiler/aslrestype2e.c +=================================================================== +--- src.orig/source/compiler/aslrestype2e.c ++++ src/source/compiler/aslrestype2e.c +@@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; UINT16 StringLength = 0; @@ -1070,7 +1077,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian UINT32 CurrentByteOffset; UINT32 i; -@@ -94,9 +95,10 @@ RsDoExtendedIoDescriptor ( +@@ -94,9 +101,10 @@ RsDoExtendedIoDescriptor ( Descriptor->ExtAddress64.ResourceType = ACPI_ADDRESS_TYPE_IO_RANGE; Descriptor->ExtAddress64.RevisionID = AML_RESOURCE_EXTENDED_ADDRESS_REVISION; @@ -1083,7 +1090,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian /* Process all child initialization nodes */ -@@ -139,7 +139,7 @@ RsDoExtendedIoDescriptor ( +@@ -139,7 +147,7 @@ RsDoExtendedIoDescriptor ( case 5: /* Address Granularity */ @@ -1092,7 +1099,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; -@@ -147,7 +147,7 @@ RsDoExtendedIoDescriptor ( +@@ -147,7 +155,7 @@ RsDoExtendedIoDescriptor ( case 6: /* Address Min */ @@ -1101,7 +1108,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; -@@ -155,7 +155,7 @@ RsDoExtendedIoDescriptor ( +@@ -155,7 +163,7 @@ RsDoExtendedIoDescriptor ( case 7: /* Address Max */ @@ -1110,7 +1117,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; -@@ -163,14 +163,14 @@ RsDoExtendedIoDescriptor ( +@@ -163,14 +171,14 @@ RsDoExtendedIoDescriptor ( case 8: /* Translation Offset */ @@ -1127,7 +1134,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; -@@ -178,7 +178,7 @@ RsDoExtendedIoDescriptor ( +@@ -178,7 +186,7 @@ RsDoExtendedIoDescriptor ( case 10: /* Type-Specific Attributes */ @@ -1136,7 +1143,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; -@@ -214,13 +221,20 @@ RsDoExtendedIoDescriptor ( +@@ -214,13 +222,20 @@ RsDoExtendedIoDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -1161,221 +1168,11 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + StringLength; return (Rnode); - } -@@ -254,6 +270,13 @@ RsDoExtendedMemoryDescriptor ( - ACPI_PARSE_OBJECT *GranOp = NULL; - ASL_RESOURCE_NODE *Rnode; - UINT16 StringLength = 0; -+ UINT16 ResourceLength = 0; -+ UINT64 Minimum = 0; -+ UINT64 Maximum = 0; -+ UINT64 AddressLength = 0; -+ UINT64 Granularity = 0; -+ UINT64 TranslationOffset = 0; -+ UINT64 TypeSpecific = 0; - UINT32 CurrentByteOffset; - UINT32 i; - -@@ -268,9 +291,10 @@ RsDoExtendedMemoryDescriptor ( - Descriptor->ExtAddress64.ResourceType = ACPI_ADDRESS_TYPE_MEMORY_RANGE; - Descriptor->ExtAddress64.RevisionID = AML_RESOURCE_EXTENDED_ADDRESS_REVISION; - -- Descriptor->ExtAddress64.ResourceLength = (UINT16) -- (sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) - -+ ResourceLength = (UINT16) (sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) - - sizeof (AML_RESOURCE_LARGE_HEADER)); -+ ACPI_MOVE_16_TO_16(&Descriptor->ExtAddress64.ResourceLength, -+ &ResourceLength); - - /* Process all child initialization nodes */ - -@@ -320,7 +344,7 @@ RsDoExtendedMemoryDescriptor ( - - case 6: /* Address Granularity */ - -- Descriptor->ExtAddress64.Granularity = InitializerOp->Asl.Value.Integer; -+ Granularity = InitializerOp->Asl.Value.Integer; - RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY, - CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity)); - GranOp = InitializerOp; -@@ -328,7 +352,7 @@ RsDoExtendedMemoryDescriptor ( - - case 7: /* Min Address */ - -- Descriptor->ExtAddress64.Minimum = InitializerOp->Asl.Value.Integer; -+ Minimum = InitializerOp->Asl.Value.Integer; - RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR, - CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum)); - MinOp = InitializerOp; -@@ -336,7 +360,7 @@ RsDoExtendedMemoryDescriptor ( - - case 8: /* Max Address */ - -- Descriptor->ExtAddress64.Maximum = InitializerOp->Asl.Value.Integer; -+ Maximum = InitializerOp->Asl.Value.Integer; - RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR, - CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum)); - MaxOp = InitializerOp; -@@ -344,14 +368,14 @@ RsDoExtendedMemoryDescriptor ( - - case 9: /* Translation Offset */ - -- Descriptor->ExtAddress64.TranslationOffset = InitializerOp->Asl.Value.Integer; -+ TranslationOffset = InitializerOp->Asl.Value.Integer; - RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION, - CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TranslationOffset)); - break; - - case 10: /* Address Length */ - -- Descriptor->ExtAddress64.AddressLength = InitializerOp->Asl.Value.Integer; -+ AddressLength = InitializerOp->Asl.Value.Integer; - RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH, - CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength)); - LengthOp = InitializerOp; -@@ -359,7 +383,7 @@ RsDoExtendedMemoryDescriptor ( - - case 11: /* Type-Specific Attributes */ - -- Descriptor->ExtAddress64.TypeSpecific = InitializerOp->Asl.Value.Integer; -+ TypeSpecific = InitializerOp->Asl.Value.Integer; - RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES, - CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific)); - break; -@@ -396,13 +420,20 @@ RsDoExtendedMemoryDescriptor ( - /* Validate the Min/Max/Len/Gran values */ - - RsLargeAddressCheck ( -- Descriptor->ExtAddress64.Minimum, -- Descriptor->ExtAddress64.Maximum, -- Descriptor->ExtAddress64.AddressLength, -- Descriptor->ExtAddress64.Granularity, -+ Minimum, -+ Maximum, -+ AddressLength, -+ Granularity, - Descriptor->ExtAddress64.Flags, - MinOp, MaxOp, LengthOp, GranOp, Op); - -+ ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.Minimum, &Minimum); -+ ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.Maximum, &Maximum); -+ ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.AddressLength, &AddressLength); -+ ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.Granularity, &Granularity); -+ ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.TranslationOffset, &TranslationOffset); -+ ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.TypeSpecific, &TypeSpecific); -+ - Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + StringLength; - return (Rnode); - } -@@ -435,6 +466,13 @@ RsDoExtendedSpaceDescriptor ( - ACPI_PARSE_OBJECT *GranOp = NULL; - ASL_RESOURCE_NODE *Rnode; - UINT16 StringLength = 0; -+ UINT16 ResourceLength = 0; -+ UINT64 Minimum = 0; -+ UINT64 Maximum = 0; -+ UINT64 AddressLength = 0; -+ UINT64 Granularity = 0; -+ UINT64 TranslationOffset = 0; -+ UINT64 TypeSpecific = 0; - UINT32 i; - - -@@ -448,9 +486,10 @@ RsDoExtendedSpaceDescriptor ( - Descriptor->ExtAddress64.DescriptorType = ACPI_RESOURCE_NAME_EXTENDED_ADDRESS64; - Descriptor->ExtAddress64.RevisionID = AML_RESOURCE_EXTENDED_ADDRESS_REVISION; - -- Descriptor->ExtAddress64.ResourceLength = (UINT16) -- (sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) - -+ ResourceLength = (UINT16) (sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) - - sizeof (AML_RESOURCE_LARGE_HEADER)); -+ ACPI_MOVE_16_TO_16(&Descriptor->ExtAddress64.ResourceLength, -+ &ResourceLength); - - /* Process all child initialization nodes */ - -@@ -498,7 +537,7 @@ RsDoExtendedSpaceDescriptor ( - - case 6: /* Address Granularity */ - -- Descriptor->ExtAddress64.Granularity = InitializerOp->Asl.Value.Integer; -+ Granularity = InitializerOp->Asl.Value.Integer; - RsCreateQwordField (InitializerOp, ACPI_RESTAG_GRANULARITY, - CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Granularity)); - GranOp = InitializerOp; -@@ -506,7 +545,7 @@ RsDoExtendedSpaceDescriptor ( - - case 7: /* Min Address */ - -- Descriptor->ExtAddress64.Minimum = InitializerOp->Asl.Value.Integer; -+ Minimum = InitializerOp->Asl.Value.Integer; - RsCreateQwordField (InitializerOp, ACPI_RESTAG_MINADDR, - CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Minimum)); - MinOp = InitializerOp; -@@ -514,7 +553,7 @@ RsDoExtendedSpaceDescriptor ( - - case 8: /* Max Address */ - -- Descriptor->ExtAddress64.Maximum = InitializerOp->Asl.Value.Integer; -+ Maximum = InitializerOp->Asl.Value.Integer; - RsCreateQwordField (InitializerOp, ACPI_RESTAG_MAXADDR, - CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.Maximum)); - MaxOp = InitializerOp; -@@ -522,14 +561,14 @@ RsDoExtendedSpaceDescriptor ( - - case 9: /* Translation Offset */ - -- Descriptor->ExtAddress64.TranslationOffset = InitializerOp->Asl.Value.Integer; -+ TranslationOffset = InitializerOp->Asl.Value.Integer; - RsCreateQwordField (InitializerOp, ACPI_RESTAG_TRANSLATION, - CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TranslationOffset)); - break; - - case 10: /* Address Length */ - -- Descriptor->ExtAddress64.AddressLength = InitializerOp->Asl.Value.Integer; -+ AddressLength = InitializerOp->Asl.Value.Integer; - RsCreateQwordField (InitializerOp, ACPI_RESTAG_LENGTH, - CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.AddressLength)); - LengthOp = InitializerOp; -@@ -537,7 +576,7 @@ RsDoExtendedSpaceDescriptor ( - - case 11: /* Type-Specific Attributes */ - -- Descriptor->ExtAddress64.TypeSpecific = InitializerOp->Asl.Value.Integer; -+ TypeSpecific = InitializerOp->Asl.Value.Integer; - RsCreateQwordField (InitializerOp, ACPI_RESTAG_TYPESPECIFICATTRIBUTES, - CurrentByteOffset + ASL_RESDESC_OFFSET (ExtAddress64.TypeSpecific)); - break; -@@ -559,13 +598,20 @@ RsDoExtendedSpaceDescriptor ( - /* Validate the Min/Max/Len/Gran values */ - - RsLargeAddressCheck ( -- Descriptor->ExtAddress64.Minimum, -- Descriptor->ExtAddress64.Maximum, -- Descriptor->ExtAddress64.AddressLength, -- Descriptor->ExtAddress64.Granularity, -+ Minimum, -+ Maximum, -+ AddressLength, -+ Granularity, - Descriptor->ExtAddress64.Flags, - MinOp, MaxOp, LengthOp, GranOp, Op); - -+ ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.Minimum, &Minimum); -+ ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.Maximum, &Maximum); -+ ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.AddressLength, &AddressLength); -+ ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.Granularity, &Granularity); -+ ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.TranslationOffset, &TranslationOffset); -+ ACPI_MOVE_64_TO_64(&Descriptor->ExtAddress64.TypeSpecific, &TypeSpecific); -+ - Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + StringLength; - return (Rnode); - } -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 -@@ -80,7 +86,13 @@ RsDoQwordIoDescriptor ( +Index: src/source/compiler/aslrestype2q.c +=================================================================== +--- src.orig/source/compiler/aslrestype2q.c ++++ src/source/compiler/aslrestype2q.c +@@ -80,7 +80,13 @@ RsDoQwordIoDescriptor ( ASL_RESOURCE_NODE *Rnode; UINT8 *OptionalFields; UINT16 StringLength = 0; @@ -1389,7 +1186,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian UINT32 CurrentByteOffset; UINT32 i; BOOLEAN ResSourceIndex = FALSE; -@@ -102,8 +101,7 @@ RsDoQwordIoDescriptor ( +@@ -102,8 +108,7 @@ RsDoQwordIoDescriptor ( * optional fields present */ OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS64); @@ -1399,7 +1196,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian sizeof (AML_RESOURCE_LARGE_HEADER)); /* Process all child initialization nodes */ -@@ -147,7 +147,7 @@ RsDoQwordIoDescriptor ( +@@ -147,7 +152,7 @@ RsDoQwordIoDescriptor ( case 5: /* Address Granularity */ @@ -1408,7 +1205,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; -@@ -155,7 +155,7 @@ RsDoQwordIoDescriptor ( +@@ -155,7 +160,7 @@ RsDoQwordIoDescriptor ( case 6: /* Address Min */ @@ -1417,7 +1214,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; -@@ -163,7 +163,7 @@ RsDoQwordIoDescriptor ( +@@ -163,7 +168,7 @@ RsDoQwordIoDescriptor ( case 7: /* Address Max */ @@ -1426,7 +1223,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; -@@ -171,14 +171,14 @@ RsDoQwordIoDescriptor ( +@@ -171,14 +176,14 @@ RsDoQwordIoDescriptor ( case 8: /* Translation Offset */ @@ -1443,7 +1240,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; -@@ -190,7 +190,7 @@ RsDoQwordIoDescriptor ( +@@ -190,7 +195,7 @@ RsDoQwordIoDescriptor ( { OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer; OptionIndex++; @@ -1452,7 +1249,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian ResSourceIndex = TRUE; } break; -@@ -202,8 +201,7 @@ RsDoQwordIoDescriptor ( +@@ -202,8 +207,7 @@ RsDoQwordIoDescriptor ( { if (StringLength) { @@ -1462,7 +1259,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian strcpy ((char *) &OptionalFields[OptionIndex], -@@ -263,13 +270,20 @@ RsDoQwordIoDescriptor ( +@@ -263,13 +267,20 @@ RsDoQwordIoDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -1487,7 +1284,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) + OptionIndex + StringLength; return (Rnode); -@@ -301,7 +307,13 @@ RsDoQwordMemoryDescriptor ( +@@ -301,7 +312,13 @@ RsDoQwordMemoryDescriptor ( ASL_RESOURCE_NODE *Rnode; UINT8 *OptionalFields; UINT16 StringLength = 0; @@ -1501,7 +1298,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian UINT32 CurrentByteOffset; UINT32 i; BOOLEAN ResSourceIndex = FALSE; -@@ -323,8 +322,7 @@ RsDoQwordMemoryDescriptor ( +@@ -323,8 +340,7 @@ RsDoQwordMemoryDescriptor ( * optional fields present */ OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS64); @@ -1511,7 +1308,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian sizeof (AML_RESOURCE_LARGE_HEADER)); /* Process all child initialization nodes */ -@@ -375,7 +375,7 @@ RsDoQwordMemoryDescriptor ( +@@ -375,7 +391,7 @@ RsDoQwordMemoryDescriptor ( case 6: /* Address Granularity */ @@ -1520,7 +1317,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; -@@ -383,7 +383,7 @@ RsDoQwordMemoryDescriptor ( +@@ -383,7 +399,7 @@ RsDoQwordMemoryDescriptor ( case 7: /* Min Address */ @@ -1529,7 +1326,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; -@@ -391,7 +391,7 @@ RsDoQwordMemoryDescriptor ( +@@ -391,7 +407,7 @@ RsDoQwordMemoryDescriptor ( case 8: /* Max Address */ @@ -1538,7 +1335,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; -@@ -399,14 +399,14 @@ RsDoQwordMemoryDescriptor ( +@@ -399,14 +415,14 @@ RsDoQwordMemoryDescriptor ( case 9: /* Translation Offset */ @@ -1555,7 +1352,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; -@@ -418,7 +418,7 @@ RsDoQwordMemoryDescriptor ( +@@ -418,7 +434,7 @@ RsDoQwordMemoryDescriptor ( { OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer; OptionIndex++; @@ -1564,7 +1361,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian ResSourceIndex = TRUE; } break; -@@ -430,8 +429,7 @@ RsDoQwordMemoryDescriptor ( +@@ -430,8 +446,7 @@ RsDoQwordMemoryDescriptor ( { if (StringLength) { @@ -1574,7 +1371,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian strcpy ((char *) &OptionalFields[OptionIndex], -@@ -492,13 +499,20 @@ RsDoQwordMemoryDescriptor ( +@@ -492,13 +507,20 @@ RsDoQwordMemoryDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -1599,7 +1396,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) + OptionIndex + StringLength; return (Rnode); -@@ -530,9 +536,15 @@ RsDoQwordSpaceDescriptor ( +@@ -530,9 +552,15 @@ RsDoQwordSpaceDescriptor ( ASL_RESOURCE_NODE *Rnode; UINT8 *OptionalFields; UINT16 StringLength = 0; @@ -1615,7 +1412,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian BOOLEAN ResSourceIndex = FALSE; -@@ -551,8 +550,7 @@ RsDoQwordSpaceDescriptor ( +@@ -551,8 +579,7 @@ RsDoQwordSpaceDescriptor ( * optional fields present */ OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS64); @@ -1625,7 +1422,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian sizeof (AML_RESOURCE_LARGE_HEADER)); /* Process all child initialization nodes */ -@@ -601,7 +601,7 @@ RsDoQwordSpaceDescriptor ( +@@ -601,7 +628,7 @@ RsDoQwordSpaceDescriptor ( case 6: /* Address Granularity */ @@ -1634,7 +1431,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; -@@ -609,7 +609,7 @@ RsDoQwordSpaceDescriptor ( +@@ -609,7 +636,7 @@ RsDoQwordSpaceDescriptor ( case 7: /* Min Address */ @@ -1643,7 +1440,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; -@@ -617,7 +617,7 @@ RsDoQwordSpaceDescriptor ( +@@ -617,7 +644,7 @@ RsDoQwordSpaceDescriptor ( case 8: /* Max Address */ @@ -1652,7 +1449,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; -@@ -625,14 +625,14 @@ RsDoQwordSpaceDescriptor ( +@@ -625,14 +652,14 @@ RsDoQwordSpaceDescriptor ( case 9: /* Translation Offset */ @@ -1669,7 +1466,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; -@@ -644,7 +644,7 @@ RsDoQwordSpaceDescriptor ( +@@ -644,7 +671,7 @@ RsDoQwordSpaceDescriptor ( { OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer; OptionIndex++; @@ -1678,7 +1475,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian ResSourceIndex = TRUE; } break; -@@ -656,8 +655,7 @@ RsDoQwordSpaceDescriptor ( +@@ -656,8 +683,7 @@ RsDoQwordSpaceDescriptor ( { if (StringLength) { @@ -1688,7 +1485,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian strcpy ((char *) &OptionalFields[OptionIndex], -@@ -703,13 +710,20 @@ RsDoQwordSpaceDescriptor ( +@@ -703,13 +729,20 @@ RsDoQwordSpaceDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -1713,10 +1510,11 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) + OptionIndex + StringLength; return (Rnode); -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 -@@ -290,6 +293,9 @@ RsDoGpioIntDescriptor ( +Index: src/source/compiler/aslrestype2s.c +=================================================================== +--- src.orig/source/compiler/aslrestype2s.c ++++ src/source/compiler/aslrestype2s.c +@@ -290,6 +290,9 @@ RsDoGpioIntDescriptor ( UINT16 VendorLength; UINT16 InterruptLength; UINT16 DescriptorSize; @@ -1726,7 +1524,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian UINT32 CurrentByteOffset; UINT32 PinCount = 0; UINT32 i; -@@ -349,21 +349,21 @@ RsDoGpioIntDescriptor ( +@@ -349,21 +352,21 @@ RsDoGpioIntDescriptor ( { case 0: /* Interrupt Mode - edge/level [Flag] (_MOD) */ @@ -1751,7 +1549,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; -@@ -377,7 +377,7 @@ RsDoGpioIntDescriptor ( +@@ -377,7 +380,7 @@ RsDoGpioIntDescriptor ( case 4: /* Debounce Timeout [WORD] (_DBT) */ @@ -1760,7 +1558,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; -@@ -403,7 +403,7 @@ RsDoGpioIntDescriptor ( +@@ -403,7 +406,7 @@ RsDoGpioIntDescriptor ( case 7: /* Resource Usage (consumer/producer) */ @@ -1769,7 +1567,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian break; case 8: /* Resource Tag (Descriptor Name) */ -@@ -468,6 +472,10 @@ RsDoGpioIntDescriptor ( +@@ -468,6 +471,10 @@ RsDoGpioIntDescriptor ( InitializerOp = RsCompleteNodeAndGetNext (InitializerOp); } @@ -1780,7 +1578,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian MpSaveGpioInfo (Info->MappingOp, Descriptor, PinCount, PinList, ResourceSource); return (Rnode); } -@@ -500,6 +504,10 @@ RsDoGpioIoDescriptor ( +@@ -500,6 +507,10 @@ RsDoGpioIoDescriptor ( UINT16 VendorLength; UINT16 InterruptLength; UINT16 DescriptorSize; @@ -1791,7 +1589,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian UINT32 CurrentByteOffset; UINT32 PinCount = 0; UINT32 i; -@@ -560,7 +560,7 @@ RsDoGpioIoDescriptor ( +@@ -560,7 +571,7 @@ RsDoGpioIoDescriptor ( { case 0: /* Share Type [Flags] (_SHR) */ @@ -1800,7 +1598,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; -@@ -574,21 +574,21 @@ RsDoGpioIoDescriptor ( +@@ -574,21 +585,21 @@ RsDoGpioIoDescriptor ( case 2: /* Debounce Timeout [WORD] (_DBT) */ @@ -1825,7 +1623,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; -@@ -614,7 +614,7 @@ RsDoGpioIoDescriptor ( +@@ -614,7 +625,7 @@ RsDoGpioIoDescriptor ( case 7: /* Resource Usage (consumer/producer) */ @@ -1834,7 +1632,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian break; case 8: /* Resource Tag (Descriptor Name) */ -@@ -678,6 +683,11 @@ RsDoGpioIoDescriptor ( +@@ -678,6 +689,11 @@ RsDoGpioIoDescriptor ( InitializerOp = RsCompleteNodeAndGetNext (InitializerOp); } @@ -1846,7 +1644,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian MpSaveGpioInfo (Info->MappingOp, Descriptor, PinCount, PinList, ResourceSource); return (Rnode); } -@@ -707,6 +710,9 @@ RsDoI2cSerialBusDescriptor ( +@@ -707,6 +723,9 @@ RsDoI2cSerialBusDescriptor ( UINT16 ResSourceLength; UINT16 VendorLength; UINT16 DescriptorSize; @@ -1856,7 +1654,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian UINT32 CurrentByteOffset; UINT32 i; -@@ -756,7 +756,7 @@ RsDoI2cSerialBusDescriptor ( +@@ -756,7 +775,7 @@ RsDoI2cSerialBusDescriptor ( { case 0: /* Slave Address [WORD] (_ADR) */ @@ -1865,7 +1663,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; -@@ -770,14 +770,14 @@ RsDoI2cSerialBusDescriptor ( +@@ -770,14 +789,14 @@ RsDoI2cSerialBusDescriptor ( case 2: /* Connection Speed [DWORD] (_SPE) */ @@ -1882,7 +1680,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; -@@ -825,6 +828,9 @@ RsDoI2cSerialBusDescriptor ( +@@ -825,6 +844,9 @@ RsDoI2cSerialBusDescriptor ( InitializerOp = RsCompleteNodeAndGetNext (InitializerOp); } @@ -1892,7 +1690,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource); return (Rnode); } -@@ -854,6 +857,9 @@ RsDoSpiSerialBusDescriptor ( +@@ -854,6 +876,9 @@ RsDoSpiSerialBusDescriptor ( UINT16 ResSourceLength; UINT16 VendorLength; UINT16 DescriptorSize; @@ -1902,7 +1700,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian UINT32 CurrentByteOffset; UINT32 i; -@@ -903,21 +903,21 @@ RsDoSpiSerialBusDescriptor ( +@@ -903,21 +928,21 @@ RsDoSpiSerialBusDescriptor ( { case 0: /* Device Selection [WORD] (_ADR) */ @@ -1927,7 +1725,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; -@@ -938,7 +938,7 @@ RsDoSpiSerialBusDescriptor ( +@@ -938,7 +963,7 @@ RsDoSpiSerialBusDescriptor ( case 5: /* Connection Speed [DWORD] (_SPE) */ @@ -1936,7 +1734,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; -@@ -1000,6 +1004,10 @@ RsDoSpiSerialBusDescriptor ( +@@ -1000,6 +1025,10 @@ RsDoSpiSerialBusDescriptor ( InitializerOp = RsCompleteNodeAndGetNext (InitializerOp); } @@ -1947,7 +1745,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource); return (Rnode); } -@@ -1029,6 +1033,10 @@ RsDoUartSerialBusDescriptor ( +@@ -1029,6 +1058,10 @@ RsDoUartSerialBusDescriptor ( UINT16 ResSourceLength; UINT16 VendorLength; UINT16 DescriptorSize; @@ -1958,7 +1756,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian UINT32 CurrentByteOffset; UINT32 i; -@@ -1078,21 +1078,21 @@ RsDoUartSerialBusDescriptor ( +@@ -1078,21 +1111,21 @@ RsDoUartSerialBusDescriptor ( { case 0: /* Connection Speed (Baud Rate) [DWORD] (_SPE) */ @@ -1983,7 +1781,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; -@@ -1106,7 +1106,7 @@ RsDoUartSerialBusDescriptor ( +@@ -1106,7 +1139,7 @@ RsDoUartSerialBusDescriptor ( case 4: /* Endianness [Flag] (_END) */ @@ -1992,7 +1790,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; -@@ -1120,21 +1120,21 @@ RsDoUartSerialBusDescriptor ( +@@ -1120,21 +1153,21 @@ RsDoUartSerialBusDescriptor ( case 6: /* Flow Control [Flags] (_FLC) */ @@ -2017,7 +1815,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; -@@ -1192,6 +1197,11 @@ RsDoUartSerialBusDescriptor ( +@@ -1192,6 +1225,11 @@ RsDoUartSerialBusDescriptor ( InitializerOp = RsCompleteNodeAndGetNext (InitializerOp); } @@ -2029,10 +1827,11 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource); return (Rnode); } -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 -@@ -81,6 +87,12 @@ RsDoWordIoDescriptor ( +Index: src/source/compiler/aslrestype2w.c +=================================================================== +--- src.orig/source/compiler/aslrestype2w.c ++++ src/source/compiler/aslrestype2w.c +@@ -81,6 +81,12 @@ RsDoWordIoDescriptor ( UINT8 *OptionalFields; UINT16 StringLength = 0; UINT32 OptionIndex = 0; @@ -2045,7 +1844,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian UINT32 CurrentByteOffset; UINT32 i; BOOLEAN ResSourceIndex = FALSE; -@@ -102,8 +101,7 @@ RsDoWordIoDescriptor ( +@@ -102,8 +108,7 @@ RsDoWordIoDescriptor ( * optional fields present */ OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS16); @@ -2055,7 +1854,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian sizeof (AML_RESOURCE_LARGE_HEADER)); /* Process all child initialization nodes */ -@@ -147,7 +147,7 @@ RsDoWordIoDescriptor ( +@@ -147,7 +152,7 @@ RsDoWordIoDescriptor ( case 5: /* Address Granularity */ @@ -2064,7 +1863,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; -@@ -155,7 +155,7 @@ RsDoWordIoDescriptor ( +@@ -155,7 +160,7 @@ RsDoWordIoDescriptor ( case 6: /* Address Min */ @@ -2073,7 +1872,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; -@@ -163,7 +163,7 @@ RsDoWordIoDescriptor ( +@@ -163,7 +168,7 @@ RsDoWordIoDescriptor ( case 7: /* Address Max */ @@ -2082,7 +1881,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; -@@ -171,14 +171,14 @@ RsDoWordIoDescriptor ( +@@ -171,14 +176,14 @@ RsDoWordIoDescriptor ( case 8: /* Translation Offset */ @@ -2099,7 +1898,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; -@@ -190,7 +190,7 @@ RsDoWordIoDescriptor ( +@@ -190,7 +195,7 @@ RsDoWordIoDescriptor ( { OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer; OptionIndex++; @@ -2108,7 +1907,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian ResSourceIndex = TRUE; } break; -@@ -202,8 +201,7 @@ RsDoWordIoDescriptor ( +@@ -202,8 +207,7 @@ RsDoWordIoDescriptor ( { if (StringLength) { @@ -2118,7 +1917,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian strcpy ((char *) &OptionalFields[OptionIndex], -@@ -263,13 +270,20 @@ RsDoWordIoDescriptor ( +@@ -263,13 +267,20 @@ RsDoWordIoDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -2143,7 +1942,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) + OptionIndex + StringLength; return (Rnode); -@@ -302,6 +308,12 @@ RsDoWordBusNumberDescriptor ( +@@ -302,6 +313,12 @@ RsDoWordBusNumberDescriptor ( UINT8 *OptionalFields; UINT16 StringLength = 0; UINT32 OptionIndex = 0; @@ -2156,7 +1955,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian UINT32 CurrentByteOffset; UINT32 i; BOOLEAN ResSourceIndex = FALSE; -@@ -323,8 +322,7 @@ RsDoWordBusNumberDescriptor ( +@@ -323,8 +340,7 @@ RsDoWordBusNumberDescriptor ( * optional fields present */ OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS16); @@ -2166,7 +1965,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian sizeof (AML_RESOURCE_LARGE_HEADER)); /* Process all child initialization nodes */ -@@ -361,8 +360,7 @@ RsDoWordBusNumberDescriptor ( +@@ -361,8 +377,7 @@ RsDoWordBusNumberDescriptor ( case 4: /* Address Granularity */ @@ -2176,7 +1975,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; -@@ -370,8 +369,7 @@ RsDoWordBusNumberDescriptor ( +@@ -370,8 +385,7 @@ RsDoWordBusNumberDescriptor ( case 5: /* Min Address */ @@ -2186,7 +1985,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; -@@ -379,8 +378,7 @@ RsDoWordBusNumberDescriptor ( +@@ -379,8 +393,7 @@ RsDoWordBusNumberDescriptor ( case 6: /* Max Address */ @@ -2196,7 +1995,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; -@@ -388,16 +386,14 @@ RsDoWordBusNumberDescriptor ( +@@ -388,16 +401,14 @@ RsDoWordBusNumberDescriptor ( case 7: /* Translation Offset */ @@ -2215,7 +2014,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; -@@ -409,7 +409,7 @@ RsDoWordBusNumberDescriptor ( +@@ -409,7 +420,7 @@ RsDoWordBusNumberDescriptor ( { OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer; OptionIndex++; @@ -2224,7 +2023,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian ResSourceIndex = TRUE; } break; -@@ -421,8 +420,7 @@ RsDoWordBusNumberDescriptor ( +@@ -421,8 +432,7 @@ RsDoWordBusNumberDescriptor ( { if (StringLength) { @@ -2234,7 +2033,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian strcpy ((char *) &OptionalFields[OptionIndex], -@@ -468,13 +475,20 @@ RsDoWordBusNumberDescriptor ( +@@ -468,13 +478,20 @@ RsDoWordBusNumberDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -2259,7 +2058,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) + OptionIndex + StringLength; return (Rnode); -@@ -507,6 +513,12 @@ RsDoWordSpaceDescriptor ( +@@ -507,6 +524,12 @@ RsDoWordSpaceDescriptor ( UINT8 *OptionalFields; UINT16 StringLength = 0; UINT32 OptionIndex = 0; @@ -2272,7 +2071,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian UINT32 CurrentByteOffset; UINT32 i; BOOLEAN ResSourceIndex = FALSE; -@@ -527,8 +526,7 @@ RsDoWordSpaceDescriptor ( +@@ -527,8 +550,7 @@ RsDoWordSpaceDescriptor ( * optional fields present */ OptionalFields = ((UINT8 *) Descriptor) + sizeof (AML_RESOURCE_ADDRESS16); @@ -2282,7 +2081,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian sizeof (AML_RESOURCE_LARGE_HEADER)); /* Process all child initialization nodes */ -@@ -577,8 +576,7 @@ RsDoWordSpaceDescriptor ( +@@ -577,8 +599,7 @@ RsDoWordSpaceDescriptor ( case 6: /* Address Granularity */ @@ -2292,7 +2091,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; -@@ -586,8 +585,7 @@ RsDoWordSpaceDescriptor ( +@@ -586,8 +607,7 @@ RsDoWordSpaceDescriptor ( case 7: /* Min Address */ @@ -2302,7 +2101,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; -@@ -595,8 +594,7 @@ RsDoWordSpaceDescriptor ( +@@ -595,8 +615,7 @@ RsDoWordSpaceDescriptor ( case 8: /* Max Address */ @@ -2312,7 +2111,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; -@@ -604,16 +602,14 @@ RsDoWordSpaceDescriptor ( +@@ -604,16 +623,14 @@ RsDoWordSpaceDescriptor ( case 9: /* Translation Offset */ @@ -2331,7 +2130,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; -@@ -625,7 +625,7 @@ RsDoWordSpaceDescriptor ( +@@ -625,7 +642,7 @@ RsDoWordSpaceDescriptor ( { OptionalFields[0] = (UINT8) InitializerOp->Asl.Value.Integer; OptionIndex++; @@ -2340,7 +2139,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian ResSourceIndex = TRUE; } break; -@@ -637,8 +636,7 @@ RsDoWordSpaceDescriptor ( +@@ -637,8 +654,7 @@ RsDoWordSpaceDescriptor ( { if (StringLength) { @@ -2350,7 +2149,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian strcpy ((char *) &OptionalFields[OptionIndex], -@@ -684,13 +691,20 @@ RsDoWordSpaceDescriptor ( +@@ -684,13 +700,20 @@ RsDoWordSpaceDescriptor ( /* Validate the Min/Max/Len/Gran values */ RsLargeAddressCheck ( @@ -2375,10 +2174,11 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) + OptionIndex + StringLength; return (Rnode); -diff -up acpica-unix2-20140424/source/include/acmacros.h.debian-big_endian acpica-unix2-20140424/source/include/acmacros.h ---- acpica-unix2-20140424/source/include/acmacros.h.debian-big_endian 2014-04-24 11:49:05.000000000 -0400 -+++ acpica-unix2-20140424/source/include/acmacros.h 2014-06-06 20:43:34.721825238 -0400 -@@ -111,7 +111,8 @@ +Index: src/source/include/acmacros.h +=================================================================== +--- src.orig/source/include/acmacros.h ++++ src/source/include/acmacros.h +@@ -100,7 +100,8 @@ /* 32-bit source, 16/32/64 destination */ @@ -2388,7 +2188,7 @@ diff -up acpica-unix2-20140424/source/include/acmacros.h.debian-big_endian acpic #define ACPI_MOVE_32_TO_32(d, s) {(( UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[3];\ (( UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[2];\ -@@ -126,9 +127,13 @@ +@@ -115,9 +116,13 @@ /* 64-bit source, 16/32/64 destination */ @@ -2404,7 +2204,7 @@ diff -up acpica-unix2-20140424/source/include/acmacros.h.debian-big_endian acpic #define ACPI_MOVE_64_TO_64(d, s) {(( UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[7];\ (( UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[6];\ -@@ -155,7 +160,9 @@ +@@ -144,7 +149,9 @@ /* 32-bit source, 16/32/64 destination */ @@ -2415,9 +2215,10 @@ diff -up acpica-unix2-20140424/source/include/acmacros.h.debian-big_endian acpic #define ACPI_MOVE_32_TO_32(d, s) *(UINT32 *)(void *)(d) = *(UINT32 *)(void *)(s) #define ACPI_MOVE_32_TO_64(d, s) *(UINT64 *)(void *)(d) = *(UINT32 *)(void *)(s) -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 +Index: src/source/include/platform/aclinux.h +=================================================================== +--- src.orig/source/include/platform/aclinux.h ++++ src/source/include/platform/aclinux.h @@ -167,6 +167,7 @@ #include #include diff --git a/debian-unaligned.patch b/debian-unaligned.patch index a042148..1cc2914 100644 --- a/debian-unaligned.patch +++ b/debian-unaligned.patch @@ -15,11 +15,11 @@ Signed-off-by: Paolo Bonzini source/include/actypes.h | 26 +++++++++++++------------- 3 file modificati, 32 inserzioni(+), 21 rimozioni(-) -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 -@@ -782,28 +592,31 @@ TrCreateValuedLeafNode ( +Index: src/source/compiler/asltree.c +=================================================================== +--- src.orig/source/compiler/asltree.c ++++ src/source/compiler/asltree.c +@@ -862,28 +862,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)); @@ -28,53 +28,54 @@ index ebf87f3..fd859d7 100644 switch (ParseOpcode) { case PARSEOP_STRING_LITERAL: - + - DbgPrint (ASL_PARSE_OUTPUT, "STRING->%s", Value); + Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value; + DbgPrint (ASL_PARSE_OUTPUT, "STRING->%s", Op->Asl.Value.String); break; case PARSEOP_NAMESEG: - + - DbgPrint (ASL_PARSE_OUTPUT, "NAMESEG->%s", Value); + Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value; + DbgPrint (ASL_PARSE_OUTPUT, "NAMESEG->%s", Op->Asl.Value.String); break; case PARSEOP_NAMESTRING: - + - DbgPrint (ASL_PARSE_OUTPUT, "NAMESTRING->%s", Value); + Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value; + DbgPrint (ASL_PARSE_OUTPUT, "NAMESTRING->%s", Op->Asl.Value.String); break; case PARSEOP_EISAID: - + - DbgPrint (ASL_PARSE_OUTPUT, "EISAID->%s", Value); + Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value; + DbgPrint (ASL_PARSE_OUTPUT, "EISAID->%s", Op->Asl.Value.String); break; case PARSEOP_METHOD: -@@ -813,11 +622,13 @@ TrCreateValuedLeafNode ( +@@ -893,12 +896,14 @@ TrCreateValuedLeafNode ( case PARSEOP_INTEGER: - + + Op->Asl.Value.Integer = Value; - DbgPrint (ASL_PARSE_OUTPUT, "INTEGER"); + DbgPrint (ASL_PARSE_OUTPUT, "INTEGER->%8.8X%8.8X", + ACPI_FORMAT_UINT64 (Value)); break; default: - + + Op->Asl.Value.Integer = Value; break; } -diff --git a/source/components/executer/exoparg2.c b/source/components/executer/exoparg2.c -index e55f40c..ed5b1fd 100644 ---- a/source/components/executer/exoparg2.c -+++ b/source/components/executer/exoparg2.c -@@ -172,6 +176,8 @@ AcpiExOpcode_2A_2T_1R ( +Index: src/source/components/executer/exoparg2.c +=================================================================== +--- src.orig/source/components/executer/exoparg2.c ++++ src/source/components/executer/exoparg2.c +@@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R ( ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0]; ACPI_OPERAND_OBJECT *ReturnDesc1 = NULL; ACPI_OPERAND_OBJECT *ReturnDesc2 = NULL; @@ -83,7 +84,7 @@ index e55f40c..ed5b1fd 100644 ACPI_STATUS Status; -@@ -205,8 +211,10 @@ AcpiExOpcode_2A_2T_1R ( +@@ -205,8 +207,10 @@ AcpiExOpcode_2A_2T_1R ( Status = AcpiUtDivide (Operand[0]->Integer.Value, Operand[1]->Integer.Value, @@ -96,7 +97,7 @@ index e55f40c..ed5b1fd 100644 if (ACPI_FAILURE (Status)) { goto Cleanup; -@@ -280,6 +285,7 @@ AcpiExOpcode_2A_1T_1R ( +@@ -280,6 +284,7 @@ AcpiExOpcode_2A_1T_1R ( ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0]; ACPI_OPERAND_OBJECT *ReturnDesc = NULL; UINT64 Index; @@ -104,7 +105,7 @@ index e55f40c..ed5b1fd 100644 ACPI_STATUS Status = AE_OK; ACPI_SIZE Length = 0; -@@ -323,7 +333,8 @@ AcpiExOpcode_2A_1T_1R ( +@@ -323,7 +328,8 @@ AcpiExOpcode_2A_1T_1R ( Status = AcpiUtDivide (Operand[0]->Integer.Value, Operand[1]->Integer.Value, NULL, @@ -114,11 +115,11 @@ index e55f40c..ed5b1fd 100644 break; case AML_CONCAT_OP: /* Concatenate (Data1, Data2, Result) */ -diff --git a/source/include/actypes.h b/source/include/actypes.h -index 07fb7d5..08bdf2f 100644 ---- a/source/include/actypes.h -+++ b/source/include/actypes.h -@@ -143,6 +156,19 @@ typedef COMPILER_DEPENDENT_INT64 INT64; +Index: src/source/include/actypes.h +=================================================================== +--- src.orig/source/include/actypes.h ++++ src/source/include/actypes.h +@@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64 */ #define ACPI_THREAD_ID UINT64 @@ -138,7 +139,7 @@ index 07fb7d5..08bdf2f 100644 /******************************************************************************* * -@@ -169,19 +182,6 @@ typedef UINT64 ACPI_PHYSICAL_ADDRESS; +@@ -169,19 +182,6 @@ typedef UINT64 #define ACPI_SIZE_MAX ACPI_UINT64_MAX #define ACPI_USE_NATIVE_DIVIDE /* Has native 64-bit integer support */ @@ -158,6 +159,3 @@ index 07fb7d5..08bdf2f 100644 /******************************************************************************* * --- -1.7.12.1 - diff --git a/f23-harden.patch b/f23-harden.patch index 0f834c9..2d6d998 100644 --- a/f23-harden.patch +++ b/f23-harden.patch @@ -1,7 +1,8 @@ -diff -Naur acpica-unix2-20150204/generate/unix/Makefile.config acpica-unix2-20150204-new/generate/unix/Makefile.config ---- acpica-unix2-20150204/generate/unix/Makefile.config 2015-04-06 17:12:41.069521987 -0600 -+++ acpica-unix2-20150204-new/generate/unix/Makefile.config 2015-04-06 17:14:43.218806842 -0600 -@@ -159,6 +159,8 @@ +Index: src/generate/unix/Makefile.config +=================================================================== +--- src.orig/generate/unix/Makefile.config ++++ src/generate/unix/Makefile.config +@@ -163,6 +163,8 @@ ifneq ($(NOFORTIFY),TRUE) OPT_CFLAGS += -D_FORTIFY_SOURCE=2 endif @@ -10,10 +11,11 @@ diff -Naur acpica-unix2-20150204/generate/unix/Makefile.config acpica-unix2-2015 CFLAGS += \ -D$(HOST)\ -D_GNU_SOURCE\ -diff -Naur acpica-unix2-20150204/generate/unix/iasl/Makefile acpica-unix2-20150204-new/generate/unix/iasl/Makefile ---- acpica-unix2-20150204/generate/unix/iasl/Makefile 2015-02-04 14:12:17.000000000 -0700 -+++ acpica-unix2-20150204-new/generate/unix/iasl/Makefile 2015-04-06 17:34:07.199134458 -0600 -@@ -301,20 +301,21 @@ +Index: src/generate/unix/iasl/Makefile +=================================================================== +--- src.orig/generate/unix/iasl/Makefile ++++ src/generate/unix/iasl/Makefile +@@ -301,20 +301,21 @@ $(OBJDIR)/prparserparse.c : $(ASL_COM # Cannot use the common compile warning flags since the C files are created # by the utilities above and they are not necessarily ANSI C, etc. # diff --git a/int-format.patch b/int-format.patch index 271e023..6b07854 100644 --- a/int-format.patch +++ b/int-format.patch @@ -1,7 +1,8 @@ -diff -Naur acpica-unix2-20150204.orig/source/compiler/aslcompile.c acpica-unix2-20150204/source/compiler/aslcompile.c ---- acpica-unix2-20150204.orig/source/compiler/aslcompile.c 2015-03-02 17:11:22.300989116 -0700 -+++ acpica-unix2-20150204/source/compiler/aslcompile.c 2015-03-02 17:11:36.883174716 -0700 -@@ -680,7 +680,7 @@ +Index: src/source/compiler/aslcompile.c +=================================================================== +--- src.orig/source/compiler/aslcompile.c ++++ src/source/compiler/aslcompile.c +@@ -688,7 +688,7 @@ CmCleanupAndExit ( if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) { @@ -10,10 +11,11 @@ diff -Naur acpica-unix2-20150204.orig/source/compiler/aslcompile.c acpica-unix2- ASL_MAX_ERROR_COUNT); } -diff -Naur acpica-unix2-20150204.orig/source/tools/acpiexec/aemain.c acpica-unix2-20150204/source/tools/acpiexec/aemain.c ---- acpica-unix2-20150204.orig/source/tools/acpiexec/aemain.c 2015-03-02 17:11:22.313989281 -0700 -+++ acpica-unix2-20150204/source/tools/acpiexec/aemain.c 2015-03-02 17:12:42.467009457 -0700 -@@ -197,7 +197,7 @@ +Index: src/source/tools/acpiexec/aemain.c +=================================================================== +--- src.orig/source/tools/acpiexec/aemain.c ++++ src/source/tools/acpiexec/aemain.c +@@ -197,7 +197,7 @@ AeDoOptions ( if (strlen (AcpiGbl_Optarg) > (AE_BUFFER_SIZE -1)) { @@ -22,10 +24,11 @@ diff -Naur acpica-unix2-20150204.orig/source/tools/acpiexec/aemain.c acpica-unix (UINT32) strlen (AcpiGbl_Optarg), (AE_BUFFER_SIZE -1)); return (-1); } -diff -Naur acpica-unix2-20150204.orig/source/compiler/aslerror.c acpica-unix2-20150204/source/compiler/aslerror.c ---- acpica-unix2-20150204.orig/source/compiler/aslerror.c 2015-02-04 14:12:18.000000000 -0700 -+++ acpica-unix2-20150204/source/compiler/aslerror.c 2015-03-02 19:01:35.880311085 -0700 -@@ -685,7 +685,7 @@ +Index: src/source/compiler/aslerror.c +=================================================================== +--- src.orig/source/compiler/aslerror.c ++++ src/source/compiler/aslerror.c +@@ -685,7 +685,7 @@ AslCommonError ( Gbl_ExceptionCount[Level]++; if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) { @@ -34,7 +37,7 @@ diff -Naur acpica-unix2-20150204.orig/source/compiler/aslerror.c acpica-unix2-20 Gbl_SourceLine = 0; Gbl_NextError = Gbl_ErrorLog; -@@ -731,7 +731,7 @@ +@@ -731,7 +731,7 @@ AslDisableException ( if (Gbl_DisabledMessagesIndex >= ASL_MAX_DISABLED_MESSAGES) { @@ -43,10 +46,11 @@ diff -Naur acpica-unix2-20150204.orig/source/compiler/aslerror.c acpica-unix2-20 ASL_MAX_DISABLED_MESSAGES); return (AE_LIMIT); } -diff -Naur acpica-unix2-20150204.orig/source/components/debugger/dbexec.c acpica-unix2-20150204/source/components/debugger/dbexec.c ---- acpica-unix2-20150204.orig/source/components/debugger/dbexec.c 2015-02-04 14:12:19.000000000 -0700 -+++ acpica-unix2-20150204/source/components/debugger/dbexec.c 2015-03-02 19:03:54.240975631 -0700 -@@ -214,7 +214,7 @@ +Index: src/source/components/debugger/dbexec.c +=================================================================== +--- src.orig/source/components/debugger/dbexec.c ++++ src/source/components/debugger/dbexec.c +@@ -214,7 +214,7 @@ AcpiDbExecuteMethod ( { ACPI_ERROR ((AE_INFO, "Possible overflow of internal debugger buffer (size 0x%X needed 0x%X)", @@ -55,10 +59,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/debugger/dbexec.c acpica } } -diff -Naur acpica-unix2-20150204.orig/source/compiler/aslopt.c acpica-unix2-20150204/source/compiler/aslopt.c ---- acpica-unix2-20150204.orig/source/compiler/aslopt.c 2015-02-04 14:12:18.000000000 -0700 -+++ acpica-unix2-20150204/source/compiler/aslopt.c 2015-03-03 17:49:35.616964598 -0700 -@@ -576,7 +576,7 @@ +Index: src/source/compiler/aslopt.c +=================================================================== +--- src.orig/source/compiler/aslopt.c ++++ src/source/compiler/aslopt.c +@@ -576,7 +576,7 @@ OptOptimizeNamePath ( } ACPI_DEBUG_PRINT_RAW ((ACPI_DB_OPTIMIZATIONS, @@ -67,10 +72,11 @@ diff -Naur acpica-unix2-20150204.orig/source/compiler/aslopt.c acpica-unix2-2015 Op->Asl.LogicalLineNumber, AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode), AcpiPsGetOpcodeName (Op->Common.AmlOpcode))); -diff -Naur acpica-unix2-20150204.orig/source/components/dispatcher/dsmthdat.c acpica-unix2-20150204/source/components/dispatcher/dsmthdat.c ---- acpica-unix2-20150204.orig/source/components/dispatcher/dsmthdat.c 2015-02-04 14:12:19.000000000 -0700 -+++ acpica-unix2-20150204/source/components/dispatcher/dsmthdat.c 2015-03-03 17:50:38.719711924 -0700 -@@ -287,7 +287,7 @@ +Index: src/source/components/dispatcher/dsmthdat.c +=================================================================== +--- src.orig/source/components/dispatcher/dsmthdat.c ++++ src/source/components/dispatcher/dsmthdat.c +@@ -287,7 +287,7 @@ AcpiDsMethodDataGetNode ( if (Index > ACPI_METHOD_MAX_LOCAL) { ACPI_ERROR ((AE_INFO, @@ -79,7 +85,7 @@ diff -Naur acpica-unix2-20150204.orig/source/components/dispatcher/dsmthdat.c ac Index, ACPI_METHOD_MAX_LOCAL)); return_ACPI_STATUS (AE_AML_INVALID_INDEX); } -@@ -302,7 +302,7 @@ +@@ -302,7 +302,7 @@ AcpiDsMethodDataGetNode ( if (Index > ACPI_METHOD_MAX_ARG) { ACPI_ERROR ((AE_INFO, @@ -88,10 +94,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/dispatcher/dsmthdat.c ac Index, ACPI_METHOD_MAX_ARG)); return_ACPI_STATUS (AE_AML_INVALID_INDEX); } -diff -Naur acpica-unix2-20150204.orig/source/compiler/aslpredef.c acpica-unix2-20150204/source/compiler/aslpredef.c ---- acpica-unix2-20150204.orig/source/compiler/aslpredef.c 2015-02-04 14:12:18.000000000 -0700 -+++ acpica-unix2-20150204/source/compiler/aslpredef.c 2015-03-03 18:13:02.317600741 -0700 -@@ -114,7 +114,7 @@ +Index: src/source/compiler/aslpredef.c +=================================================================== +--- src.orig/source/compiler/aslpredef.c ++++ src/source/compiler/aslpredef.c +@@ -114,7 +114,7 @@ ApCheckForPredefinedMethod ( if (MethodInfo->NumArguments != 0) { @@ -100,10 +107,11 @@ diff -Naur acpica-unix2-20150204.orig/source/compiler/aslpredef.c acpica-unix2-2 AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op, MsgBuffer); -diff -Naur acpica-unix2-20150204.orig/source/compiler/aslprepkg.c acpica-unix2-20150204/source/compiler/aslprepkg.c ---- acpica-unix2-20150204.orig/source/compiler/aslprepkg.c 2015-02-04 14:12:18.000000000 -0700 -+++ acpica-unix2-20150204/source/compiler/aslprepkg.c 2015-03-03 18:31:00.963530037 -0700 -@@ -297,7 +297,7 @@ +Index: src/source/compiler/aslprepkg.c +=================================================================== +--- src.orig/source/compiler/aslprepkg.c ++++ src/source/compiler/aslprepkg.c +@@ -297,7 +297,7 @@ ApCheckPackage ( if (Count & 1) { @@ -112,10 +120,11 @@ diff -Naur acpica-unix2-20150204.orig/source/compiler/aslprepkg.c acpica-unix2-2 Predefined->Info.Name, Count); AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH, -diff -Naur acpica-unix2-20150204.orig/source/compiler/aslutils.c acpica-unix2-20150204/source/compiler/aslutils.c ---- acpica-unix2-20150204.orig/source/compiler/aslutils.c 2015-02-04 14:12:18.000000000 -0700 -+++ acpica-unix2-20150204/source/compiler/aslutils.c 2015-03-04 12:03:36.567992558 -0700 -@@ -77,7 +77,7 @@ +Index: src/source/compiler/aslutils.c +=================================================================== +--- src.orig/source/compiler/aslutils.c ++++ src/source/compiler/aslutils.c +@@ -77,7 +77,7 @@ UtAttachNameseg ( * ******************************************************************************/ @@ -124,7 +133,7 @@ diff -Naur acpica-unix2-20150204.orig/source/compiler/aslutils.c acpica-unix2-20 void UtDisplaySupportedTables ( -@@ -89,7 +89,7 @@ +@@ -89,7 +89,7 @@ UtDisplaySupportedTables ( printf ("\nACPI tables supported by iASL version %8.8X:\n" " (Compiler, Disassembler, Template Generator)\n\n", @@ -133,7 +142,7 @@ diff -Naur acpica-unix2-20150204.orig/source/compiler/aslutils.c acpica-unix2-20 /* Special tables */ -@@ -104,7 +104,7 @@ +@@ -104,7 +104,7 @@ UtDisplaySupportedTables ( printf ("\n Standard ACPI data tables:\n"); for (TableData = AcpiDmTableData, i = 5; TableData->Signature; TableData++, i++) { @@ -142,10 +151,11 @@ diff -Naur acpica-unix2-20150204.orig/source/compiler/aslutils.c acpica-unix2-20 } } -diff -Naur acpica-unix2-20150204.orig/source/components/dispatcher/dsutils.c acpica-unix2-20150204/source/components/dispatcher/dsutils.c ---- acpica-unix2-20150204.orig/source/components/dispatcher/dsutils.c 2015-02-04 14:12:19.000000000 -0700 -+++ acpica-unix2-20150204/source/components/dispatcher/dsutils.c 2015-03-04 12:05:14.938088002 -0700 -@@ -778,7 +778,7 @@ +Index: src/source/components/dispatcher/dsutils.c +=================================================================== +--- src.orig/source/components/dispatcher/dsutils.c ++++ src/source/components/dispatcher/dsutils.c +@@ -787,7 +787,7 @@ AcpiDsCreateOperands ( } ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, @@ -154,10 +164,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/dispatcher/dsutils.c acp WalkState->NumOperands, ArgCount, Index)); /* Create the interpreter arguments, in reverse order */ -diff -Naur acpica-unix2-20150204.orig/source/components/dispatcher/dswscope.c acpica-unix2-20150204/source/components/dispatcher/dswscope.c ---- acpica-unix2-20150204.orig/source/components/dispatcher/dswscope.c 2015-02-04 14:12:19.000000000 -0700 -+++ acpica-unix2-20150204/source/components/dispatcher/dswscope.c 2015-03-04 16:00:57.493157707 -0700 -@@ -148,7 +148,7 @@ +Index: src/source/components/dispatcher/dswscope.c +=================================================================== +--- src.orig/source/components/dispatcher/dswscope.c ++++ src/source/components/dispatcher/dswscope.c +@@ -148,7 +148,7 @@ AcpiDsScopeStackPush ( WalkState->ScopeDepth++; ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, @@ -166,7 +177,7 @@ diff -Naur acpica-unix2-20150204.orig/source/components/dispatcher/dswscope.c ac OldScopeInfo = WalkState->ScopeInfo; if (OldScopeInfo) -@@ -211,7 +211,7 @@ +@@ -211,7 +211,7 @@ AcpiDsScopeStackPop ( WalkState->ScopeDepth--; ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, @@ -175,10 +186,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/dispatcher/dswscope.c ac (UINT32) WalkState->ScopeDepth, AcpiUtGetNodeName (ScopeInfo->Scope.Node), AcpiUtGetTypeName (ScopeInfo->Common.Value))); -diff -Naur acpica-unix2-20150204.orig/source/components/events/evgpe.c acpica-unix2-20150204/source/components/events/evgpe.c ---- acpica-unix2-20150204.orig/source/components/events/evgpe.c 2015-03-05 12:47:00.454194174 -0700 -+++ acpica-unix2-20150204/source/components/events/evgpe.c 2015-03-05 12:52:16.254562359 -0700 -@@ -429,7 +429,7 @@ +Index: src/source/components/events/evgpe.c +=================================================================== +--- src.orig/source/components/events/evgpe.c ++++ src/source/components/events/evgpe.c +@@ -429,7 +429,7 @@ AcpiEvGpeDetect ( "Ignore disabled registers for GPE %02X-%02X: " "RunEnable=%02X, WakeEnable=%02X\n", GpeRegisterInfo->BaseGpeNumber, @@ -187,7 +199,7 @@ diff -Naur acpica-unix2-20150204.orig/source/components/events/evgpe.c acpica-un GpeRegisterInfo->EnableForRun, GpeRegisterInfo->EnableForWake)); continue; -@@ -455,7 +455,7 @@ +@@ -455,7 +455,7 @@ AcpiEvGpeDetect ( "Read registers for GPE %02X-%02X: Status=%02X, Enable=%02X, " "RunEnable=%02X, WakeEnable=%02X\n", GpeRegisterInfo->BaseGpeNumber, @@ -196,10 +208,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/events/evgpe.c acpica-un StatusReg, EnableReg, GpeRegisterInfo->EnableForRun, GpeRegisterInfo->EnableForWake)); -diff -Naur acpica-unix2-20150204.orig/source/components/executer/exdump.c acpica-unix2-20150204/source/components/executer/exdump.c ---- acpica-unix2-20150204.orig/source/components/executer/exdump.c 2015-02-04 14:12:19.000000000 -0700 -+++ acpica-unix2-20150204/source/components/executer/exdump.c 2015-03-05 12:49:52.556029735 -0700 -@@ -663,7 +663,7 @@ +Index: src/source/components/executer/exdump.c +=================================================================== +--- src.orig/source/components/executer/exdump.c ++++ src/source/components/executer/exdump.c +@@ -663,7 +663,7 @@ AcpiExDumpOperand ( if (Depth > 0) { ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%*s[%u] %p ", @@ -208,10 +221,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/executer/exdump.c acpica } else { -diff -Naur acpica-unix2-20150204.orig/source/components/executer/exnames.c acpica-unix2-20150204/source/components/executer/exnames.c ---- acpica-unix2-20150204.orig/source/components/executer/exnames.c 2015-02-04 14:12:19.000000000 -0700 -+++ acpica-unix2-20150204/source/components/executer/exnames.c 2015-03-05 13:17:52.054406156 -0700 -@@ -239,7 +239,7 @@ +Index: src/source/components/executer/exnames.c +=================================================================== +--- src.orig/source/components/executer/exnames.c ++++ src/source/components/executer/exnames.c +@@ -239,7 +239,7 @@ AcpiExNameSegment ( */ ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Leading character is not alpha: %02Xh (not a name)\n", @@ -220,7 +234,7 @@ diff -Naur acpica-unix2-20150204.orig/source/components/executer/exnames.c acpic Status = AE_CTRL_PENDING; } else -@@ -251,7 +251,7 @@ +@@ -251,7 +251,7 @@ AcpiExNameSegment ( Status = AE_AML_BAD_NAME; ACPI_ERROR ((AE_INFO, "Bad character 0x%02x in name, at %p", @@ -229,10 +243,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/executer/exnames.c acpic } *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress); -diff -Naur acpica-unix2-20150204.orig/source/components/executer/exfldio.c acpica-unix2-20150204/source/components/executer/exfldio.c ---- acpica-unix2-20150204.orig/source/components/executer/exfldio.c 2015-02-04 14:12:19.000000000 -0700 -+++ acpica-unix2-20150204/source/components/executer/exfldio.c 2015-03-05 16:18:34.233960417 -0700 -@@ -679,7 +679,7 @@ +Index: src/source/components/executer/exfldio.c +=================================================================== +--- src.orig/source/components/executer/exfldio.c ++++ src/source/components/executer/exfldio.c +@@ -679,7 +679,7 @@ AcpiExWriteWithUpdateRule ( ACPI_ERROR ((AE_INFO, "Unknown UpdateRule value: 0x%X", @@ -241,10 +256,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/executer/exfldio.c acpic return_ACPI_STATUS (AE_AML_OPERAND_VALUE); } } -diff -Naur acpica-unix2-20150204.orig/source/components/tables/tbfadt.c acpica-unix2-20150204/source/components/tables/tbfadt.c ---- acpica-unix2-20150204.orig/source/components/tables/tbfadt.c 2015-02-04 14:12:20.000000000 -0700 -+++ acpica-unix2-20150204/source/components/tables/tbfadt.c 2015-03-05 16:12:17.126680882 -0700 -@@ -233,7 +233,7 @@ +Index: src/source/components/tables/tbfadt.c +=================================================================== +--- src.orig/source/components/tables/tbfadt.c ++++ src/source/components/tables/tbfadt.c +@@ -233,7 +233,7 @@ AcpiTbInitGenericAddress ( if (!(Flags & ACPI_FADT_GPE_REGISTER)) { ACPI_ERROR ((AE_INFO, @@ -253,7 +269,7 @@ diff -Naur acpica-unix2-20150204.orig/source/components/tables/tbfadt.c acpica-u "to convert to GAS struct - 255 bits max, truncating", RegisterName, ByteWidth, (ByteWidth * 8))); } -@@ -304,7 +304,7 @@ +@@ -304,7 +304,7 @@ AcpiTbSelectAddress ( ACPI_BIOS_WARNING ((AE_INFO, "32/64X %s address mismatch in FADT: " @@ -262,7 +278,7 @@ diff -Naur acpica-unix2-20150204.orig/source/components/tables/tbfadt.c acpica-u RegisterName, Address32, ACPI_FORMAT_UINT64 (Address64), AcpiGbl_Use32BitFadtAddresses ? 32 : 64)); -@@ -612,7 +612,7 @@ +@@ -612,7 +612,7 @@ AcpiTbConvertFadt ( ACPI_BIOS_WARNING ((AE_INFO, "32/64X address mismatch in FADT/%s: " @@ -271,10 +287,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/tables/tbfadt.c acpica-u Name, Address32, ACPI_FORMAT_UINT64 (Address64->Address), AcpiGbl_Use32BitFadtAddresses ? 32 : 64)); -diff -Naur acpica-unix2-20150204.orig/source/components/hardware/hwregs.c acpica-unix2-20150204/source/components/hardware/hwregs.c ---- acpica-unix2-20150204.orig/source/components/hardware/hwregs.c 2015-02-04 14:12:19.000000000 -0700 -+++ acpica-unix2-20150204/source/components/hardware/hwregs.c 2015-03-05 16:46:17.157825532 -0700 -@@ -299,7 +299,7 @@ +Index: src/source/components/hardware/hwregs.c +=================================================================== +--- src.orig/source/components/hardware/hwregs.c ++++ src/source/components/hardware/hwregs.c +@@ -299,7 +299,7 @@ AcpiHwClearAcpiStatus ( ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %04X to %8.8X%8.8X\n", @@ -283,10 +300,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/hardware/hwregs.c acpica ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address))); LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock); -diff -Naur acpica-unix2-20150204.orig/source/components/tables/tbxfroot.c acpica-unix2-20150204/source/components/tables/tbxfroot.c ---- acpica-unix2-20150204.orig/source/components/tables/tbxfroot.c 2015-02-04 14:12:20.000000000 -0700 -+++ acpica-unix2-20150204/source/components/tables/tbxfroot.c 2015-03-05 17:08:45.001594511 -0700 -@@ -177,7 +177,7 @@ +Index: src/source/components/tables/tbxfroot.c +=================================================================== +--- src.orig/source/components/tables/tbxfroot.c ++++ src/source/components/tables/tbxfroot.c +@@ -177,7 +177,7 @@ AcpiFindRootPointer ( { ACPI_ERROR ((AE_INFO, "Could not map memory at 0x%8.8X for length %u", @@ -295,7 +313,7 @@ diff -Naur acpica-unix2-20150204.orig/source/components/tables/tbxfroot.c acpica return_ACPI_STATUS (AE_NO_MEMORY); } -@@ -204,7 +204,7 @@ +@@ -204,7 +204,7 @@ AcpiFindRootPointer ( { ACPI_ERROR ((AE_INFO, "Could not map memory at 0x%8.8X for length %u", @@ -304,7 +322,7 @@ diff -Naur acpica-unix2-20150204.orig/source/components/tables/tbxfroot.c acpica return_ACPI_STATUS (AE_NO_MEMORY); } -@@ -234,7 +234,7 @@ +@@ -234,7 +234,7 @@ AcpiFindRootPointer ( { ACPI_ERROR ((AE_INFO, "Could not map memory at 0x%8.8X for length %u", @@ -313,10 +331,11 @@ diff -Naur acpica-unix2-20150204.orig/source/components/tables/tbxfroot.c acpica return_ACPI_STATUS (AE_NO_MEMORY); } -diff -Naur acpica-unix2-20150204.orig/source/components/utilities/utownerid.c acpica-unix2-20150204/source/components/utilities/utownerid.c ---- acpica-unix2-20150204.orig/source/components/utilities/utownerid.c 2015-02-04 14:12:20.000000000 -0700 -+++ acpica-unix2-20150204/source/components/utilities/utownerid.c 2015-03-05 17:06:40.281055170 -0700 -@@ -230,7 +230,7 @@ +Index: src/source/components/utilities/utownerid.c +=================================================================== +--- src.orig/source/components/utilities/utownerid.c ++++ src/source/components/utilities/utownerid.c +@@ -230,7 +230,7 @@ AcpiUtReleaseOwnerId ( else { ACPI_ERROR ((AE_INFO, diff --git a/name-miscompare.patch b/name-miscompare.patch index c7b136f..29c95bd 100644 --- a/name-miscompare.patch +++ b/name-miscompare.patch @@ -4,10 +4,11 @@ to be compared were being treated as 32-bit ints, and not strings. Hence, the characters were re-ordered incorrectly, mismatching the assumptions 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 -@@ -445,7 +445,7 @@ +Index: src/source/compiler/aslanalyze.c +=================================================================== +--- src.orig/source/compiler/aslanalyze.c ++++ src/source/compiler/aslanalyze.c +@@ -445,7 +445,7 @@ ApCheckForGpeNameConflict ( /* Need a null-terminated string version of NameSeg */ @@ -16,7 +17,7 @@ diff -urN acpica-unix2-20130214/source/compiler/aslanalyze.c acpica-unix2-201302 Name[ACPI_NAME_SIZE] = 0; /* -@@ -472,7 +472,7 @@ +@@ -472,7 +472,7 @@ ApCheckForGpeNameConflict ( * 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 9c1e86e..5d10e31 100644 --- a/re-enable-big-endian.patch +++ b/re-enable-big-endian.patch @@ -2,10 +2,11 @@ Re-enable use of these tools on big-endian machines. 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 -@@ -331,18 +319,6 @@ +Index: src/source/compiler/aslmain.c +=================================================================== +--- src.orig/source/compiler/aslmain.c ++++ src/source/compiler/aslmain.c +@@ -336,18 +336,6 @@ main ( int ReturnStatus = 0;