Basic refresh of some patches

Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2014-11-17 17:44:40 -07:00
parent 24b095cb18
commit fdf675e408
3 changed files with 21 additions and 21 deletions

View File

@ -118,7 +118,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapi
diff -urN acpica-unix2-20130626/tests/aapits/atmain.c acpica-unix2-20130626-aapits/tests/aapits/atmain.c 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/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 +++ acpica-unix2-20130626-aapits/tests/aapits/atmain.c 2013-07-25 13:18:22.083323948 -0600
@@ -336,7 +336,7 @@ @@ -346,7 +336,7 @@
{ {
printf ("ACPICA API TS err: test num %ld of test case %ld" printf ("ACPICA API TS err: test num %ld of test case %ld"
" is not implemented\n", " is not implemented\n",
@ -127,7 +127,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atmain.c acpica-unix2-20130626-aapi
return (AtRetNotImpl); return (AtRetNotImpl);
} }
@@ -451,7 +451,7 @@ @@ -461,7 +451,7 @@
if (test_case < 1 || test_case > AT_TEST_CASE_NUM) 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", printf ("ACPICA API TS err: test case %ld is out of range 1 - %d\n",
@ -136,7 +136,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atmain.c acpica-unix2-20130626-aapi
return (AtRetBadParam); return (AtRetBadParam);
} }
@@ -459,7 +459,7 @@ @@ -469,7 +459,7 @@
if (test_num < 0 || test_num > AtTestCase[test_case].TestsNum) 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", printf ("ACPICA API TS err: test num %ld is out of range 0 - %d\n",

View File

