Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Expand PMF_FN_* macros.
details: https://anonhg.NetBSD.org/src/rev/4b44544894c2
branches: trunk
changeset: 750630:4b44544894c2
user: dyoung <dyoung%NetBSD.org@localhost>
date: Fri Jan 08 19:53:10 2010 +0000
description:
Expand PMF_FN_* macros.
diffstat:
sys/dev/acpi/acpi.c | 12 ++--
sys/dev/acpi/acpi_acad.c | 8 +-
sys/dev/acpi/acpi_bat.c | 8 +-
sys/dev/acpi/acpi_ec.c | 12 ++--
sys/dev/acpi/acpi_lid.c | 8 +-
sys/dev/acpi/asus_acpi.c | 12 ++--
sys/dev/acpi/dalb_acpi.c | 8 +-
sys/dev/acpi/hpqlb_acpi.c | 8 +-
sys/dev/acpi/sony_acpi.c | 12 ++--
sys/dev/acpi/thinkpad_acpi.c | 8 +-
sys/dev/acpi/wmi_acpi.c | 12 ++--
sys/dev/audio.c | 12 ++--
sys/dev/hpc/hpcfb.c | 12 ++--
sys/dev/i2c/dbcool.c | 8 +-
sys/dev/i2c/dbcool_var.h | 8 +-
sys/dev/i2c/sdtemp.c | 12 ++--
sys/dev/ic/aic79xx_osm.c | 12 ++--
sys/dev/ic/aic7xxx_osm.c | 12 ++--
sys/dev/ic/atw.c | 6 +-
sys/dev/ic/atwvar.h | 4 +-
sys/dev/ic/bwi.c | 8 +-
sys/dev/ic/bwivar.h | 6 +-
sys/dev/ic/com.c | 8 +-
sys/dev/ic/comvar.h | 6 +-
sys/dev/ic/gem.c | 8 +-
sys/dev/ic/gemvar.h | 6 +-
sys/dev/ic/hpet.c | 8 +-
sys/dev/ic/ne2000.c | 8 +-
sys/dev/ic/ne2000var.h | 6 +-
sys/dev/ic/pckbc.c | 6 +-
sys/dev/ic/pckbcvar.h | 4 +-
sys/dev/ic/rtw.c | 8 +-
sys/dev/ic/rtwvar.h | 6 +-
sys/dev/ic/spic.c | 8 +-
sys/dev/ic/spicvar.h | 6 +-
sys/dev/isa/aps.c | 12 ++--
sys/dev/isa/com_isa.c | 16 +++---
sys/dev/isa/fd.c | 12 ++--
sys/dev/isa/sbdsp.c | 8 +-
sys/dev/isa/ym.c | 12 ++--
sys/dev/mii/mii_physubr.c | 6 +-
sys/dev/mii/miivar.h | 4 +-
sys/dev/pci/agp.c | 8 +-
sys/dev/pci/agp_i810.c | 8 +-
sys/dev/pci/agp_intel.c | 8 +-
sys/dev/pci/ahcisata_pci.c | 8 +-
sys/dev/pci/auacer.c | 8 +-
sys/dev/pci/auich.c | 8 +-
sys/dev/pci/auixp.c | 8 +-
sys/dev/pci/autri.c | 8 +-
sys/dev/pci/auvia.c | 8 +-
sys/dev/pci/azalia.c | 8 +-
sys/dev/pci/cs4280.c | 12 ++--
sys/dev/pci/cs4281.c | 12 ++--
sys/dev/pci/ehci_pci.c | 16 +++---
sys/dev/pci/esa.c | 12 ++--
sys/dev/pci/esm.c | 12 ++--
sys/dev/pci/fwohci_pci.c | 12 ++--
sys/dev/pci/gcscaudio.c | 8 +-
sys/dev/pci/hdaudio/hdaudio_afg.c | 12 ++--
sys/dev/pci/hdaudio/hdaudio_pci.c | 8 +-
sys/dev/pci/if_age.c | 8 +-
sys/dev/pci/if_ath_pci.c | 8 +-
sys/dev/pci/if_atw_pci.c | 14 +++---
sys/dev/pci/if_bce.c | 8 +-
sys/dev/pci/if_fxp_pci.c | 8 +-
sys/dev/pci/if_gem_pci.c | 12 ++--
sys/dev/pci/if_iwn.c | 8 +-
sys/dev/pci/if_msk.c | 14 +++---
sys/dev/pci/if_nfe.c | 8 +-
sys/dev/pci/if_rtw_pci.c | 12 ++--
sys/dev/pci/if_sip.c | 12 ++--
sys/dev/pci/if_sk.c | 16 +++---
sys/dev/pci/if_vr.c | 8 +-
sys/dev/pci/if_wpi.c | 8 +-
sys/dev/pci/ixpide.c | 12 ++--
sys/dev/pci/mvsata_pci.c | 8 +-
sys/dev/pci/neo.c | 6 +-
sys/dev/pci/pccbb.c | 12 ++--
sys/dev/pci/pci.c | 8 +-
sys/dev/pci/piixide.c | 12 ++--
sys/dev/pci/piixpm.c | 12 ++--
sys/dev/pci/ppb.c | 12 ++--
sys/dev/pci/siisata_pci.c | 6 +-
sys/dev/pci/uhci_pci.c | 10 ++--
sys/dev/pci/vga_pci.c | 8 +-
sys/dev/pci/viaide.c | 12 ++--
sys/dev/pci/yds.c | 8 +-
sys/dev/pckbport/pckbd.c | 8 +-
sys/dev/pckbport/pms.c | 12 ++--
sys/dev/pcmcia/bt3c.c | 12 ++--
sys/dev/pcmcia/btbc.c | 12 ++--
sys/dev/sbus/dbri.c | 12 ++--
sys/dev/sbus/p9100.c | 12 ++--
sys/dev/scsipi/sd.c | 8 +-
sys/dev/sdmmc/sdhc.c | 8 +-
sys/dev/sdmmc/sdhcvar.h | 6 +-
sys/dev/usb/ehci.c | 8 +-
sys/dev/usb/ehcivar.h | 6 +-
sys/dev/usb/ohci.c | 8 +-
sys/dev/usb/ohcivar.h | 6 +-
sys/dev/usb/uhci.c | 8 +-
sys/dev/usb/uhcivar.h | 6 +-
sys/kern/kern_pmf.c | 88 +++++++++++++++++++-------------------
sys/kern/subr_autoconf.c | 52 +++++++++++-----------
sys/rump/librump/rumpkern/emul.c | 8 +-
sys/sys/device.h | 44 +++++++++---------
sys/sys/pmf.h | 38 ++++++----------
108 files changed, 586 insertions(+), 596 deletions(-)
diffs (truncated from 4579 to 300 lines):
diff -r 61b66f1a3eb8 -r 4b44544894c2 sys/dev/acpi/acpi.c
--- a/sys/dev/acpi/acpi.c Fri Jan 08 19:42:11 2010 +0000
+++ b/sys/dev/acpi/acpi.c Fri Jan 08 19:53:10 2010 +0000
@@ -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;
diff -r 61b66f1a3eb8 -r 4b44544894c2 sys/dev/acpi/acpi_acad.c
--- a/sys/dev/acpi/acpi_acad.c Fri Jan 08 19:42:11 2010 +0000
+++ b/sys/dev/acpi/acpi_acad.c Fri Jan 08 19:53:10 2010 +0000
@@ -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);
diff -r 61b66f1a3eb8 -r 4b44544894c2 sys/dev/acpi/acpi_bat.c
--- a/sys/dev/acpi/acpi_bat.c Fri Jan 08 19:42:11 2010 +0000
+++ b/sys/dev/acpi/acpi_bat.c Fri Jan 08 19:53:10 2010 +0000
@@ -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;
diff -r 61b66f1a3eb8 -r 4b44544894c2 sys/dev/acpi/acpi_ec.c
--- a/sys/dev/acpi/acpi_ec.c Fri Jan 08 19:42:11 2010 +0000
+++ b/sys/dev/acpi/acpi_ec.c Fri Jan 08 19:53:10 2010 +0000
@@ -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 <joerg%NetBSD.org@localhost>.
@@ -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;
diff -r 61b66f1a3eb8 -r 4b44544894c2 sys/dev/acpi/acpi_lid.c
--- a/sys/dev/acpi/acpi_lid.c Fri Jan 08 19:42:11 2010 +0000
+++ b/sys/dev/acpi/acpi_lid.c Fri Jan 08 19:53:10 2010 +0000
@@ -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;
diff -r 61b66f1a3eb8 -r 4b44544894c2 sys/dev/acpi/asus_acpi.c
--- a/sys/dev/acpi/asus_acpi.c Fri Jan 08 19:42:11 2010 +0000
+++ b/sys/dev/acpi/asus_acpi.c Fri Jan 08 19:53:10 2010 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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;
diff -r 61b66f1a3eb8 -r 4b44544894c2 sys/dev/acpi/dalb_acpi.c
--- a/sys/dev/acpi/dalb_acpi.c Fri Jan 08 19:42:11 2010 +0000
+++ b/sys/dev/acpi/dalb_acpi.c Fri Jan 08 19:53:10 2010 +0000
@@ -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 <cegger%netbsd.org@localhost>
@@ -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;
diff -r 61b66f1a3eb8 -r 4b44544894c2 sys/dev/acpi/hpqlb_acpi.c
--- a/sys/dev/acpi/hpqlb_acpi.c Fri Jan 08 19:42:11 2010 +0000
+++ b/sys/dev/acpi/hpqlb_acpi.c Fri Jan 08 19:53:10 2010 +0000
@@ -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 <cegger%netbsd.org@localhost>
@@ -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 $");
Home |
Main Index |
Thread Index |
Old Index