diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2017-01-05 21:28:25 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2017-01-05 21:28:25 +0000 |
| commit | 284829482ea5f5830d817e77e52e1a8af6486e93 (patch) | |
| tree | 8a561b72fe7237b62cfc3e9f555c5a968e111043 /sys/dev | |
| parent | 8da8161b26960985c098713f224d9c28389d98cc (diff) | |
| parent | f2e6c39316f68b7ccc7abb766f82ed421c8e22b4 (diff) | |
| download | src-284829482ea5f5830d817e77e52e1a8af6486e93.tar.gz src-284829482ea5f5830d817e77e52e1a8af6486e93.zip | |
Merge ACPICA 20161222.
Notes
Notes:
svn path=/head/; revision=311462
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpica/Osd/OsdDebug.c | 3 | ||||
| -rw-r--r-- | sys/dev/acpica/Osd/OsdHardware.c | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/acpica/Osd/OsdDebug.c b/sys/dev/acpica/Osd/OsdDebug.c index 56647192d821..f44cc53fec14 100644 --- a/sys/dev/acpica/Osd/OsdDebug.c +++ b/sys/dev/acpica/Osd/OsdDebug.c @@ -99,7 +99,6 @@ AcpiOsSignal(UINT32 Function, void *Info) void acpi_EnterDebugger(void) { - ACPI_PARSE_OBJECT obj; static int initted = 0; if (!initted) { @@ -109,6 +108,6 @@ acpi_EnterDebugger(void) } printf("Entering ACPICA debugger...\n"); - AcpiDbUserCommands('A', &obj); + AcpiDbUserCommands(); } #endif /* ACPI_DEBUGGER */ diff --git a/sys/dev/acpica/Osd/OsdHardware.c b/sys/dev/acpica/Osd/OsdHardware.c index 8d94e7bc6945..3206534d9d2e 100644 --- a/sys/dev/acpica/Osd/OsdHardware.c +++ b/sys/dev/acpica/Osd/OsdHardware.c @@ -37,6 +37,13 @@ __FBSDID("$FreeBSD$"); #include <machine/iodev.h> #include <machine/pci_cfgreg.h> +ACPI_STATUS +AcpiOsEnterSleep(UINT8 SleepState, UINT32 RegaValue, UINT32 RegbValue) +{ + + return (AE_OK); +} + /* * ACPICA's rather gung-ho approach to hardware resource ownership is a little * troublesome insofar as there is no easy way for us to know in advance |