Merged from sys/dev/syscons/syscons.c revision 1.377.

This commit is contained in:
Yoshihiro Takahashi 2001-12-22 01:32:32 +00:00
parent 5dcb00d324
commit 57ceceeafb
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=88393

View file

@ -31,9 +31,6 @@
#include "opt_syscons.h" #include "opt_syscons.h"
#include "opt_splash.h" #include "opt_splash.h"
#include "opt_ddb.h" #include "opt_ddb.h"
#ifdef __i386__
#include "opt_apm.h"
#endif
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -53,11 +50,12 @@
#include <sys/signalvar.h> #include <sys/signalvar.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/tty.h> #include <sys/tty.h>
#include <sys/power.h>
#include <machine/clock.h> #include <machine/clock.h>
#include <machine/psl.h>
#include <machine/pc/display.h> #include <machine/pc/display.h>
#ifdef __i386__ #ifdef __i386__
#include <machine/psl.h>
#include <machine/apm_bios.h> #include <machine/apm_bios.h>
#include <machine/frame.h> #include <machine/frame.h>
#endif #endif
@ -3249,18 +3247,12 @@ scgetc(sc_softc_t *sc, u_int flags)
#endif #endif
break; break;
#ifdef DEV_APM
case SUSP: case SUSP:
apm_suspend(PMST_SUSPEND); power_pm_suspend(POWER_SLEEP_STATE_SUSPEND);
break; break;
case STBY: case STBY:
apm_suspend(PMST_STANDBY); power_pm_suspend(POWER_SLEEP_STATE_STANDBY);
break; break;
#else
case SUSP:
case STBY:
break;
#endif
case DBG: case DBG:
#ifndef SC_DISABLE_DDBKEY #ifndef SC_DISABLE_DDBKEY