From 38de3f1a709fb98823ed55005026657a8e182a0f Mon Sep 17 00:00:00 2001
From: simonb <simonb@NetBSD.org>
Date: Fri, 12 Jan 2001 03:36:50 +0000
Subject: [PATCH] Enable the APM_IOC_DEV_CTL ioctl.  Works at least for turning
 off & on a LCD screen on a Dell Inspiron 5000e (and probably many others).

---
 sys/arch/i386/i386/apm.c       | 10 +---------
 sys/arch/i386/include/apmvar.h |  4 +---
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/sys/arch/i386/i386/apm.c b/sys/arch/i386/i386/apm.c
index 8c62f5f5c590..35f8d15e2ed2 100644
--- a/sys/arch/i386/i386/apm.c
+++ b/sys/arch/i386/i386/apm.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: apm.c,v 1.56 2000/11/26 11:08:57 takemura Exp $ */
+/*	$NetBSD: apm.c,v 1.57 2001/01/12 03:36:51 simonb Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -148,9 +148,7 @@ static void	apm_disconnect __P((void *));
 static void	apm_event_handle __P((struct apm_softc *, struct bioscallregs *));
 static int	apm_get_event __P((struct bioscallregs *));
 static int	apm_get_powstat __P((struct bioscallregs *));
-#if 0
 static void	apm_get_powstate __P((u_int));
-#endif
 static void	apm_periodic_check __P((struct apm_softc *));
 static void	apm_create_thread __P((void *));
 static void	apm_thread __P((void *));
@@ -371,7 +369,6 @@ apm_power_print(sc, regs)
 }
 #endif
 
-#if 0 /* currently unused */
 static void
 apm_get_powstate(dev)
 	u_int dev;
@@ -385,7 +382,6 @@ apm_get_powstate(dev)
 		printf("apm dev %04x state %04x\n", dev, regs.CX);
 	}
 }
-#endif
 
 static void
 apm_suspend(sc)
@@ -1490,9 +1486,7 @@ apmioctl(dev, cmd, data, flag, p)
 	struct apm_power_info *powerp;
 	struct apm_event_info *evp;
 	struct bioscallregs regs;
-#if 0
 	struct apm_ctl *actl;
-#endif
 	int i, error = 0;
 
 	APM_LOCK(sc);
@@ -1518,7 +1512,6 @@ apmioctl(dev, cmd, data, flag, p)
 		apm_suspends++;
 		break;
 
-#if 0 /* is this used at all? */
 	case APM_IOC_DEV_CTL:
 		actl = (struct apm_ctl *)data;
 		if ((flag & FWRITE) == 0) {
@@ -1528,7 +1521,6 @@ apmioctl(dev, cmd, data, flag, p)
 		apm_get_powstate(actl->dev); /* XXX */
 		error = apm_set_powstate(actl->dev, actl->mode);
 		break;
-#endif
 
 	case APM_IOC_NEXTEVENT:
 		if (!sc->event_count)
diff --git a/sys/arch/i386/include/apmvar.h b/sys/arch/i386/include/apmvar.h
index 407b4fad7d4a..7869030435bb 100644
--- a/sys/arch/i386/include/apmvar.h
+++ b/sys/arch/i386/include/apmvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: apmvar.h,v 1.9 1999/08/17 19:05:53 drochner Exp $	*/
+/*	$NetBSD: apmvar.h,v 1.10 2001/01/12 03:36:50 simonb Exp $	*/
 /*-
  * Copyright (c) 1995 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -293,9 +293,7 @@ struct apm_ctl {
 #define	APM_IOC_SUSPEND	_IO('A', 2)	/* put system into suspend */
 #define	APM_IOC_GETPOWER _IOR('A', 3, struct apm_power_info) /* fetch battery state */
 #define	APM_IOC_NEXTEVENT _IOR('A', 4, struct apm_event_info) /* fetch event */
-#if 0
 #define	APM_IOC_DEV_CTL	_IOW('A', 5, struct apm_ctl) /* put device into mode */
-#endif
 
 struct apm_attach_args {
 	char *aaa_busname;