From f9390180fe3afa600d83de925f2e5c4a2eb676c7 Mon Sep 17 00:00:00 2001
From: Mitsuru IWASAKI <iwasaki@FreeBSD.org>
Date: Thu, 1 Nov 2001 16:34:07 +0000
Subject: 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@
---
 sys/dev/syscons/syscons.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'sys/dev/syscons')

diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index cf9e4b9a5399..0a01b183c5d9 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
-- 
cgit v1.3