diff options
| author | jkim <jkim@FreeBSD.org> | 2015-06-18 23:14:45 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-06-18 23:14:45 +0000 |
| commit | 834a59ac96a56d139d5e26711cae9d9c099ab73e (patch) | |
| tree | 0bdb0afb33a9872049c8a79ec239e8f1c918f4da /sys/contrib/dev/acpica/components/resources/rsxface.c | |
| parent | 19250d4f16f66aaad903ed821f23db1b699eeb83 (diff) | |
| parent | 77a98b4be9952afe90f7d9a02f6c901498f31413 (diff) | |
| download | FreeBSD-src-834a59ac96a56d139d5e26711cae9d9c099ab73e.zip FreeBSD-src-834a59ac96a56d139d5e26711cae9d9c099ab73e.tar.gz | |
Merge ACPICA 20150619.
Diffstat (limited to 'sys/contrib/dev/acpica/components/resources/rsxface.c')
| -rw-r--r-- | sys/contrib/dev/acpica/components/resources/rsxface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/contrib/dev/acpica/components/resources/rsxface.c b/sys/contrib/dev/acpica/components/resources/rsxface.c index a477f20..66c26e1 100644 --- a/sys/contrib/dev/acpica/components/resources/rsxface.c +++ b/sys/contrib/dev/acpica/components/resources/rsxface.c @@ -447,7 +447,7 @@ AcpiResourceToAddress64 ( /* Simple copy for 64 bit source */ - ACPI_MEMCPY (Out, &Resource->Data, sizeof (ACPI_RESOURCE_ADDRESS64)); + memcpy (Out, &Resource->Data, sizeof (ACPI_RESOURCE_ADDRESS64)); break; default: @@ -558,7 +558,7 @@ AcpiRsMatchVendorResource ( */ if ((Vendor->ByteLength < (ACPI_UUID_LENGTH + 1)) || (Vendor->UuidSubtype != Info->Uuid->Subtype) || - (ACPI_MEMCMP (Vendor->Uuid, Info->Uuid->Data, ACPI_UUID_LENGTH))) + (memcmp (Vendor->Uuid, Info->Uuid->Data, ACPI_UUID_LENGTH))) { return (AE_OK); } @@ -574,7 +574,7 @@ AcpiRsMatchVendorResource ( /* Found the correct resource, copy and return it */ - ACPI_MEMCPY (Buffer->Pointer, Resource, Resource->Length); + memcpy (Buffer->Pointer, Resource, Resource->Length); Buffer->Length = Resource->Length; /* Found the desired descriptor, terminate resource walk */ |
