diff options
| author | nyan <nyan@FreeBSD.org> | 2001-12-22 01:32:32 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2001-12-22 01:32:32 +0000 |
| commit | 943f95c0a8e7a81b192a265c2c2721304594f0c7 (patch) | |
| tree | d1b510d0959ff5121aed4b468be7722c18b0b868 /sys | |
| parent | f8baad3a318bb087fa5feb607c00d7e9ebc0f500 (diff) | |
| download | FreeBSD-src-943f95c0a8e7a81b192a265c2c2721304594f0c7.zip FreeBSD-src-943f95c0a8e7a81b192a265c2c2721304594f0c7.tar.gz | |
Merged from sys/dev/syscons/syscons.c revision 1.377.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/pc98/pc98/syscons.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c index edeac2d..d9ad26d 100644 --- a/sys/pc98/pc98/syscons.c +++ b/sys/pc98/pc98/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,11 +50,12 @@ #include <sys/signalvar.h> #include <sys/sysctl.h> #include <sys/tty.h> +#include <sys/power.h> #include <machine/clock.h> -#include <machine/psl.h> #include <machine/pc/display.h> #ifdef __i386__ +#include <machine/psl.h> #include <machine/apm_bios.h> #include <machine/frame.h> #endif @@ -3249,18 +3247,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 |