@ -1,7 +1,7 @@
diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslcodegen.c 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.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 +++ acpica-unix2-20140424/source/compiler/aslcodegen.c 2014-06-06 20:43:34.711825238 -0400
@@ -237,16 +237,12 @@ CgWriteAmlOpcode ( @@ -246,16 +246,12 @@ CgWriteAmlOpcode (
ACPI_PARSE_OBJECT *Op) ACPI_PARSE_OBJECT *Op)
{ {
UINT8 PkgLenFirstByte; UINT8 PkgLenFirstByte;
@ -24,7 +24,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac
/* We expect some DEFAULT_ARGs, just ignore them */ /* We expect some DEFAULT_ARGs, just ignore them */
@@ -269,51 +265,52 @@ CgWriteAmlOpcode ( @@ -278,51 +265,52 @@ CgWriteAmlOpcode (
/* Special opcodes for within a field definition */ /* Special opcodes for within a field definition */
@ -88,7 +88,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac
break; break;
} }
@@ -324,8 +322,8 @@ CgWriteAmlOpcode ( @@ -333,8 +322,8 @@ CgWriteAmlOpcode (
if (Op->Asl.AmlPkgLenBytes == 1) if (Op->Asl.AmlPkgLenBytes == 1)
{ {
/* Simplest case -- no bytes to follow, just write the count */ /* Simplest case -- no bytes to follow, just write the count */
@ -99,7 +99,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac
} }
else if (Op->Asl.AmlPkgLenBytes != 0) else if (Op->Asl.AmlPkgLenBytes != 0)
{ {
@@ -335,7 +333,7 @@ CgWriteAmlOpcode ( @@ -344,7 +333,7 @@ CgWriteAmlOpcode (
*/ */
PkgLenFirstByte = (UINT8) PkgLenFirstByte = (UINT8)
(((UINT32) (Op->Asl.AmlPkgLenBytes - 1) << 6) | (((UINT32) (Op->Asl.AmlPkgLenBytes - 1) << 6) |
@ -108,7 +108,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac
CgLocalWriteAmlData (Op, &PkgLenFirstByte, 1); CgLocalWriteAmlData (Op, &PkgLenFirstByte, 1);
@@ -343,37 +341,44 @@ CgWriteAmlOpcode ( @@ -352,37 +341,44 @@ CgWriteAmlOpcode (
* Shift the length over by the 4 bits we just stuffed * Shift the length over by the 4 bits we just stuffed
* in the first byte * in the first byte
*/ */
@ -166,7 +166,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac
break; break;
case AML_STRING_OP: case AML_STRING_OP:
@@ -407,6 +412,7 @@ CgWriteTableHeader ( @@ -416,6 +412,7 @@ CgWriteTableHeader (
ACPI_PARSE_OBJECT *Op) ACPI_PARSE_OBJECT *Op)
{ {
ACPI_PARSE_OBJECT *Child; ACPI_PARSE_OBJECT *Child;
@ -174,7 +174,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac
/* AML filename */ /* AML filename */
@@ -443,7 +449,7 @@ CgWriteTableHeader ( @@ -452,7 +449,7 @@ CgWriteTableHeader (
/* OEM Revision */ /* OEM Revision */
Child = Child->Asl.Next; Child = Child->Asl.Next;
@ -183,7 +183,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac
/* Compiler ID */ /* Compiler ID */
@@ -451,11 +457,12 @@ CgWriteTableHeader ( @@ -460,11 +457,12 @@ CgWriteTableHeader (
/* Compiler version */ /* Compiler version */
@ -198,7 +198,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac
TableHeader.Checksum = 0; TableHeader.Checksum = 0;
CgLocalWriteAmlData (Op, &TableHeader, sizeof (ACPI_TABLE_HEADER)); CgLocalWriteAmlData (Op, &TableHeader, sizeof (ACPI_TABLE_HEADER));
@@ -519,7 +526,10 @@ CgWriteNode ( @@ -528,7 +526,10 @@ CgWriteNode (
ACPI_PARSE_OBJECT *Op) ACPI_PARSE_OBJECT *Op)
{ {
ASL_RESOURCE_NODE *Rnode; ASL_RESOURCE_NODE *Rnode;
@ -210,7 +210,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac
/* Always check for DEFAULT_ARG and other "Noop" nodes */ /* Always check for DEFAULT_ARG and other "Noop" nodes */
/* TBD: this may not be the best place for this check */ /* TBD: this may not be the best place for this check */
@@ -537,13 +547,24 @@ CgWriteNode ( @@ -546,13 +547,24 @@ CgWriteNode (
switch (Op->Asl.AmlOpcode) switch (Op->Asl.AmlOpcode)
{ {
case AML_RAW_DATA_BYTE: case AML_RAW_DATA_BYTE:
@ -241,7 +241,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac
diff -up acpica-unix2-20140424/source/compiler/aslopcodes.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslopcodes.c 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.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 +++ acpica-unix2-20140424/source/compiler/aslopcodes.c 2014-06-06 20:43:34.711825238 -0400
@@ -478,6 +479,7 @@ OpcDoUnicode ( @@ -531,6 +479,7 @@ OpcDoUnicode (
UINT32 i; UINT32 i;
UINT8 *AsciiString; UINT8 *AsciiString;
UINT16 *UnicodeString; UINT16 *UnicodeString;
@ -249,7 +249,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslopcodes.c.debian-big_endian ac
ACPI_PARSE_OBJECT *BufferLengthOp; ACPI_PARSE_OBJECT *BufferLengthOp;
@@ -504,7 +505,8 @@ OpcDoUnicode ( @@ -557,7 +505,8 @@ OpcDoUnicode (
for (i = 0; i < Count; i++) for (i = 0; i < Count; i++)
{ {

View File

@ -19,7 +19,7 @@ diff --git a/source/compiler/asltree.c b/source/compiler/asltree.c
index ebf87f3..fd859d7 100644 index ebf87f3..fd859d7 100644
--- a/source/compiler/asltree.c --- a/source/compiler/asltree.c
+++ b/source/compiler/asltree.c +++ b/source/compiler/asltree.c
@@ -589,28 +592,31 @@ TrCreateValuedLeafNode ( @@ -782,28 +592,31 @@ TrCreateValuedLeafNode (
"\nCreateValuedLeafNode Ln/Col %u/%u NewNode %p Op %s Value %8.8X%8.8X ", "\nCreateValuedLeafNode Ln/Col %u/%u NewNode %p Op %s Value %8.8X%8.8X ",
Op->Asl.LineNumber, Op->Asl.Column, Op, UtGetOpName(ParseOpcode), Op->Asl.LineNumber, Op->Asl.Column, Op, UtGetOpName(ParseOpcode),
ACPI_FORMAT_UINT64 (Value)); ACPI_FORMAT_UINT64 (Value));
@ -56,7 +56,7 @@ index ebf87f3..fd859d7 100644
break; break;
case PARSEOP_METHOD: case PARSEOP_METHOD:
@@ -620,11 +622,13 @@ TrCreateValuedLeafNode ( @@ -813,11 +622,13 @@ TrCreateValuedLeafNode (
case PARSEOP_INTEGER: case PARSEOP_INTEGER:
@ -74,7 +74,7 @@ diff --git a/source/components/executer/exoparg2.c b/source/components/executer/
index e55f40c..ed5b1fd 100644 index e55f40c..ed5b1fd 100644
--- a/source/components/executer/exoparg2.c --- a/source/components/executer/exoparg2.c
+++ b/source/components/executer/exoparg2.c +++ b/source/components/executer/exoparg2.c
@@ -174,6 +176,8 @@ AcpiExOpcode_2A_2T_1R ( @@ -172,6 +176,8 @@ AcpiExOpcode_2A_2T_1R (
ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0]; ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0];
ACPI_OPERAND_OBJECT *ReturnDesc1 = NULL; ACPI_OPERAND_OBJECT *ReturnDesc1 = NULL;
ACPI_OPERAND_OBJECT *ReturnDesc2 = NULL; ACPI_OPERAND_OBJECT *ReturnDesc2 = NULL;
@ -83,7 +83,7 @@ index e55f40c..ed5b1fd 100644
ACPI_STATUS Status; ACPI_STATUS Status;
@@ -207,8 +211,10 @@ AcpiExOpcode_2A_2T_1R ( @@ -205,8 +211,10 @@ AcpiExOpcode_2A_2T_1R (
Status = AcpiUtDivide (Operand[0]->Integer.Value, Status = AcpiUtDivide (Operand[0]->Integer.Value,
Operand[1]->Integer.Value, Operand[1]->Integer.Value,
@ -96,7 +96,7 @@ index e55f40c..ed5b1fd 100644
if (ACPI_FAILURE (Status)) if (ACPI_FAILURE (Status))
{ {
goto Cleanup; goto Cleanup;
@@ -282,6 +285,7 @@ AcpiExOpcode_2A_1T_1R ( @@ -280,6 +285,7 @@ AcpiExOpcode_2A_1T_1R (
ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0]; ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0];
ACPI_OPERAND_OBJECT *ReturnDesc = NULL; ACPI_OPERAND_OBJECT *ReturnDesc = NULL;
UINT64 Index; UINT64 Index;
@ -104,7 +104,7 @@ index e55f40c..ed5b1fd 100644
ACPI_STATUS Status = AE_OK; ACPI_STATUS Status = AE_OK;
ACPI_SIZE Length = 0; ACPI_SIZE Length = 0;
@@ -325,7 +333,8 @@ AcpiExOpcode_2A_1T_1R ( @@ -323,7 +333,8 @@ AcpiExOpcode_2A_1T_1R (
Status = AcpiUtDivide (Operand[0]->Integer.Value, Status = AcpiUtDivide (Operand[0]->Integer.Value,
Operand[1]->Integer.Value, Operand[1]->Integer.Value,
NULL, NULL,