From owner-svn-src-head@FreeBSD.ORG  Thu Nov 20 03:23:35 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 08893AB5;
 Thu, 20 Nov 2014 03:23:35 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E907A16C;
 Thu, 20 Nov 2014 03:23:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAK3NY3p092535;
 Thu, 20 Nov 2014 03:23:34 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAK3NYR6092533;
 Thu, 20 Nov 2014 03:23:34 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <201411200323.sAK3NYR6092533@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jhibbits set sender to
 jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Thu, 20 Nov 2014 03:23:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274733 - head/sys/powerpc/powermac
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Nov 2014 03:23:35 -0000

Author: jhibbits
Date: Thu Nov 20 03:23:33 2014
New Revision: 274733
URL: https://svnweb.freebsd.org/changeset/base/274733

Log:
  Add support for Power Button PMU events on non-ADB macs, such as aluminum
  PowerBooks.
  
  MFC after:	2 weeks
  Relnotes:	yes

Modified:
  head/sys/powerpc/powermac/pmu.c
  head/sys/powerpc/powermac/pmuvar.h

Modified: head/sys/powerpc/powermac/pmu.c
==============================================================================
--- head/sys/powerpc/powermac/pmu.c	Thu Nov 20 01:55:12 2014	(r274732)
+++ head/sys/powerpc/powermac/pmu.c	Thu Nov 20 03:23:33 2014	(r274733)
@@ -734,15 +734,15 @@ pmu_intr(void *arg)
 		/* if the lid was just closed, notify devd. */
 		if ((resp[2] & PMU_ENV_LID_CLOSED) && (!sc->lid_closed)) {
 			sc->lid_closed = 1;
-			if (devctl_process_running())
-				devctl_notify("PMU", "lid", "close", NULL);
+			devctl_notify("PMU", "lid", "close", NULL);
 		}
 		else if (!(resp[2] & PMU_ENV_LID_CLOSED) && (sc->lid_closed)) {
 			/* if the lid was just opened, notify devd. */
-			if (devctl_process_running())
-				devctl_notify("PMU", "lid", "open", NULL);
 			sc->lid_closed = 0;
+			devctl_notify("PMU", "lid", "open", NULL);
 		}
+		if (resp[2] & PMU_ENV_POWER)
+			devctl_notify("PMU", "Button", "pressed", NULL);
 	}
 }
 

Modified: head/sys/powerpc/powermac/pmuvar.h
==============================================================================
--- head/sys/powerpc/powermac/pmuvar.h	Thu Nov 20 01:55:12 2014	(r274732)
+++ head/sys/powerpc/powermac/pmuvar.h	Thu Nov 20 03:23:33 2014	(r274733)
@@ -99,6 +99,7 @@
 
 /* Bits from PMU_GET_LID_STATE or PMU_INT_ENVIRONMENT on core99 */
 #define PMU_ENV_LID_CLOSED	0x01	/* The lid is closed */
+#define PMU_ENV_POWER		0x08	/* Power Button pressed */
 
 /* PMU PMU_POWER_EVENTS commands */
 enum {