diff options
| author | jkim <jkim@FreeBSD.org> | 2012-08-16 20:54:52 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2012-08-16 20:54:52 +0000 |
| commit | 7d706dc46f20aa3d7d386cd3f3df8e786e35e3cf (patch) | |
| tree | a652303191b07ca59b5281e3606555d7db951183 /sys/contrib/dev/acpica/include/acpixf.h | |
| parent | ef6535e51ea1bac50944a3194c4e3ee845e9b696 (diff) | |
| parent | 08e6f22ac3350a67c38e9b42b5dce2a7d5fa08b4 (diff) | |
| download | FreeBSD-src-7d706dc46f20aa3d7d386cd3f3df8e786e35e3cf.zip FreeBSD-src-7d706dc46f20aa3d7d386cd3f3df8e786e35e3cf.tar.gz | |
Merge ACPICA 20120816.
Diffstat (limited to 'sys/contrib/dev/acpica/include/acpixf.h')
| -rw-r--r-- | sys/contrib/dev/acpica/include/acpixf.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/contrib/dev/acpica/include/acpixf.h b/sys/contrib/dev/acpica/include/acpixf.h index 4fdc7c6..fa0c5d5 100644 --- a/sys/contrib/dev/acpica/include/acpixf.h +++ b/sys/contrib/dev/acpica/include/acpixf.h @@ -48,11 +48,12 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20120711 +#define ACPI_CA_VERSION 0x20120816 #include <contrib/dev/acpica/include/acconfig.h> #include <contrib/dev/acpica/include/actypes.h> #include <contrib/dev/acpica/include/actbl.h> +#include <contrib/dev/acpica/include/acbuffer.h> /* * Globals that are publically available @@ -183,6 +184,11 @@ AcpiCheckAddressRange ( ACPI_SIZE Length, BOOLEAN Warn); +ACPI_STATUS +AcpiDecodePldBuffer ( + UINT8 *InBuffer, + ACPI_SIZE Length, + ACPI_PLD_INFO **ReturnBuffer); /* * ACPI Memory management @@ -686,8 +692,7 @@ AcpiEnterSleepStatePrep ( ACPI_STATUS AcpiEnterSleepState ( - UINT8 SleepState, - UINT8 Flags); + UINT8 SleepState); ACPI_HW_DEPENDENT_RETURN_STATUS ( ACPI_STATUS @@ -696,8 +701,7 @@ AcpiEnterSleepStateS4bios ( ACPI_STATUS AcpiLeaveSleepStatePrep ( - UINT8 SleepState, - UINT8 Flags); + UINT8 SleepState); ACPI_STATUS AcpiLeaveSleepState ( |
