CVS commit: src/sys/arch/macppc/dev

[Michael Lorenz]

Module Name:    src
Committed By:   macallan
Date:           Tue May 31 02:17:18 UTC 2016

Modified Files:
        src/sys/arch/macppc/dev: pmu.c

Log Message:
make sure we call sysmon_pswitch_event() from thread context


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 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.24 src/sys/arch/macppc/dev/pmu.c:1.25
--- src/sys/arch/macppc/dev/pmu.c:1.24	Sun Feb 14 19:54:20 2016
+++ src/sys/arch/macppc/dev/pmu.c	Tue May 31 02:17:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmu.c,v 1.24 2016/02/14 19:54:20 chs Exp $ */
+/*	$NetBSD: pmu.c,v 1.25 2016/05/31 02:17:18 macallan Exp $ */
 
 /*-
  * Copyright (c) 2006 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.24 2016/02/14 19:54:20 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.25 2016/05/31 02:17:18 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -90,6 +90,7 @@ struct pmu_softc {
 	int sc_brightness, sc_brightness_wanted;
 	int sc_volume, sc_volume_wanted;
 	int sc_lid_closed;
+	int sc_pswitch_pending;
 	/* deferred processing */
 	lwp_t *sc_thread;
 	/* signalling the event thread */
@@ -285,6 +286,7 @@ pmu_attach(device_t parent, device_t sel
 	sc->sc_flags = 0;
 	sc->sc_callback = NULL;
 	sc->sc_lid_closed = 0;
+	sc->sc_pswitch_pending = 0;
 
 	if (bus_space_map(sc->sc_memt, ca->ca_reg[0] + ca->ca_baseaddr,
 	    ca->ca_reg[1], 0, &sc->sc_memh) != 0) {
@@ -658,9 +660,8 @@ pmu_intr(void *arg)
 		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);
+			sc->sc_pswitch_pending = 1;
+			wakeup(&sc->sc_event);
 		}
 		goto done;
 	}
@@ -1023,6 +1024,13 @@ pmu_thread(void *cookie)
 			sc->sc_volume = sc->sc_volume_wanted;
 		}
 
+		if (sc->sc_pswitch_pending) {
+			sc->sc_pswitch_pending = 1;
+			sysmon_pswitch_event(&sc->sc_lidswitch, 
+	    		    sc->sc_lid_closed ? PSWITCH_EVENT_PRESSED : 
+			    PSWITCH_EVENT_RELEASED);
+		}
+
 		if (sc->sc_callback != NULL)
 			sc->sc_callback(sc->sc_cb_cookie);
 	}