diff options
| author | iwasaki <iwasaki@FreeBSD.org> | 2001-11-01 16:34:07 +0000 |
|---|---|---|
| committer | iwasaki <iwasaki@FreeBSD.org> | 2001-11-01 16:34:07 +0000 |
| commit | f1842a13d838c3a94044961bbf70910f54a49956 (patch) | |
| tree | 386182cbb6b07e9a3fa20ca8415118c34d61ecae /sys/dev/syscons | |
| parent | 9440591aaa9e7f2d8ef542a245eb93b2c2547844 (diff) | |
| download | FreeBSD-src-f1842a13d838c3a94044961bbf70910f54a49956.zip FreeBSD-src-f1842a13d838c3a94044961bbf70910f54a49956.tar.gz | |
Some fix for the recent apm module changes.
- Now that apm loadable module can inform its existence to other kernel
components (e.g. i386/isa/clock.c:startrtclock()'s TCS hack).
- Exchange priority of SI_SUB_CPU and SI_SUB_KLD for above purpose.
- Add simple arbitration mechanism for APM vs. ACPI. This prevents
the kernel enables both of them.
- Remove obsolete `#ifdef DEV_APM' related code.
- Add abstracted interface for Powermanagement operations. Public apm(4)
functions, such as apm_suspend(), should be replaced new interfaces.
Currently only power_pm_suspend (successor of apm_suspend) is implemented.
Reviewed by: peter, arch@ and audit@
Diffstat (limited to 'sys/dev/syscons')
| -rw-r--r-- | sys/dev/syscons/syscons.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index cf9e4b9..0a01b18 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -31,9 +31,6 @@ #include "opt_syscons.h" #include "opt_splash.h" #include "opt_ddb.h" -#ifdef __i386__ -#include "opt_apm.h" -#endif #include <sys/param.h> #include <sys/systm.h> @@ -53,6 +50,7 @@ #include <sys/signalvar.h> #include <sys/sysctl.h> #include <sys/tty.h> +#include <sys/power.h> #include <machine/clock.h> #include <machine/pc/display.h> @@ -3230,18 +3228,12 @@ next_code: #endif break; -#ifdef DEV_APM case SUSP: - apm_suspend(PMST_SUSPEND); + power_pm_suspend(POWER_SLEEP_STATE_SUSPEND); break; case STBY: - apm_suspend(PMST_STANDBY); + power_pm_suspend(POWER_SLEEP_STATE_STANDBY); break; -#else - case SUSP: - case STBY: - break; -#endif case DBG: #ifndef SC_DISABLE_DDBKEY |
