aboutsummaryrefslogtreecommitdiff
path: root/meta-linaro/recipes-extra/acpica/files/aapits-linux.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-linaro/recipes-extra/acpica/files/aapits-linux.patch')
-rw-r--r--meta-linaro/recipes-extra/acpica/files/aapits-linux.patch118
1 files changed, 62 insertions, 56 deletions
diff --git a/meta-linaro/recipes-extra/acpica/files/aapits-linux.patch b/meta-linaro/recipes-extra/acpica/files/aapits-linux.patch
index 79bbaffa..5ab8fba0 100644
--- a/meta-linaro/recipes-extra/acpica/files/aapits-linux.patch
+++ b/meta-linaro/recipes-extra/acpica/files/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
-@@ -530,6 +530,7 @@
+Index: foo/tests/aapits/atexec.c
+===================================================================
+--- foo.orig/tests/aapits/atexec.c 2013-08-26 13:46:29.000000000 -0600
++++ foo/tests/aapits/atexec.c 2013-08-26 13:46:29.000000000 -0600
+@@ -639,6 +639,7 @@
}
@@ -9,7 +10,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi
/*******************************************************************************
*
* FUNCTION: AtBuildLocalRSDT
-@@ -648,8 +649,9 @@
+@@ -757,6 +758,7 @@
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
-@@ -1315,7 +1319,7 @@
+@@ -1424,7 +1426,7 @@
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);
}
-@@ -1683,7 +1687,9 @@
+@@ -1792,7 +1794,9 @@
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;
}
-@@ -1762,7 +1768,7 @@
+@@ -1871,7 +1875,7 @@
{
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;
-@@ -1843,7 +1849,8 @@
+@@ -1952,7 +1956,8 @@
{
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 */
-@@ -1852,7 +1859,7 @@
+@@ -1961,7 +1966,7 @@
{
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
-@@ -2915,7 +2915,7 @@
+Index: foo/tests/aapits/atinit.c
+===================================================================
+--- foo.orig/tests/aapits/atinit.c 2013-08-26 13:46:29.000000000 -0600
++++ foo/tests/aapits/atinit.c 2013-08-26 13:46:29.000000000 -0600
+@@ -3024,7 +3024,7 @@
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);
}
-@@ -2937,7 +2937,7 @@
+@@ -3046,7 +3046,7 @@
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);
}
-@@ -2957,7 +2957,7 @@
+@@ -3066,7 +3066,7 @@
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)
-@@ -3040,7 +3040,7 @@
+@@ -3149,7 +3149,7 @@
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)
-@@ -3105,7 +3105,7 @@
+@@ -3214,7 +3214,7 @@
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
-@@ -206,7 +206,7 @@
+Index: foo/tests/aapits/atmain.c
+===================================================================
+--- foo.orig/tests/aapits/atmain.c 2013-08-26 13:46:29.000000000 -0600
++++ foo/tests/aapits/atmain.c 2013-08-26 13:46:29.000000000 -0600
+@@ -315,7 +315,7 @@
{
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);
}
-@@ -321,7 +323,7 @@
+@@ -430,7 +430,7 @@
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);
}
-@@ -329,7 +331,7 @@
+@@ -438,7 +438,7 @@
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
-@@ -2426,7 +2426,8 @@
+
+Index: foo/tests/aapits/atnamespace.c
+===================================================================
+--- foo.orig/tests/aapits/atnamespace.c 2013-08-26 13:46:29.000000000 -0600
++++ foo/tests/aapits/atnamespace.c 2013-08-26 13:46:29.000000000 -0600
+@@ -2535,7 +2535,8 @@
#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",
-@@ -2799,7 +2800,8 @@
+@@ -2908,7 +2909,8 @@
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);
}
-@@ -4083,7 +4085,9 @@
+@@ -4192,7 +4194,9 @@
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;
}
-@@ -5090,7 +5094,7 @@
+@@ -5199,7 +5203,7 @@
{
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
-@@ -622,13 +622,15 @@
+Index: foo/tests/aapits/atosxfctrl.c
+===================================================================
+--- foo.orig/tests/aapits/atosxfctrl.c 2013-08-26 13:46:29.000000000 -0600
++++ foo/tests/aapits/atosxfctrl.c 2013-08-26 13:46:29.000000000 -0600
+@@ -737,13 +737,15 @@
#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);
}
-@@ -649,15 +651,19 @@
+@@ -764,15 +766,19 @@
#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);
}
}
-@@ -671,13 +677,15 @@
+@@ -786,13 +792,15 @@
#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;
-@@ -817,14 +825,19 @@
+@@ -932,14 +940,19 @@
#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
-@@ -65,7 +65,7 @@
+Index: foo/tests/aapits/atresource.c
+===================================================================
+--- foo.orig/tests/aapits/atresource.c 2013-08-26 13:46:29.000000000 -0600
++++ foo/tests/aapits/atresource.c 2013-08-26 13:46:29.000000000 -0600
+@@ -174,7 +174,7 @@
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);
}
-@@ -381,7 +381,7 @@
+@@ -490,7 +490,7 @@
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);
}
-@@ -580,7 +580,7 @@
+@@ -689,7 +689,7 @@
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 */
-@@ -872,7 +872,7 @@
+@@ -981,7 +981,7 @@
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);
}
-@@ -1814,7 +1814,7 @@
+@@ -1923,7 +1923,7 @@
AapiErrors++;
printf ("API Error: AcpiGetIrqRoutingTable(%s) returned Length %d,"
" expected %d\n",
@@ -314,10 +318,11 @@ 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
+
+Index: foo/tests/aapits/Makefile
+===================================================================
+--- foo.orig/tests/aapits/Makefile 2013-08-26 13:46:29.000000000 -0600
++++ foo/tests/aapits/Makefile 2013-08-26 13:46:29.000000000 -0600
@@ -20,37 +20,52 @@
../../source/components/hardware/hwxface.c \
../../source/common/getopt.c \
@@ -475,9 +480,10 @@ diff -urN acpica-unix2-20130626/tests/aapits/Makefile acpica-unix2-20130626-aapi
$(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG)
CLEANFILES= $(PROG)
-diff -urN acpica-unix2-20130626/tests/aapits/osunixxf.c acpica-unix2-20130626-aapits/tests/aapits/osunixxf.c
---- acpica-unix2-20130626/tests/aapits/osunixxf.c 2013-01-17 12:48:29.000000000 -0700
-+++ acpica-unix2-20130626-aapits/tests/aapits/osunixxf.c 2013-07-25 15:11:08.225425856 -0600
+Index: foo/tests/aapits/osunixxf.c
+===================================================================
+--- foo.orig/tests/aapits/osunixxf.c 2013-08-26 13:46:29.000000000 -0600
++++ foo/tests/aapits/osunixxf.c 2013-08-26 13:46:29.000000000 -0600
@@ -384,7 +384,6 @@
const char *Fmt,
va_list Args)