Module Name: src
Committed By: macallan
Date: Tue Sep 14 04:40:35 UTC 2010
Modified Files:
src/sys/arch/macppc/dev: pmu.c
Log Message:
report lid open/close events to sysmon
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/macppc/dev/pmu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/dev/pmu.c
diff -u src/sys/arch/macppc/dev/pmu.c:1.17 src/sys/arch/macppc/dev/pmu.c:1.18
--- src/sys/arch/macppc/dev/pmu.c:1.17 Sat Dec 12 14:44:09 2009
+++ src/sys/arch/macppc/dev/pmu.c Tue Sep 14 04:40:35 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmu.c,v 1.17 2009/12/12 14:44:09 tsutsui Exp $ */
+/* $NetBSD: pmu.c,v 1.18 2010/09/14 04:40:35 macallan Exp $ */
/*-
* Copyright (c) 2006 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.17 2009/12/12 14:44:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.18 2010/09/14 04:40:35 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,6 +42,8 @@
#include <dev/clock_subr.h>
#include <dev/i2c/i2cvar.h>
+#include <dev/sysmon/sysmonvar.h>
+
#include <macppc/dev/viareg.h>
#include <macppc/dev/pmuvar.h>
#include <macppc/dev/batteryvar.h>
@@ -75,6 +77,7 @@
struct adb_bus_accessops sc_adbops;
struct i2c_controller sc_i2c;
struct pmu_ops sc_pmu_ops;
+ struct sysmon_pswitch sc_lidswitch;
bus_space_tag_t sc_memt;
bus_space_handle_t sc_memh;
uint32_t sc_flags;
@@ -86,6 +89,7 @@
int sc_pending_eject;
int sc_brightness, sc_brightness_wanted;
int sc_volume, sc_volume_wanted;
+ int sc_lid_closed;
/* deferred processing */
lwp_t *sc_thread;
/* signalling the event thread */
@@ -279,6 +283,7 @@
sc->sc_volume = sc->sc_volume_wanted = 0x80;
sc->sc_flags = 0;
sc->sc_callback = NULL;
+ sc->sc_lid_closed = 0;
if (bus_space_map(sc->sc_memt, ca->ca_reg[0] + ca->ca_baseaddr,
ca->ca_reg[1], 0, &sc->sc_memh) != 0) {
@@ -401,6 +406,12 @@
"%s", "pmu") != 0) {
printf("pmu: unable to create event kthread");
}
+
+ sc->sc_lidswitch.smpsw_name = "Lid switch";
+ sc->sc_lidswitch.smpsw_type = PSWITCH_TYPE_LID;
+ if (sysmon_pswitch_register(&sc->sc_lidswitch) != 0)
+ printf("%s: unable to register lid switch with sysmon\n",
+ device_xname(dev));
}
static void
@@ -640,6 +651,7 @@
goto done;
}
if (resp[1] & PMU_INT_ENVIRONMENT) {
+ int closed;
#ifdef PMU_VERBOSE
/* deal with environment messages */
printf("environment:");
@@ -647,6 +659,13 @@
printf(" %02x", resp[i]);
printf("\n");
#endif
+ closed = (resp[2] & PMU_ENV_LID_CLOSED) != 0;
+ if (closed != sc->sc_lid_closed) {
+ sc->sc_lid_closed = closed;
+ sysmon_pswitch_event(&sc->sc_lidswitch,
+ closed ? PSWITCH_EVENT_PRESSED :
+ PSWITCH_EVENT_RELEASED);
+ }
goto done;
}
if (resp[1] & PMU_INT_TICK) {
