Module Name: src
Committed By: dyoung
Date: Fri Jan 8 20:40:41 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi.c acpi_acad.c acpi_bat.c acpi_ec.c acpi_lid.c
asus_acpi.c dalb_acpi.c hpqlb_acpi.c sony_acpi.c thinkpad_acpi.c
wmi_acpi.c
Log Message:
Expand PMF_FN_* macros.
To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/acpi/acpi_acad.c
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/acpi/acpi_bat.c
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/acpi/acpi_ec.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/acpi/acpi_lid.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/acpi/asus_acpi.c \
src/sys/dev/acpi/sony_acpi.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/dalb_acpi.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/hpqlb_acpi.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/acpi/thinkpad_acpi.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/acpi/wmi_acpi.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/dev/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.141 src/sys/dev/acpi/acpi.c:1.142
--- src/sys/dev/acpi/acpi.c:1.141 Fri Jan 8 00:09:44 2010
+++ src/sys/dev/acpi/acpi.c Fri Jan 8 20:40:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.141 2010/01/08 00:09:44 dyoung Exp $ */
+/* $NetBSD: acpi.c,v 1.142 2010/01/08 20:40:40 dyoung Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.141 2010/01/08 00:09:44 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.142 2010/01/08 20:40:40 dyoung Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -200,8 +200,8 @@
static void acpi_unmap_rsdt(ACPI_TABLE_HEADER *);
static int is_available_state(struct acpi_softc *, int);
-static bool acpi_suspend(device_t PMF_FN_PROTO);
-static bool acpi_resume(device_t PMF_FN_PROTO);
+static bool acpi_suspend(device_t, pmf_qual_t);
+static bool acpi_resume(device_t, pmf_qual_t);
/*
* acpi_probe:
@@ -623,14 +623,14 @@
}
static bool
-acpi_suspend(device_t dv PMF_FN_ARGS)
+acpi_suspend(device_t dv, pmf_qual_t qual)
{
acpi_suspended = 1;
return true;
}
static bool
-acpi_resume(device_t dv PMF_FN_ARGS)
+acpi_resume(device_t dv, pmf_qual_t qual)
{
acpi_suspended = 0;
return true;
Index: src/sys/dev/acpi/acpi_acad.c
diff -u src/sys/dev/acpi/acpi_acad.c:1.35 src/sys/dev/acpi/acpi_acad.c:1.36
--- src/sys/dev/acpi/acpi_acad.c:1.35 Tue Aug 25 10:34:08 2009
+++ src/sys/dev/acpi/acpi_acad.c Fri Jan 8 20:40:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_acad.c,v 1.35 2009/08/25 10:34:08 jmcneill Exp $ */
+/* $NetBSD: acpi_acad.c,v 1.36 2010/01/08 20:40:41 dyoung Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.35 2009/08/25 10:34:08 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.36 2010/01/08 20:40:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -94,7 +94,7 @@
static void acpiacad_notify_handler(ACPI_HANDLE, UINT32, void *);
static void acpiacad_init_envsys(device_t);
static void acpiacad_refresh(struct sysmon_envsys *, envsys_data_t *);
-static bool acpiacad_resume(device_t PMF_FN_PROTO);
+static bool acpiacad_resume(device_t, pmf_qual_t);
/*
* acpiacad_match:
@@ -164,7 +164,7 @@
* Clear status after resuming to fetch new status.
*/
static bool
-acpiacad_resume(device_t dv PMF_FN_ARGS)
+acpiacad_resume(device_t dv, pmf_qual_t qual)
{
struct acpiacad_softc *sc = device_private(dv);
Index: src/sys/dev/acpi/acpi_bat.c
diff -u src/sys/dev/acpi/acpi_bat.c:1.74 src/sys/dev/acpi/acpi_bat.c:1.75
--- src/sys/dev/acpi/acpi_bat.c:1.74 Tue Sep 29 21:41:38 2009
+++ src/sys/dev/acpi/acpi_bat.c Fri Jan 8 20:40:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.74 2009/09/29 21:41:38 jmcneill Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.75 2010/01/08 20:40:41 dyoung Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.74 2009/09/29 21:41:38 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.75 2010/01/08 20:40:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -170,7 +170,7 @@
static int acpibat_match(device_t, cfdata_t, void *);
static void acpibat_attach(device_t, device_t, void *);
-static bool acpibat_resume(device_t PMF_FN_PROTO);
+static bool acpibat_resume(device_t, pmf_qual_t);
CFATTACH_DECL_NEW(acpibat, sizeof(struct acpibat_softc),
acpibat_match, acpibat_attach, NULL, NULL);
@@ -208,7 +208,7 @@
}
static bool
-acpibat_resume(device_t dv PMF_FN_ARGS)
+acpibat_resume(device_t dv, pmf_qual_t qual)
{
ACPI_STATUS rv;
Index: src/sys/dev/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.57 src/sys/dev/acpi/acpi_ec.c:1.58
--- src/sys/dev/acpi/acpi_ec.c:1.57 Wed Sep 16 10:47:54 2009
+++ src/sys/dev/acpi/acpi_ec.c Fri Jan 8 20:40:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.57 2009/09/16 10:47:54 mlelstv Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.58 2010/01/08 20:40:41 dyoung Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger <jo...@netbsd.org>.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.57 2009/09/16 10:47:54 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.58 2010/01/08 20:40:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -152,8 +152,8 @@
static void acpiec_common_attach(device_t, device_t, ACPI_HANDLE,
bus_addr_t, bus_addr_t, ACPI_HANDLE, uint8_t);
-static bool acpiec_suspend(device_t PMF_FN_PROTO);
-static bool acpiec_resume(device_t PMF_FN_PROTO);
+static bool acpiec_suspend(device_t, pmf_qual_t);
+static bool acpiec_resume(device_t, pmf_qual_t);
static bool acpiec_shutdown(device_t, int);
static bool acpiec_parse_gpe_package(device_t, ACPI_HANDLE,
@@ -399,7 +399,7 @@
}
static bool
-acpiec_suspend(device_t dv PMF_FN_ARGS)
+acpiec_suspend(device_t dv, pmf_qual_t qual)
{
acpiec_cold = true;
@@ -407,7 +407,7 @@
}
static bool
-acpiec_resume(device_t dv PMF_FN_ARGS)
+acpiec_resume(device_t dv, pmf_qual_t qual)
{
acpiec_cold = false;
Index: src/sys/dev/acpi/acpi_lid.c
diff -u src/sys/dev/acpi/acpi_lid.c:1.30 src/sys/dev/acpi/acpi_lid.c:1.31
--- src/sys/dev/acpi/acpi_lid.c:1.30 Thu Dec 31 10:12:51 2009
+++ src/sys/dev/acpi/acpi_lid.c Fri Jan 8 20:40:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_lid.c,v 1.30 2009/12/31 10:12:51 jruoho Exp $ */
+/* $NetBSD: acpi_lid.c,v 1.31 2010/01/08 20:40:41 dyoung Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.30 2009/12/31 10:12:51 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.31 2010/01/08 20:40:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,7 +73,7 @@
static void acpilid_notify_handler(ACPI_HANDLE, UINT32, void *);
static void acpilid_wake_event(device_t, bool);
-static bool acpilid_suspend(device_t PMF_FN_PROTO);
+static bool acpilid_suspend(device_t, pmf_qual_t);
/*
* acpilid_match:
@@ -243,7 +243,7 @@
}
static bool
-acpilid_suspend(device_t dv PMF_FN_ARGS)
+acpilid_suspend(device_t dv, pmf_qual_t qual)
{
struct acpilid_softc *sc = device_private(dv);
ACPI_INTEGER status;
Index: src/sys/dev/acpi/asus_acpi.c
diff -u src/sys/dev/acpi/asus_acpi.c:1.11 src/sys/dev/acpi/asus_acpi.c:1.12
--- src/sys/dev/acpi/asus_acpi.c:1.11 Wed Sep 16 10:47:55 2009
+++ src/sys/dev/acpi/asus_acpi.c Fri Jan 8 20:40:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: asus_acpi.c,v 1.11 2009/09/16 10:47:55 mlelstv Exp $ */
+/* $NetBSD: asus_acpi.c,v 1.12 2010/01/08 20:40:41 dyoung Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.11 2009/09/16 10:47:55 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.12 2010/01/08 20:40:41 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -97,8 +97,8 @@
static void asus_notify_handler(ACPI_HANDLE, UINT32, void *);
static void asus_init(device_t);
-static bool asus_suspend(device_t PMF_FN_PROTO);
-static bool asus_resume(device_t PMF_FN_PROTO);
+static bool asus_suspend(device_t, pmf_qual_t);
+static bool asus_resume(device_t, pmf_qual_t);
static void asus_sysctl_setup(struct asus_softc *);
@@ -272,7 +272,7 @@
}
static bool
-asus_suspend(device_t self PMF_FN_ARGS)
+asus_suspend(device_t self, pmf_qual_t qual)
{
struct asus_softc *sc = device_private(self);
ACPI_STATUS rv;
@@ -288,7 +288,7 @@
}
static bool
-asus_resume(device_t self PMF_FN_ARGS)
+asus_resume(device_t self, pmf_qual_t qual)
{
struct asus_softc *sc = device_private(self);
ACPI_STATUS rv;
Index: src/sys/dev/acpi/sony_acpi.c
diff -u src/sys/dev/acpi/sony_acpi.c:1.11 src/sys/dev/acpi/sony_acpi.c:1.12
--- src/sys/dev/acpi/sony_acpi.c:1.11 Wed Sep 16 10:47:55 2009
+++ src/sys/dev/acpi/sony_acpi.c Fri Jan 8 20:40:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sony_acpi.c,v 1.11 2009/09/16 10:47:55 mlelstv Exp $ */
+/* $NetBSD: sony_acpi.c,v 1.12 2010/01/08 20:40:41 dyoung Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.11 2009/09/16 10:47:55 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.12 2010/01/08 20:40:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,8 +92,8 @@
ACPI_INTEGER, ACPI_INTEGER *);
static void sony_acpi_quirk_setup(struct sony_acpi_softc *);
static void sony_acpi_notify_handler(ACPI_HANDLE, UINT32, void *);
-static bool sony_acpi_suspend(device_t PMF_FN_PROTO);
-static bool sony_acpi_resume(device_t PMF_FN_PROTO);
+static bool sony_acpi_suspend(device_t, pmf_qual_t);
+static bool sony_acpi_resume(device_t, pmf_qual_t);
static void sony_acpi_brightness_down(device_t);
static void sony_acpi_brightness_up(device_t);
static ACPI_STATUS sony_acpi_find_pic(ACPI_HANDLE, UINT32, void *, void **);
@@ -392,7 +392,7 @@
}
static bool
-sony_acpi_suspend(device_t dv PMF_FN_ARGS)
+sony_acpi_suspend(device_t dv, pmf_qual_t qual)
{
struct sony_acpi_softc *sc = device_private(dv);
@@ -402,7 +402,7 @@
}
static bool
-sony_acpi_resume(device_t dv PMF_FN_ARGS)
+sony_acpi_resume(device_t dv, pmf_qual_t qual)
{
struct sony_acpi_softc *sc = device_private(dv);
Index: src/sys/dev/acpi/dalb_acpi.c
diff -u src/sys/dev/acpi/dalb_acpi.c:1.4 src/sys/dev/acpi/dalb_acpi.c:1.5
--- src/sys/dev/acpi/dalb_acpi.c:1.4 Tue Jan 5 13:39:49 2010
+++ src/sys/dev/acpi/dalb_acpi.c Fri Jan 8 20:40:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dalb_acpi.c,v 1.4 2010/01/05 13:39:49 jruoho Exp $ */
+/* $NetBSD: dalb_acpi.c,v 1.5 2010/01/08 20:40:41 dyoung Exp $ */
/*-
* Copyright (c) 2008 Christoph Egger <ceg...@netbsd.org>
@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.4 2010/01/05 13:39:49 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.5 2010/01/08 20:40:41 dyoung Exp $");
/*
* Direct Application Launch Button:
@@ -69,7 +69,7 @@
static int acpi_dalb_match(device_t, cfdata_t, void *);
static void acpi_dalb_attach(device_t, device_t, void *);
static void acpi_dalb_notify_handler(ACPI_HANDLE, UINT32, void *);
-static bool acpi_dalb_resume(device_t PMF_FN_PROTO);
+static bool acpi_dalb_resume(device_t, pmf_qual_t);
static void acpi_dalb_get_wakeup_hotkeys(void *opaque);
static void acpi_dalb_get_runtime_hotkeys(void *opaque);
@@ -246,7 +246,7 @@
}
static bool
-acpi_dalb_resume(device_t dev PMF_FN_ARGS)
+acpi_dalb_resume(device_t dev, pmf_qual_t qual)
{
struct acpi_dalb_softc *sc = device_private(dev);
ACPI_STATUS rv;
Index: src/sys/dev/acpi/hpqlb_acpi.c
diff -u src/sys/dev/acpi/hpqlb_acpi.c:1.3 src/sys/dev/acpi/hpqlb_acpi.c:1.4
--- src/sys/dev/acpi/hpqlb_acpi.c:1.3 Fri Sep 25 20:26:59 2009
+++ src/sys/dev/acpi/hpqlb_acpi.c Fri Jan 8 20:40:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hpqlb_acpi.c,v 1.3 2009/09/25 20:26:59 dyoung Exp $ */
+/* $NetBSD: hpqlb_acpi.c,v 1.4 2010/01/08 20:40:41 dyoung Exp $ */
/*-
* Copyright (c) 2008 Christoph Egger <ceg...@netbsd.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpqlb_acpi.c,v 1.3 2009/09/25 20:26:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpqlb_acpi.c,v 1.4 2010/01/08 20:40:41 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -93,7 +93,7 @@
static int hpqlb_hotkey_handler(struct wskbd_softc *, void *, u_int, int);
static void hpqlb_init(device_t);
-static bool hpqlb_resume(device_t PMF_FN_PROTO);
+static bool hpqlb_resume(device_t, pmf_qual_t);
CFATTACH_DECL_NEW(hpqlb, sizeof(struct hpqlb_softc),
hpqlb_match, hpqlb_attach, NULL, NULL);
@@ -285,7 +285,7 @@
}
static bool
-hpqlb_resume(device_t self PMF_FN_ARGS)
+hpqlb_resume(device_t self, pmf_qual_t qual)
{
hpqlb_init(self);
Index: src/sys/dev/acpi/thinkpad_acpi.c
diff -u src/sys/dev/acpi/thinkpad_acpi.c:1.21 src/sys/dev/acpi/thinkpad_acpi.c:1.22
--- src/sys/dev/acpi/thinkpad_acpi.c:1.21 Sun Nov 29 21:32:50 2009
+++ src/sys/dev/acpi/thinkpad_acpi.c Fri Jan 8 20:40:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.21 2009/11/29 21:32:50 cegger Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.22 2010/01/08 20:40:41 dyoung Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.21 2009/11/29 21:32:50 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.22 2010/01/08 20:40:41 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -121,7 +121,7 @@
static void thinkpad_wireless_toggle(thinkpad_softc_t *);
-static bool thinkpad_resume(device_t PMF_FN_PROTO);
+static bool thinkpad_resume(device_t, pmf_qual_t);
static void thinkpad_brightness_up(device_t);
static void thinkpad_brightness_down(device_t);
static uint8_t thinkpad_brightness_read(thinkpad_softc_t *sc);
@@ -610,7 +610,7 @@
}
static bool
-thinkpad_resume(device_t dv PMF_FN_ARGS)
+thinkpad_resume(device_t dv, pmf_qual_t qual)
{
ACPI_STATUS rv;
ACPI_HANDLE pubs;
Index: src/sys/dev/acpi/wmi_acpi.c
diff -u src/sys/dev/acpi/wmi_acpi.c:1.7 src/sys/dev/acpi/wmi_acpi.c:1.8
--- src/sys/dev/acpi/wmi_acpi.c:1.7 Mon Jan 4 10:06:53 2010
+++ src/sys/dev/acpi/wmi_acpi.c Fri Jan 8 20:40:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wmi_acpi.c,v 1.7 2010/01/04 10:06:53 jruoho Exp $ */
+/* $NetBSD: wmi_acpi.c,v 1.8 2010/01/08 20:40:41 dyoung Exp $ */
/*-
* Copyright (c) 2009, 2010 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmi_acpi.c,v 1.7 2010/01/04 10:06:53 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_acpi.c,v 1.8 2010/01/08 20:40:41 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -130,8 +130,8 @@
static void acpi_wmi_event_add(struct acpi_wmi_softc *);
static void acpi_wmi_event_del(struct acpi_wmi_softc *);
static void acpi_wmi_event_handler(ACPI_HANDLE, uint32_t, void *);
-static bool acpi_wmi_suspend(device_t PMF_FN_PROTO);
-static bool acpi_wmi_resume(device_t PMF_FN_PROTO);
+static bool acpi_wmi_suspend(device_t, pmf_qual_t);
+static bool acpi_wmi_resume(device_t, pmf_qual_t);
static ACPI_STATUS acpi_wmi_enable(ACPI_HANDLE, const char *, bool, bool);
static bool acpi_wmi_input(struct wmi_t *, uint8_t, uint8_t);
@@ -539,7 +539,7 @@
* disable (enable) these before suspending (resuming).
*/
static bool
-acpi_wmi_suspend(device_t self PMF_FN_ARGS)
+acpi_wmi_suspend(device_t self, pmf_qual_t qual)
{
struct acpi_wmi_softc *sc = device_private(self);
@@ -549,7 +549,7 @@
}
static bool
-acpi_wmi_resume(device_t self PMF_FN_ARGS)
+acpi_wmi_resume(device_t self, pmf_qual_t qual)
{
struct acpi_wmi_softc *sc = device_private(self);
