aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/dev/acpica/components/executer/exoparg2.c
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2015-06-18 23:14:45 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2015-06-18 23:14:45 +0000
commit5ef5072350492e3ee9aff4303789fc75972b5afe (patch)
tree0bdb0afb33a9872049c8a79ec239e8f1c918f4da /sys/contrib/dev/acpica/components/executer/exoparg2.c
parent628b71282606416dc5a4d4d896c2cec23a57c3e9 (diff)
parentf3bbb1ca6c1b2b877d015a8f5f0c67e48a7a57ae (diff)
downloadsrc-5ef5072350492e3ee9aff4303789fc75972b5afe.tar.gz
src-5ef5072350492e3ee9aff4303789fc75972b5afe.zip
Merge ACPICA 20150619.
Notes
Notes: svn path=/head/; revision=284583
Diffstat (limited to 'sys/contrib/dev/acpica/components/executer/exoparg2.c')
-rw-r--r--sys/contrib/dev/acpica/components/executer/exoparg2.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/contrib/dev/acpica/components/executer/exoparg2.c b/sys/contrib/dev/acpica/components/executer/exoparg2.c
index da1eb6c63700..e11c0b38ed9f 100644
--- a/sys/contrib/dev/acpica/components/executer/exoparg2.c
+++ b/sys/contrib/dev/acpica/components/executer/exoparg2.c
@@ -368,7 +368,7 @@ AcpiExOpcode_2A_1T_1R (
* Copy the raw buffer data with no transform.
* (NULL terminated already)
*/
- ACPI_MEMCPY (ReturnDesc->String.Pointer,
+ memcpy (ReturnDesc->String.Pointer,
Operand[0]->Buffer.Pointer, Length);
break;
@@ -412,6 +412,8 @@ AcpiExOpcode_2A_1T_1R (
}
ReturnDesc->Reference.TargetType = ACPI_TYPE_BUFFER_FIELD;
+ ReturnDesc->Reference.IndexPointer =
+ &(Operand[0]->Buffer.Pointer [Index]);
break;
case ACPI_TYPE_BUFFER:
@@ -423,6 +425,8 @@ AcpiExOpcode_2A_1T_1R (
}
ReturnDesc->Reference.TargetType = ACPI_TYPE_BUFFER_FIELD;
+ ReturnDesc->Reference.IndexPointer =
+ &(Operand[0]->Buffer.Pointer [Index]);
break;
case ACPI_TYPE_PACKAGE:
@@ -434,7 +438,8 @@ AcpiExOpcode_2A_1T_1R (
}
ReturnDesc->Reference.TargetType = ACPI_TYPE_PACKAGE;
- ReturnDesc->Reference.Where = &Operand[0]->Package.Elements [Index];
+ ReturnDesc->Reference.Where =
+ &Operand[0]->Package.Elements [Index];
break;
default: