diff options
| author | dyoung <dyoung@NetBSD.org> | 2010-01-08 19:53:10 +0000 |
|---|---|---|
| committer | dyoung <dyoung@NetBSD.org> | 2010-01-08 19:53:10 +0000 |
| commit | cd6e1fbf917851dd96cea886b90ce7d0899cc270 (patch) | |
| tree | 6864a87aab5fc4fe7fc5947d378c9715dcd5c1ac /sys/dev | |
| parent | 3022acc4ebf7a5c3545f58fd7331a36d9bf8ceff (diff) | |
Expand PMF_FN_* macros.
Diffstat (limited to 'sys/dev')
103 files changed, 476 insertions, 476 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index c3016a851f7..39673026e05 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -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 ACPI_TABLE_HEADER *acpi_map_rsdt(void); 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 @@ acpi_detach(device_t self, int flags) } 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 --git a/sys/dev/acpi/acpi_acad.c b/sys/dev/acpi/acpi_acad.c index 5886dfdfd20..6bfe8a90c33 100644 --- a/sys/dev/acpi/acpi_acad.c +++ b/sys/dev/acpi/acpi_acad.c @@ -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_clear_status(struct acpiacad_softc *); 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 @@ acpiacad_attach(device_t parent, device_t self, void *aux) * 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 --git a/sys/dev/acpi/acpi_bat.c b/sys/dev/acpi/acpi_bat.c index 7e20f5f180d..4450de14cb7 100644 --- a/sys/dev/acpi/acpi_bat.c +++ b/sys/dev/acpi/acpi_bat.c @@ -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 const char * const bat_hid[] = { 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 @@ acpibat_match(device_t parent, cfdata_t match, void *aux) } static bool -acpibat_resume(device_t dv PMF_FN_ARGS) +acpibat_resume(device_t dv, pmf_qual_t qual) { ACPI_STATUS rv; diff --git a/sys/dev/acpi/acpi_ec.c b/sys/dev/acpi/acpi_ec.c index 1f5e171d777..ae2d76355b7 100644 --- a/sys/dev/acpi/acpi_ec.c +++ b/sys/dev/acpi/acpi_ec.c @@ -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>. @@ -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_attach(device_t, device_t, void *); 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 @@ post_data_map: } 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 @@ acpiec_suspend(device_t dv PMF_FN_ARGS) } static bool -acpiec_resume(device_t dv PMF_FN_ARGS) +acpiec_resume(device_t dv, pmf_qual_t qual) { acpiec_cold = false; diff --git a/sys/dev/acpi/acpi_lid.c b/sys/dev/acpi/acpi_lid.c index 2b8366e90f7..15998d5a772 100644 --- a/sys/dev/acpi/acpi_lid.c +++ b/sys/dev/acpi/acpi_lid.c @@ -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_status_changed(void *); 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 @@ acpilid_notify_handler(ACPI_HANDLE handle, UINT32 notify, void *context) } 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 --git a/sys/dev/acpi/asus_acpi.c b/sys/dev/acpi/asus_acpi.c index ea9293ecca5..4465cdffd90 100644 --- a/sys/dev/acpi/asus_acpi.c +++ b/sys/dev/acpi/asus_acpi.c @@ -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> @@ -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 int asus_detach(device_t, int); 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 @@ asus_init(device_t self) } 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 @@ asus_suspend(device_t self PMF_FN_ARGS) } 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 --git a/sys/dev/acpi/dalb_acpi.c b/sys/dev/acpi/dalb_acpi.c index 946c23e3c47..7f3ef3091a1 100644 --- a/sys/dev/acpi/dalb_acpi.c +++ b/sys/dev/acpi/dalb_acpi.c @@ -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> @@ -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 @@ struct acpi_dalb_softc { 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 @@ acpi_dalb_get_runtime_hotkeys(void *opaque) } 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 --git a/sys/dev/acpi/hpqlb_acpi.c b/sys/dev/acpi/hpqlb_acpi.c index da74709a9e7..378e0786feb 100644 --- a/sys/dev/acpi/hpqlb_acpi.c +++ b/sys/dev/acpi/hpqlb_acpi.c @@ -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> @@ -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_finalize(device_t); 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 @@ hpqlb_finalize(device_t self) } static bool -hpqlb_resume(device_t self PMF_FN_ARGS) +hpqlb_resume(device_t self, pmf_qual_t qual) { hpqlb_init(self); diff --git a/sys/dev/acpi/sony_acpi.c b/sys/dev/acpi/sony_acpi.c index 57395ae7d99..8b5f0771007 100644 --- a/sys/dev/acpi/sony_acpi.c +++ b/sys/dev/acpi/sony_acpi.c @@ -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 @@ static ACPI_STATUS sony_acpi_eval_set_integer(ACPI_HANDLE, const char *, 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 @@ sony_acpi_notify_handler(ACPI_HANDLE hdl, UINT32 notify, void *opaque) } 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 @@ sony_acpi_suspend(device_t dv PMF_FN_ARGS) } 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); diff --git a/sys/dev/acpi/thinkpad_acpi.c b/sys/dev/acpi/thinkpad_acpi.c index 5a8b6d2d475..7a29d8917f0 100644 --- a/sys/dev/acpi/thinkpad_acpi.c +++ b/sys/dev/acpi/thinkpad_acpi.c @@ -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 <jmcneill@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_fan_refresh(struct sysmon_envsys *, envsys_data_t *); 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 @@ thinkpad_cmos(thinkpad_softc_t *sc, uint8_t cmd) } 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; diff --git a/sys/dev/acpi/wmi_acpi.c b/sys/dev/acpi/wmi_acpi.c index d978d65a9cf..f53901daa87 100644 --- a/sys/dev/acpi/wmi_acpi.c +++ b/sys/dev/acpi/wmi_acpi.c @@ -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 <jruohonen@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 ACPI_STATUS acpi_wmi_guid_get(struct acpi_wmi_softc *, 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 @@ acpi_wmi_event_register(device_t self, ACPI_NOTIFY_HANDLER handler) * 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 @@ acpi_wmi_suspend(device_t self PMF_FN_ARGS) } 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); diff --git a/sys/dev/audio.c b/sys/dev/audio.c index cfbb0fb2bb2..58c337d0d42 100644 --- a/sys/dev/audio.c +++ b/sys/dev/audio.c @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.249 2009/12/06 22:42:48 dyoung Exp $ */ +/* $NetBSD: audio.c,v 1.250 2010/01/08 20:05:15 dyoung Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.249 2009/12/06 22:42:48 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.250 2010/01/08 20:05:15 dyoung Exp $"); #include "audio.h" #if NAUDIO > 0 @@ -183,8 +183,8 @@ static void audio_idle(void *); static void audio_activity(device_t, devactive_t); #endif -static bool audio_suspend(device_t dv PMF_FN_PROTO); -static bool audio_resume(device_t dv PMF_FN_PROTO); +static bool audio_suspend(device_t dv, pmf_qual_t); +static bool audio_resume(device_t dv, pmf_qual_t); static void audio_volume_down(device_t); static void audio_volume_up(device_t); static void audio_volume_toggle(device_t); @@ -4070,7 +4070,7 @@ audio_activity(device_t dv, devactive_t type) #endif static bool -audio_suspend(device_t dv PMF_FN_ARGS) +audio_suspend(device_t dv, pmf_qual_t qual) { struct audio_softc *sc = device_private(dv); const struct audio_hw_if *hwp = sc->hw_if; @@ -4091,7 +4091,7 @@ audio_suspend(device_t dv PMF_FN_ARGS) } static bool -audio_resume(device_t dv PMF_FN_ARGS) +audio_resume(device_t dv, pmf_qual_t qual) { struct audio_softc *sc = device_private(dv); int s; diff --git a/sys/dev/hpc/hpcfb.c b/sys/dev/hpc/hpcfb.c index 2da1dce293f..98a58abba38 100644 --- a/sys/dev/hpc/hpcfb.c +++ b/sys/dev/hpc/hpcfb.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpcfb.c,v 1.51 2009/11/23 02:13:45 rmind Exp $ */ +/* $NetBSD: hpcfb.c,v 1.52 2010/01/08 20:05:16 dyoung Exp $ */ /*- * Copyright (c) 1999 @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.51 2009/11/23 02:13:45 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.52 2010/01/08 20:05:16 dyoung Exp $"); #ifdef _KERNEL_OPT #include "opt_hpcfb.h" @@ -198,8 +198,8 @@ static void hpcfb_cmap_reorder(struct hpcfb_fbconf *, struct hpcfb_devconfig *); static void hpcfb_power(int, void *); -static bool hpcfb_suspend(device_t PMF_FN_PROTO); -static bool hpcfb_resume(device_t PMF_FN_PROTO); +static bool hpcfb_suspend(device_t, pmf_qual_t); +static bool hpcfb_resume(device_t, pmf_qual_t); void hpcfb_cursor(void *, int, int, int); @@ -671,7 +671,7 @@ hpcfb_power(int why, void *arg) } static bool -hpcfb_suspend(device_t self PMF_FN_ARGS) +hpcfb_suspend(device_t self, pmf_qual_t qual) { struct hpcfb_softc *sc = device_private(self); @@ -680,7 +680,7 @@ hpcfb_suspend(device_t self PMF_FN_ARGS) } static bool -hpcfb_resume(device_t self PMF_FN_ARGS) +hpcfb_resume(device_t self, pmf_qual_t qual) { struct hpcfb_softc *sc = device_private(self); diff --git a/sys/dev/i2c/dbcool.c b/sys/dev/i2c/dbcool.c index 368f155bef0..10c9165c653 100644 --- a/sys/dev/i2c/dbcool.c +++ b/sys/dev/i2c/dbcool.c @@ -1,4 +1,4 @@ -/* $NetBSD: dbcool.c,v 1.13 2009/11/02 21:37:44 christos Exp $ */ +/* $NetBSD: dbcool.c,v 1.14 2010/01/08 20:04:31 dyoung Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -49,7 +49,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.13 2009/11/02 21:37:44 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.14 2010/01/08 20:04:31 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -648,7 +648,7 @@ dbcool_detach(device_t self, int flags) } /* On suspend, we save the state of the SHDN bit, then set it */ -bool dbcool_pmf_suspend(device_t dev PMF_FN_ARGS) +bool dbcool_pmf_suspend(device_t dev, pmf_qual_t qual) { struct dbcool_softc *sc = device_private(dev); uint8_t reg, bit, cfg; @@ -672,7 +672,7 @@ bool dbcool_pmf_suspend(device_t dev PMF_FN_ARGS) } /* On resume, we restore the previous state of the SHDN bit */ -bool dbcool_pmf_resume(device_t dev PMF_FN_ARGS) +bool dbcool_pmf_resume(device_t dev, pmf_qual_t qual) { struct dbcool_softc *sc = device_private(dev); uint8_t reg, bit, cfg; diff --git a/sys/dev/i2c/dbcool_var.h b/sys/dev/i2c/dbcool_var.h index c51f769f1f5..d065323c735 100644 --- a/sys/dev/i2c/dbcool_var.h +++ b/sys/dev/i2c/dbcool_var.h @@ -1,4 +1,4 @@ -/* $NetBSD: dbcool_var.h,v 1.6 2009/11/02 21:37:44 christos Exp $ */ +/* $NetBSD: dbcool_var.h,v 1.7 2010/01/08 20:04:31 dyoung Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dbcool_var.h,v 1.6 2009/11/02 21:37:44 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dbcool_var.h,v 1.7 2010/01/08 20:04:31 dyoung Exp $"); #include <dev/i2c/i2cvar.h> @@ -147,7 +147,7 @@ uint8_t dbcool_readreg(struct dbcool_chipset *, uint8_t); void dbcool_writereg(struct dbcool_chipset *, uint8_t, uint8_t); void dbcool_setup(device_t); int dbcool_chip_ident(struct dbcool_chipset *); -bool dbcool_pmf_suspend(device_t PMF_FN_PROTO); -bool dbcool_pmf_resume(device_t PMF_FN_PROTO); +bool dbcool_pmf_suspend(device_t, pmf_qual_t); +bool dbcool_pmf_resume(device_t, pmf_qual_t); #endif /* def DBCOOLVAR_H */ diff --git a/sys/dev/i2c/sdtemp.c b/sys/dev/i2c/sdtemp.c index 707915d30f8..b4759d40abb 100644 --- a/sys/dev/i2c/sdtemp.c +++ b/sys/dev/i2c/sdtemp.c @@ -1,4 +1,4 @@ -/* $NetBSD: sdtemp.c,v 1.8 2010/01/01 15:43:49 pgoyette Exp $ */ +/* $NetBSD: sdtemp.c,v 1.9 2010/01/08 20:04:31 dyoung Exp $ */ /* * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.8 2010/01/01 15:43:49 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.9 2010/01/08 20:04:31 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -73,8 +73,8 @@ static int sdtemp_write_8(struct sdtemp_softc *, uint8_t, uint8_t); static int sdtemp_read_16(struct sdtemp_softc *, uint8_t, uint16_t *); static int sdtemp_write_16(struct sdtemp_softc *, uint8_t, uint16_t); static uint32_t sdtemp_decode_temp(struct sdtemp_softc *, uint16_t); -static bool sdtemp_pmf_suspend(device_t PMF_FN_PROTO); -static bool sdtemp_pmf_resume(device_t PMF_FN_PROTO); +static bool sdtemp_pmf_suspend(device_t, pmf_qual_t); +static bool sdtemp_pmf_resume(device_t, pmf_qual_t); struct sdtemp_dev_entry { const uint16_t sdtemp_mfg_id; @@ -482,7 +482,7 @@ sdtemp_refresh(struct sysmon_envsys *sme, envsys_data_t *edata) */ static bool -sdtemp_pmf_suspend(device_t dev PMF_FN_ARGS) +sdtemp_pmf_suspend(device_t dev, pmf_qual_t qual) { struct sdtemp_softc *sc = device_private(dev); int error; @@ -499,7 +499,7 @@ sdtemp_pmf_suspend(device_t dev PMF_FN_ARGS) } static bool -sdtemp_pmf_resume(device_t dev PMF_FN_ARGS) +sdtemp_pmf_resume(device_t dev, pmf_qual_t qual) { struct sdtemp_softc *sc = device_private(dev); int error; diff --git a/sys/dev/ic/aic79xx_osm.c b/sys/dev/ic/aic79xx_osm.c index d4bd18fd00f..db20ccd9c28 100644 --- a/sys/dev/ic/aic79xx_osm.c +++ b/sys/dev/ic/aic79xx_osm.c @@ -1,4 +1,4 @@ -/* $NetBSD: aic79xx_osm.c,v 1.29 2009/09/26 14:44:10 tsutsui Exp $ */ +/* $NetBSD: aic79xx_osm.c,v 1.30 2010/01/08 20:02:39 dyoung Exp $ */ /* * Bus independent NetBSD shim for the aic7xxx based adaptec SCSI controllers @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aic79xx_osm.c,v 1.29 2009/09/26 14:44:10 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aic79xx_osm.c,v 1.30 2010/01/08 20:02:39 dyoung Exp $"); #include <dev/ic/aic79xx_osm.h> #include <dev/ic/aic79xx_inline.h> @@ -64,8 +64,8 @@ static void ahd_setup_data(struct ahd_softc *ahd, struct scsipi_xfer *xs, static void ahd_set_recoveryscb(struct ahd_softc *ahd, struct scb *scb); #endif -static bool ahd_pmf_suspend(device_t PMF_FN_PROTO); -static bool ahd_pmf_resume(device_t PMF_FN_PROTO); +static bool ahd_pmf_suspend(device_t, pmf_qual_t); +static bool ahd_pmf_resume(device_t, pmf_qual_t); static bool ahd_pmf_shutdown(device_t, int); /* @@ -118,7 +118,7 @@ ahd_attach(struct ahd_softc *ahd) } static bool -ahd_pmf_suspend(device_t dev PMF_FN_ARGS) +ahd_pmf_suspend(device_t dev, pmf_qual_t qual) { struct ahd_softc *sc = device_private(dev); #if 0 @@ -130,7 +130,7 @@ ahd_pmf_suspend(device_t dev PMF_FN_ARGS) } static bool -ahd_pmf_resume(device_t dev PMF_FN_ARGS) +ahd_pmf_resume(device_t dev, pmf_qual_t qual) { #if 0 struct ahd_softc *sc = device_private(dev); diff --git a/sys/dev/ic/aic7xxx_osm.c b/sys/dev/ic/aic7xxx_osm.c index 4b844dcc90d..7bb0ff1a8ac 100644 --- a/sys/dev/ic/aic7xxx_osm.c +++ b/sys/dev/ic/aic7xxx_osm.c @@ -1,4 +1,4 @@ -/* $NetBSD: aic7xxx_osm.c,v 1.35 2009/09/22 13:26:54 tsutsui Exp $ */ +/* $NetBSD: aic7xxx_osm.c,v 1.36 2010/01/08 20:02:39 dyoung Exp $ */ /* * Bus independent FreeBSD shim for the aic7xxx based adaptec SCSI controllers @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aic7xxx_osm.c,v 1.35 2009/09/22 13:26:54 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aic7xxx_osm.c,v 1.36 2010/01/08 20:02:39 dyoung Exp $"); #include <dev/ic/aic7xxx_osm.h> #include <dev/ic/aic7xxx_inline.h> @@ -60,8 +60,8 @@ static void ahc_set_recoveryscb(struct ahc_softc *ahc, struct scb *scb); static int ahc_ioctl(struct scsipi_channel *channel, u_long cmd, void *addr, int flag, struct proc *p); -static bool ahc_pmf_suspend(device_t PMF_FN_PROTO); -static bool ahc_pmf_resume(device_t PMF_FN_PROTO); +static bool ahc_pmf_suspend(device_t, pmf_qual_t); +static bool ahc_pmf_resume(device_t, pmf_qual_t); static bool ahc_pmf_shutdown(device_t, int); @@ -144,7 +144,7 @@ ahc_attach(struct ahc_softc *ahc) */ static bool -ahc_pmf_suspend(device_t dev PMF_FN_ARGS) +ahc_pmf_suspend(device_t dev, pmf_qual_t qual) { struct ahc_softc *sc = device_private(dev); #if 0 @@ -156,7 +156,7 @@ ahc_pmf_suspend(device_t dev PMF_FN_ARGS) } static bool -ahc_pmf_resume(device_t dev PMF_FN_ARGS) +ahc_pmf_resume(device_t dev, pmf_qual_t qual) { #if 0 struct ahc_softc *sc = device_private(dev); diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c index 40561b9d0a4..6c9db4b59b1 100644 --- a/sys/dev/ic/atw.c +++ b/sys/dev/ic/atw.c @@ -1,4 +1,4 @@ -/* $NetBSD: atw.c,v 1.147 2009/11/12 19:30:49 dyoung Exp $ */ +/* $NetBSD: atw.c,v 1.148 2010/01/08 20:02:39 dyoung Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.147 2009/11/12 19:30:49 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.148 2010/01/08 20:02:39 dyoung Exp $"); #include "bpfilter.h" @@ -321,7 +321,7 @@ atw_activate(device_t self, enum devact act) } bool -atw_suspend(device_t self PMF_FN_ARGS) +atw_suspend(device_t self, pmf_qual_t qual) { struct atw_softc *sc = device_private(self); diff --git a/sys/dev/ic/atwvar.h b/sys/dev/ic/atwvar.h index 4c11491bc5b..05e7ce88915 100644 --- a/sys/dev/ic/atwvar.h +++ b/sys/dev/ic/atwvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: atwvar.h,v 1.33 2009/09/16 16:34:50 dyoung Exp $ */ +/* $NetBSD: atwvar.h,v 1.34 2010/01/08 20:02:39 dyoung Exp $ */ /* * Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. All rights reserved. @@ -448,6 +448,6 @@ int atw_detach(struct atw_softc *); int atw_activate(device_t, enum devact); int atw_intr(void *arg); bool atw_shutdown(device_t, int); -bool atw_suspend(device_t PMF_FN_PROTO); +bool atw_suspend(device_t, pmf_qual_t); #endif /* _DEV_IC_ATWVAR_H_ */ diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c index 62d13dcf495..a07b2e93efe 100644 --- a/sys/dev/ic/bwi.c +++ b/sys/dev/ic/bwi.c @@ -1,4 +1,4 @@ -/* $NetBSD: bwi.c,v 1.11 2009/07/25 23:43:06 cegger Exp $ */ +/* $NetBSD: bwi.c,v 1.12 2010/01/08 20:02:39 dyoung Exp $ */ /* $OpenBSD: bwi.c,v 1.74 2008/02/25 21:13:30 mglocker Exp $ */ /* @@ -49,7 +49,7 @@ #include "bpfilter.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.11 2009/07/25 23:43:06 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.12 2010/01/08 20:02:39 dyoung Exp $"); #include <sys/param.h> #include <sys/callout.h> @@ -9729,7 +9729,7 @@ bwi_calc_rssi(struct bwi_softc *sc, const struct bwi_rxbuf_hdr *hdr) } bool -bwi_suspend(device_t dv PMF_FN_ARGS) +bwi_suspend(device_t dv, pmf_qual_t qual) { struct bwi_softc *sc = device_private(dv); @@ -9739,7 +9739,7 @@ bwi_suspend(device_t dv PMF_FN_ARGS) } bool -bwi_resume(device_t dv PMF_FN_ARGS) +bwi_resume(device_t dv, pmf_qual_t qual) { struct bwi_softc *sc = device_private(dv); diff --git a/sys/dev/ic/bwivar.h b/sys/dev/ic/bwivar.h index c17f6a8e534..c6dd2b187a4 100644 --- a/sys/dev/ic/bwivar.h +++ b/sys/dev/ic/bwivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: bwivar.h,v 1.4 2009/04/26 10:07:48 cegger Exp $ */ +/* $NetBSD: bwivar.h,v 1.5 2010/01/08 20:02:39 dyoung Exp $ */ /* $OpenBSD: bwivar.h,v 1.23 2008/02/25 20:36:54 mglocker Exp $ */ /* @@ -792,7 +792,7 @@ int bwi_attach(struct bwi_softc *); void bwi_detach(struct bwi_softc *); /* Power Management Framework */ -bool bwi_suspend(device_t db PMF_FN_ARGS); -bool bwi_resume(device_t db PMF_FN_ARGS); +bool bwi_suspend(device_t, pmf_qual_t); +bool bwi_resume(device_t, pmf_qual_t); #endif /* !_DEV_IC_BWIVAR_H */ diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c index 92dc929713c..55f51f6b989 100644 --- a/sys/dev/ic/com.c +++ b/sys/dev/ic/com.c @@ -1,4 +1,4 @@ -/* $NetBSD: com.c,v 1.292 2009/12/06 23:15:59 dyoung Exp $ */ +/* $NetBSD: com.c,v 1.293 2010/01/08 20:02:39 dyoung Exp $ */ /*- * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.292 2009/12/06 23:15:59 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.293 2010/01/08 20:02:39 dyoung Exp $"); #include "opt_com.h" #include "opt_ddb.h" @@ -2404,7 +2404,7 @@ com_cleanup(device_t self, int how) } bool -com_suspend(device_t self PMF_FN_ARGS) +com_suspend(device_t self, pmf_qual_t qual) { struct com_softc *sc = device_private(self); @@ -2420,7 +2420,7 @@ com_suspend(device_t self PMF_FN_ARGS) } bool -com_resume(device_t self PMF_FN_ARGS) +com_resume(device_t self, pmf_qual_t qual) { struct com_softc *sc = device_private(self); diff --git a/sys/dev/ic/comvar.h b/sys/dev/ic/comvar.h index a2736f588b9..d6603deeefc 100644 --- a/sys/dev/ic/comvar.h +++ b/sys/dev/ic/comvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: comvar.h,v 1.68 2009/11/12 20:37:44 dyoung Exp $ */ +/* $NetBSD: comvar.h,v 1.69 2010/01/08 20:02:39 dyoung Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -237,9 +237,9 @@ int comintr(void *); void com_attach_subr(struct com_softc *); int com_probe_subr(struct com_regs *); int com_detach(device_t, int); -bool com_resume(device_t PMF_FN_PROTO); +bool com_resume(device_t, pmf_qual_t); bool com_cleanup(device_t, int); -bool com_suspend(device_t PMF_FN_PROTO); +bool com_suspend(device_t, pmf_qual_t); #ifndef IPL_SERIAL #define IPL_SERIAL IPL_TTY diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c index 634550f72a3..dfa737c5481 100644 --- a/sys/dev/ic/gem.c +++ b/sys/dev/ic/gem.c @@ -1,4 +1,4 @@ -/* $NetBSD: gem.c,v 1.89 2009/12/05 16:43:25 jdc Exp $ */ +/* $NetBSD: gem.c,v 1.90 2010/01/08 20:02:39 dyoung Exp $ */ /* * @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.89 2009/12/05 16:43:25 jdc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.90 2010/01/08 20:02:39 dyoung Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -2603,7 +2603,7 @@ gem_inten(struct gem_softc *sc) } bool -gem_resume(device_t self PMF_FN_ARGS) +gem_resume(device_t self, pmf_qual_t qual) { struct gem_softc *sc = device_private(self); @@ -2613,7 +2613,7 @@ gem_resume(device_t self PMF_FN_ARGS) } bool -gem_suspend(device_t self PMF_FN_ARGS) +gem_suspend(device_t self, pmf_qual_t qual) { struct gem_softc *sc = device_private(self); bus_space_tag_t t = sc->sc_bustag; diff --git a/sys/dev/ic/gemvar.h b/sys/dev/ic/gemvar.h index f37ea5878c9..e18b1fb112e 100644 --- a/sys/dev/ic/gemvar.h +++ b/sys/dev/ic/gemvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: gemvar.h,v 1.19 2009/07/27 18:10:53 dyoung Exp $ */ +/* $NetBSD: gemvar.h,v 1.20 2010/01/08 20:02:39 dyoung Exp $ */ /* * @@ -308,8 +308,8 @@ do { \ #ifdef _KERNEL bool gem_shutdown(device_t, int); -bool gem_suspend(device_t PMF_FN_PROTO); -bool gem_resume(device_t PMF_FN_PROTO); +bool gem_suspend(device_t, pmf_qual_t); +bool gem_resume(device_t, pmf_qual_t); void gem_attach(struct gem_softc *, const uint8_t *); int gem_intr(void *); int gem_detach(struct gem_softc *, int); diff --git a/sys/dev/ic/hpet.c b/sys/dev/ic/hpet.c index 766886f085d..13652648ecc 100644 --- a/sys/dev/ic/hpet.c +++ b/sys/dev/ic/hpet.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpet.c,v 1.8 2009/09/30 15:22:11 njoly Exp $ */ +/* $NetBSD: hpet.c,v 1.9 2010/01/08 20:02:39 dyoung Exp $ */ /* * Copyright (c) 2006 Nicolas Joly @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpet.c,v 1.8 2009/09/30 15:22:11 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpet.c,v 1.9 2010/01/08 20:02:39 dyoung Exp $"); #include <sys/systm.h> #include <sys/device.h> @@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: hpet.c,v 1.8 2009/09/30 15:22:11 njoly Exp $"); #include <dev/ic/hpetvar.h> static u_int hpet_get_timecount(struct timecounter *); -static bool hpet_resume(device_t PMF_FN_PROTO); +static bool hpet_resume(device_t, pmf_qual_t); int hpet_detach(device_t dv, int flags) @@ -113,7 +113,7 @@ hpet_get_timecount(struct timecounter *tc) } static bool -hpet_resume(device_t dv PMF_FN_ARGS) +hpet_resume(device_t dv, pmf_qual_t qual) { struct hpet_softc *sc = device_private(dv); uint32_t val; diff --git a/sys/dev/ic/ne2000.c b/sys/dev/ic/ne2000.c index 39158524d0c..0af2ba57de5 100644 --- a/sys/dev/ic/ne2000.c +++ b/sys/dev/ic/ne2000.c @@ -1,4 +1,4 @@ -/* $NetBSD: ne2000.c,v 1.63 2010/01/02 19:27:41 christos Exp $ */ +/* $NetBSD: ne2000.c,v 1.64 2010/01/08 20:02:39 dyoung Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ne2000.c,v 1.63 2010/01/02 19:27:41 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ne2000.c,v 1.64 2010/01/08 20:02:39 dyoung Exp $"); #include "opt_ipkdb.h" @@ -917,7 +917,7 @@ ne2000_ipkdb_attach(struct ipkdb_if *kip) #endif bool -ne2000_suspend(device_t self PMF_FN_ARGS) +ne2000_suspend(device_t self, pmf_qual_t qual) { struct ne2000_softc *sc = device_private(self); struct dp8390_softc *dsc = &sc->sc_dp8390; @@ -933,7 +933,7 @@ ne2000_suspend(device_t self PMF_FN_ARGS) } bool -ne2000_resume(device_t self PMF_FN_ARGS) +ne2000_resume(device_t self, pmf_qual_t qual) { struct ne2000_softc *sc = device_private(self); struct dp8390_softc *dsc = &sc->sc_dp8390; diff --git a/sys/dev/ic/ne2000var.h b/sys/dev/ic/ne2000var.h index 65a7f0fc5e9..51bf1b77dc7 100644 --- a/sys/dev/ic/ne2000var.h +++ b/sys/dev/ic/ne2000var.h @@ -1,4 +1,4 @@ -/* $NetBSD: ne2000var.h,v 1.22 2010/01/02 19:27:41 christos Exp $ */ +/* $NetBSD: ne2000var.h,v 1.23 2010/01/08 20:02:39 dyoung Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ int ne2000_ipkdb_attach(struct ipkdb_if *); #endif /* pmf(9) */ -bool ne2000_suspend(device_t PMF_FN_PROTO); -bool ne2000_resume(device_t PMF_FN_PROTO); +bool ne2000_suspend(device_t, pmf_qual_t); +bool ne2000_resume(device_t, pmf_qual_t); #endif /* _DEV_IC_NE2000VAR_H_ */ diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c index 20b272c22c2..0d1f50c1965 100644 --- a/sys/dev/ic/pckbc.c +++ b/sys/dev/ic/pckbc.c @@ -1,4 +1,4 @@ -/* $NetBSD: pckbc.c,v 1.46 2009/05/12 14:25:18 cegger Exp $ */ +/* $NetBSD: pckbc.c,v 1.47 2010/01/08 20:02:39 dyoung Exp $ */ /* * Copyright (c) 2004 Ben Harris. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.46 2009/05/12 14:25:18 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.47 2010/01/08 20:02:39 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -680,7 +680,7 @@ pckbc_cnattach(bus_space_tag_t iot, bus_addr_t addr, } bool -pckbc_resume(device_t dv PMF_FN_ARGS) +pckbc_resume(device_t dv, pmf_qual_t qual) { struct pckbc_softc *sc = device_private(dv); struct pckbc_internal *t; diff --git a/sys/dev/ic/pckbcvar.h b/sys/dev/ic/pckbcvar.h index d7e29bf736d..39414f4eddf 100644 --- a/sys/dev/ic/pckbcvar.h +++ b/sys/dev/ic/pckbcvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: pckbcvar.h,v 1.15 2008/03/15 13:23:25 cube Exp $ */ +/* $NetBSD: pckbcvar.h,v 1.16 2010/01/08 20:02:39 dyoung Exp $ */ /* * Copyright (c) 1998 @@ -112,6 +112,6 @@ void pckbcintr_soft(void *); int pckbc_machdep_cnattach(pckbc_tag_t, pckbc_slot_t); /* power management */ -bool pckbc_resume(device_t PMF_FN_PROTO); +bool pckbc_resume(device_t, pmf_qual_t); #endif /* _DEV_IC_PCKBCVAR_H_ */ diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c index a0d3cbb2351..ea78bbc8809 100644 --- a/sys/dev/ic/rtw.c +++ b/sys/dev/ic/rtw.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtw.c,v 1.110 2009/10/19 23:19:39 rmind Exp $ */ +/* $NetBSD: rtw.c,v 1.111 2010/01/08 20:02:39 dyoung Exp $ */ /*- * Copyright (c) 2004, 2005, 2006, 2007 David Young. All rights * reserved. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.110 2009/10/19 23:19:39 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.111 2010/01/08 20:02:39 dyoung Exp $"); #include "bpfilter.h" @@ -2493,7 +2493,7 @@ rtw_tune(struct rtw_softc *sc) } bool -rtw_suspend(device_t self PMF_FN_ARGS) +rtw_suspend(device_t self, pmf_qual_t qual) { int rc; struct rtw_softc *sc = device_private(self); @@ -2515,7 +2515,7 @@ rtw_suspend(device_t self PMF_FN_ARGS) } bool -rtw_resume(device_t self PMF_FN_ARGS) +rtw_resume(device_t self, pmf_qual_t qual) { struct rtw_softc *sc = device_private(self); diff --git a/sys/dev/ic/rtwvar.h b/sys/dev/ic/rtwvar.h index 020c1cc5b2f..c9690531cb7 100644 --- a/sys/dev/ic/rtwvar.h +++ b/sys/dev/ic/rtwvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: rtwvar.h,v 1.39 2009/10/19 23:19:39 rmind Exp $ */ +/* $NetBSD: rtwvar.h,v 1.40 2010/01/08 20:02:39 dyoung Exp $ */ /*- * Copyright (c) 2004, 2005 David Young. All rights reserved. * @@ -502,8 +502,8 @@ void rtw_attach(struct rtw_softc *); int rtw_detach(struct rtw_softc *); int rtw_intr(void *); -bool rtw_suspend(device_t PMF_FN_PROTO); -bool rtw_resume(device_t PMF_FN_PROTO); +bool rtw_suspend(device_t, pmf_qual_t); +bool rtw_resume(device_t, pmf_qual_t); int rtw_activate(device_t, enum devact); diff --git a/sys/dev/ic/spic.c b/sys/dev/ic/spic.c index a40913403e6..9296758401f 100644 --- a/sys/dev/ic/spic.c +++ b/sys/dev/ic/spic.c @@ -1,4 +1,4 @@ -/* $NetBSD: spic.c,v 1.15 2008/05/04 16:13:35 xtraeme Exp $ */ +/* $NetBSD: spic.c,v 1.16 2010/01/08 20:02:39 dyoung Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -49,7 +49,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spic.c,v 1.15 2008/05/04 16:13:35 xtraeme Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spic.c,v 1.16 2010/01/08 20:02:39 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -290,7 +290,7 @@ spic_attach(struct spic_softc *sc) } bool -spic_suspend(device_t dev PMF_FN_ARGS) +spic_suspend(device_t dev, pmf_qual_t qual) { struct spic_softc *sc = device_private(dev); @@ -300,7 +300,7 @@ spic_suspend(device_t dev PMF_FN_ARGS) } bool -spic_resume(device_t dev PMF_FN_ARGS) +spic_resume(device_t dev, pmf_qual_t qual) { struct spic_softc *sc = device_private(dev); diff --git a/sys/dev/ic/spicvar.h b/sys/dev/ic/spicvar.h index c41115eb887..ab0a8dbeb0f 100644 --- a/sys/dev/ic/spicvar.h +++ b/sys/dev/ic/spicvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: spicvar.h,v 1.5 2008/05/04 16:13:35 xtraeme Exp $ */ +/* $NetBSD: spicvar.h,v 1.6 2010/01/08 20:02:39 dyoung Exp $ */ #include <dev/sysmon/sysmonvar.h> @@ -23,7 +23,7 @@ struct spic_softc { }; void spic_attach(struct spic_softc *); -bool spic_suspend(device_t PMF_FN_PROTO); -bool spic_resume(device_t PMF_FN_PROTO); +bool spic_suspend(device_t, pmf_qual_t); +bool spic_resume(device_t, pmf_qual_t); int spic_intr(void *); diff --git a/sys/dev/isa/aps.c b/sys/dev/isa/aps.c index 180b7e58d48..8c1b1d16d63 100644 --- a/sys/dev/isa/aps.c +++ b/sys/dev/isa/aps.c @@ -1,4 +1,4 @@ -/* $NetBSD: aps.c,v 1.8 2008/04/04 09:41:40 xtraeme Exp $ */ +/* $NetBSD: aps.c,v 1.9 2010/01/08 20:00:03 dyoung Exp $ */ /* $OpenBSD: aps.c,v 1.15 2007/05/19 19:14:11 tedu Exp $ */ /* @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aps.c,v 1.8 2008/04/04 09:41:40 xtraeme Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aps.c,v 1.9 2010/01/08 20:00:03 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -112,8 +112,8 @@ static uint8_t aps_mem_read_1(bus_space_tag_t, bus_space_handle_t, int, uint8_t); static void aps_refresh_sensor_data(struct aps_softc *sc); static void aps_refresh(void *); -static bool aps_suspend(device_t PMF_FN_PROTO); -static bool aps_resume(device_t PMF_FN_PROTO); +static bool aps_suspend(device_t, pmf_qual_t); +static bool aps_resume(device_t, pmf_qual_t); CFATTACH_DECL_NEW(aps, sizeof(struct aps_softc), aps_match, aps_attach, aps_detach, NULL); @@ -401,7 +401,7 @@ aps_refresh(void *arg) } static bool -aps_suspend(device_t dv PMF_FN_ARGS) +aps_suspend(device_t dv, pmf_qual_t qual) { struct aps_softc *sc = device_private(dv); @@ -411,7 +411,7 @@ aps_suspend(device_t dv PMF_FN_ARGS) } static bool -aps_resume(device_t dv PMF_FN_ARGS) +aps_resume(device_t dv, pmf_qual_t qual) { struct aps_softc *sc = device_private(dv); diff --git a/sys/dev/isa/com_isa.c b/sys/dev/isa/com_isa.c index dca376e3b73..26aaff2d42d 100644 --- a/sys/dev/isa/com_isa.c +++ b/sys/dev/isa/com_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: com_isa.c,v 1.37 2009/11/23 02:13:46 rmind Exp $ */ +/* $NetBSD: com_isa.c,v 1.38 2010/01/08 20:00:03 dyoung Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.37 2009/11/23 02:13:46 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.38 2010/01/08 20:00:03 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -95,8 +95,8 @@ struct com_isa_softc { int sc_irq; }; -static bool com_isa_suspend(device_t PMF_FN_PROTO); -static bool com_isa_resume(device_t PMF_FN_PROTO); +static bool com_isa_suspend(device_t, pmf_qual_t); +static bool com_isa_resume(device_t, pmf_qual_t); int com_isa_probe(device_t, cfdata_t , void *); void com_isa_attach(device_t, device_t, void *); @@ -218,11 +218,11 @@ com_isa_attach(device_t parent, device_t self, void *aux) } static bool -com_isa_suspend(device_t self PMF_FN_ARGS) +com_isa_suspend(device_t self, pmf_qual_t qual) { struct com_isa_softc *isc = device_private(self); - if (!com_suspend(self PMF_FN_CALL)) + if (!com_suspend(self, qual)) return false; isa_intr_disestablish(isc->sc_ic, isc->sc_ih); @@ -232,7 +232,7 @@ com_isa_suspend(device_t self PMF_FN_ARGS) } static bool -com_isa_resume(device_t self PMF_FN_ARGS) +com_isa_resume(device_t self, pmf_qual_t qual) { struct com_isa_softc *isc = device_private(self); struct com_softc *sc = &isc->sc_com; @@ -240,7 +240,7 @@ com_isa_resume(device_t self PMF_FN_ARGS) isc->sc_ih = isa_intr_establish(isc->sc_ic, isc->sc_irq, IST_EDGE, IPL_SERIAL, comintr, sc); - return com_resume(self PMF_FN_CALL); + return com_resume(self, qual); } static int diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index 4f9941191b4..b1be6feb686 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.93 2009/06/05 21:52:31 haad Exp $ */ +/* $NetBSD: fd.c,v 1.94 2010/01/08 20:00:03 dyoung Exp $ */ /*- * Copyright (c) 1998, 2003, 2008 The NetBSD Foundation, Inc. @@ -81,7 +81,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.93 2009/06/05 21:52:31 haad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.94 2010/01/08 20:00:03 dyoung Exp $"); #include "rnd.h" #include "opt_ddb.h" @@ -208,8 +208,8 @@ void fdattach(device_t, device_t, void *); static int fddetach(device_t, int); static int fdcintr1(struct fdc_softc *); static void fdcintrcb(void *); -static bool fdcsuspend(device_t PMF_FN_PROTO); -static bool fdcresume(device_t PMF_FN_PROTO); +static bool fdcsuspend(device_t, pmf_qual_t); +static bool fdcresume(device_t, pmf_qual_t); extern struct cfdriver fd_cd; @@ -287,7 +287,7 @@ fdprint(void *aux, const char *fdc) } static bool -fdcresume(device_t self PMF_FN_ARGS) +fdcresume(device_t self, pmf_qual_t qual) { struct fdc_softc *fdc = device_private(self); @@ -298,7 +298,7 @@ fdcresume(device_t self PMF_FN_ARGS) } static bool -fdcsuspend(device_t self PMF_FN_ARGS) +fdcsuspend(device_t self, pmf_qual_t qual) { struct fdc_softc *fdc = device_private(self); int drive; diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c index fc6a7aa5ac8..2c909731e3b 100644 --- a/sys/dev/isa/sbdsp.c +++ b/sys/dev/isa/sbdsp.c @@ -1,4 +1,4 @@ -/* $NetBSD: sbdsp.c,v 1.132 2009/09/01 21:47:30 jmcneill Exp $ */ +/* $NetBSD: sbdsp.c,v 1.133 2010/01/08 20:00:03 dyoung Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -74,7 +74,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.132 2009/09/01 21:47:30 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.133 2010/01/08 20:00:03 dyoung Exp $"); #include "midi.h" #include "mpu.h" @@ -224,7 +224,7 @@ static int sbdsp_adjust(int, int); int sbdsp_midi_intr(void *); -static bool sbdsp_resume(device_t PMF_FN_PROTO); +static bool sbdsp_resume(device_t, pmf_qual_t); #ifdef AUDIO_DEBUG void sb_printsc(struct sbdsp_softc *); @@ -440,7 +440,7 @@ sbdsp_attach(struct sbdsp_softc *sc) } static bool -sbdsp_resume(device_t dv PMF_FN_ARGS) +sbdsp_resume(device_t dv, pmf_qual_t qual) { struct sbdsp_softc *sc = device_private(dv); diff --git a/sys/dev/isa/ym.c b/sys/dev/isa/ym.c index 1c83d9ec264..1d6374dbeae 100644 --- a/sys/dev/isa/ym.c +++ b/sys/dev/isa/ym.c @@ -1,4 +1,4 @@ -/* $NetBSD: ym.c,v 1.37 2010/01/02 02:37:08 christos Exp $ */ +/* $NetBSD: ym.c,v 1.38 2010/01/08 20:00:03 dyoung Exp $ */ /*- * Copyright (c) 1999-2002 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.37 2010/01/02 02:37:08 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.38 2010/01/08 20:00:03 dyoung Exp $"); #include "mpu_ym.h" #include "opt_ym.h" @@ -162,8 +162,8 @@ static void ym_hvol_to_master_gain(struct ym_softc *); static void ym_set_mic_gain(struct ym_softc *, int); static void ym_set_3d(struct ym_softc *, mixer_ctrl_t *, struct ad1848_volume *, int); -static bool ym_suspend(device_t PMF_FN_PROTO); -static bool ym_resume(device_t PMF_FN_PROTO); +static bool ym_suspend(device_t, pmf_qual_t); +static bool ym_resume(device_t, pmf_qual_t); const struct audio_hw_if ym_hw_if = { @@ -1107,7 +1107,7 @@ ym_restore_codec_regs(struct ym_softc *sc) * DMA state should also be restored. FIXME. */ static bool -ym_suspend(device_t self PMF_FN_ARGS) +ym_suspend(device_t self, pmf_qual_t qual) { struct ym_softc *sc = device_private(self); int s; @@ -1144,7 +1144,7 @@ ym_suspend(device_t self PMF_FN_ARGS) } static bool -ym_resume(device_t self PMF_FN_ARGS) +ym_resume(device_t self, pmf_qual_t qual) { struct ym_softc *sc = device_private(self); int i, xmax; diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c index 4a4dfb7fdf5..36b4ff8ea60 100644 --- a/sys/dev/mii/mii_physubr.c +++ b/sys/dev/mii/mii_physubr.c @@ -1,4 +1,4 @@ -/* $NetBSD: mii_physubr.c,v 1.65 2009/11/06 18:41:25 dyoung Exp $ */ +/* $NetBSD: mii_physubr.c,v 1.66 2010/01/08 19:58:33 dyoung Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.65 2009/11/06 18:41:25 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.66 2010/01/08 19:58:33 dyoung Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -623,7 +623,7 @@ mii_phy_flowstatus(struct mii_softc *sc) } bool -mii_phy_resume(device_t dv PMF_FN_ARGS) +mii_phy_resume(device_t dv, pmf_qual_t qual) { struct mii_softc *sc = device_private(dv); diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h index a118c847321..9e907b57027 100644 --- a/sys/dev/mii/miivar.h +++ b/sys/dev/mii/miivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: miivar.h,v 1.56 2009/12/04 22:37:35 dyoung Exp $ */ +/* $NetBSD: miivar.h,v 1.57 2010/01/08 19:58:33 dyoung Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -225,7 +225,7 @@ struct mii_media { void mii_attach(device_t, struct mii_data *, int, int, int, int); void mii_detach(struct mii_data *, int, int); -bool mii_phy_resume(device_t PMF_FN_PROTO); +bool mii_phy_resume(device_t, pmf_qual_t); int mii_mediachg(struct mii_data *); void mii_tick(struct mii_data *); diff --git a/sys/dev/pci/agp.c b/sys/dev/pci/agp.c index bea9d9b1459..0e07125cd55 100644 --- a/sys/dev/pci/agp.c +++ b/sys/dev/pci/agp.c @@ -1,4 +1,4 @@ -/* $NetBSD: agp.c,v 1.65 2009/01/27 08:39:33 markd Exp $ */ +/* $NetBSD: agp.c,v 1.66 2010/01/08 19:56:51 dyoung Exp $ */ /*- * Copyright (c) 2000 Doug Rabson @@ -65,7 +65,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.65 2009/01/27 08:39:33 markd Exp $"); +__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.66 2010/01/08 19:56:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -103,7 +103,7 @@ static int agp_deallocate_user(struct agp_softc *, int); static int agp_bind_user(struct agp_softc *, agp_bind *); static int agp_unbind_user(struct agp_softc *, agp_unbind *); static int agpdev_match(struct pci_attach_args *); -static bool agp_resume(device_t PMF_FN_PROTO); +static bool agp_resume(device_t, pmf_qual_t); #include "agp_ali.h" #include "agp_amd.h" @@ -1119,7 +1119,7 @@ agp_free_dmamem(bus_dma_tag_t tag, size_t size, bus_dmamap_t map, } static bool -agp_resume(device_t dv PMF_FN_ARGS) +agp_resume(device_t dv, pmf_qual_t qual) { agp_flush_cache(); diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c index 364c5937674..87f81993adc 100644 --- a/sys/dev/pci/agp_i810.c +++ b/sys/dev/pci/agp_i810.c @@ -1,4 +1,4 @@ -/* $NetBSD: agp_i810.c,v 1.64 2009/05/04 11:05:45 markd Exp $ */ +/* $NetBSD: agp_i810.c,v 1.65 2010/01/08 19:56:51 dyoung Exp $ */ /*- * Copyright (c) 2000 Doug Rabson @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.64 2009/05/04 11:05:45 markd Exp $"); +__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.65 2010/01/08 19:56:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -98,7 +98,7 @@ static int agp_i810_free_memory(struct agp_softc *, struct agp_memory *); static int agp_i810_bind_memory(struct agp_softc *, struct agp_memory *, off_t); static int agp_i810_unbind_memory(struct agp_softc *, struct agp_memory *); -static bool agp_i810_resume(device_t PMF_FN_PROTO); +static bool agp_i810_resume(device_t, pmf_qual_t); static int agp_i810_init(struct agp_softc *); static int agp_i810_init(struct agp_softc *); @@ -1016,7 +1016,7 @@ agp_i810_unbind_memory(struct agp_softc *sc, struct agp_memory *mem) } static bool -agp_i810_resume(device_t dv PMF_FN_ARGS) +agp_i810_resume(device_t dv, pmf_qual_t qual) { struct agp_softc *sc = device_private(dv); struct agp_i810_softc *isc = sc->as_chipc; diff --git a/sys/dev/pci/agp_intel.c b/sys/dev/pci/agp_intel.c index 5e01b44139b..29a44aa76af 100644 --- a/sys/dev/pci/agp_intel.c +++ b/sys/dev/pci/agp_intel.c @@ -1,4 +1,4 @@ -/* $NetBSD: agp_intel.c,v 1.32 2008/06/09 06:49:54 freza Exp $ */ +/* $NetBSD: agp_intel.c,v 1.33 2010/01/08 19:56:51 dyoung Exp $ */ /*- * Copyright (c) 2000 Doug Rabson @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: agp_intel.c,v 1.32 2008/06/09 06:49:54 freza Exp $"); +__KERNEL_RCSID(0, "$NetBSD: agp_intel.c,v 1.33 2010/01/08 19:56:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -71,7 +71,7 @@ static int agp_intel_bind_page(struct agp_softc *, off_t, bus_addr_t); static int agp_intel_unbind_page(struct agp_softc *, off_t); static void agp_intel_flush_tlb(struct agp_softc *); static int agp_intel_init(struct agp_softc *); -static bool agp_intel_resume(device_t PMF_FN_PROTO); +static bool agp_intel_resume(device_t, pmf_qual_t); static struct agp_methods agp_intel_methods = { agp_intel_get_aperture, @@ -397,7 +397,7 @@ agp_intel_flush_tlb(struct agp_softc *sc) } static bool -agp_intel_resume(device_t dv PMF_FN_ARGS) +agp_intel_resume(device_t dv, pmf_qual_t qual) { struct agp_softc *sc = device_private(dv); diff --git a/sys/dev/pci/ahcisata_pci.c b/sys/dev/pci/ahcisata_pci.c index e93c8228f09..367e46019d2 100644 --- a/sys/dev/pci/ahcisata_pci.c +++ b/sys/dev/pci/ahcisata_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ahcisata_pci.c,v 1.17 2009/10/19 18:41:14 bouyer Exp $ */ +/* $NetBSD: ahcisata_pci.c,v 1.18 2010/01/08 19:56:51 dyoung Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.17 2009/10/19 18:41:14 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.18 2010/01/08 19:56:51 dyoung Exp $"); #include <sys/types.h> #include <sys/malloc.h> @@ -74,7 +74,7 @@ static int ahci_pci_match(device_t, cfdata_t, void *); static void ahci_pci_attach(device_t, device_t, void *); const struct pci_quirkdata *ahci_pci_lookup_quirkdata(pci_vendor_id_t, pci_product_id_t); -static bool ahci_pci_resume(device_t PMF_FN_PROTO); +static bool ahci_pci_resume(device_t, pmf_qual_t); CFATTACH_DECL_NEW(ahcisata_pci, sizeof(struct ahci_pci_softc), @@ -171,7 +171,7 @@ ahci_pci_attach(device_t parent, device_t self, void *aux) } static bool -ahci_pci_resume(device_t dv PMF_FN_ARGS) +ahci_pci_resume(device_t dv, pmf_qual_t qual) { struct ahci_pci_softc *psc = device_private(dv); struct ahci_softc *sc = &psc->ah_sc; diff --git a/sys/dev/pci/auacer.c b/sys/dev/pci/auacer.c index 5c4ea8b3afc..45802395c8c 100644 --- a/sys/dev/pci/auacer.c +++ b/sys/dev/pci/auacer.c @@ -1,4 +1,4 @@ -/* $NetBSD: auacer.c,v 1.25 2009/11/26 15:17:08 njoly Exp $ */ +/* $NetBSD: auacer.c,v 1.26 2010/01/08 19:56:51 dyoung Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.25 2009/11/26 15:17:08 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.26 2010/01/08 19:56:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -183,7 +183,7 @@ static int auacer_allocmem(struct auacer_softc *, size_t, size_t, struct auacer_dma *); static int auacer_freemem(struct auacer_softc *, struct auacer_dma *); -static bool auacer_resume(device_t PMF_FN_PROTO); +static bool auacer_resume(device_t, pmf_qual_t); static int auacer_set_rate(struct auacer_softc *, int, u_int); static void auacer_reset(struct auacer_softc *sc); @@ -1016,7 +1016,7 @@ auacer_alloc_cdata(struct auacer_softc *sc) } static bool -auacer_resume(device_t dv PMF_FN_ARGS) +auacer_resume(device_t dv, pmf_qual_t qual) { struct auacer_softc *sc = device_private(dv); diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c index c4f66053724..069a611b980 100644 --- a/sys/dev/pci/auich.c +++ b/sys/dev/pci/auich.c @@ -1,4 +1,4 @@ -/* $NetBSD: auich.c,v 1.133 2009/12/30 00:24:38 jakllsch Exp $ */ +/* $NetBSD: auich.c,v 1.134 2010/01/08 19:56:51 dyoung Exp $ */ /*- * Copyright (c) 2000, 2004, 2005 The NetBSD Foundation, Inc. @@ -111,7 +111,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.133 2009/12/30 00:24:38 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.134 2010/01/08 19:56:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -289,7 +289,7 @@ static int auich_allocmem(struct auich_softc *, size_t, size_t, struct auich_dma *); static int auich_freemem(struct auich_softc *, struct auich_dma *); -static bool auich_resume(device_t PMF_FN_PROTO); +static bool auich_resume(device_t, pmf_qual_t); static int auich_set_rate(struct auich_softc *, int, u_long); static int auich_sysctl_verify(SYSCTLFN_ARGS); static void auich_finish_attach(device_t); @@ -1585,7 +1585,7 @@ auich_alloc_cdata(struct auich_softc *sc) } static bool -auich_resume(device_t dv PMF_FN_ARGS) +auich_resume(device_t dv, pmf_qual_t qual) { struct auich_softc *sc = device_private(dv); pcireg_t v; diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c index d5066dfcede..9dd7b0fb2a2 100644 --- a/sys/dev/pci/auixp.c +++ b/sys/dev/pci/auixp.c @@ -1,4 +1,4 @@ -/* $NetBSD: auixp.c,v 1.32 2009/11/26 15:17:08 njoly Exp $ */ +/* $NetBSD: auixp.c,v 1.33 2010/01/08 19:56:51 dyoung Exp $ */ /* * Copyright (c) 2004, 2005 Reinoud Zandijk <reinoud@netbsd.org> @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.32 2009/11/26 15:17:08 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.33 2010/01/08 19:56:51 dyoung Exp $"); #include <sys/types.h> #include <sys/errno.h> @@ -194,7 +194,7 @@ static void auixp_program_dma_chain(struct auixp_softc *, static void auixp_dma_update(struct auixp_softc *, struct auixp_dma *); static void auixp_update_busbusy(struct auixp_softc *); -static bool auixp_resume(device_t PMF_FN_PROTO); +static bool auixp_resume(device_t, pmf_qual_t); #ifdef DEBUG_AUIXP @@ -1753,7 +1753,7 @@ auixp_init(struct auixp_softc *sc) } static bool -auixp_resume(device_t dv PMF_FN_ARGS) +auixp_resume(device_t dv, pmf_qual_t qual) { struct auixp_softc *sc = device_private(dv); diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c index 52fefa529af..e9e70d51143 100644 --- a/sys/dev/pci/autri.c +++ b/sys/dev/pci/autri.c @@ -1,4 +1,4 @@ -/* $NetBSD: autri.c,v 1.44 2009/11/26 15:17:08 njoly Exp $ */ +/* $NetBSD: autri.c,v 1.45 2010/01/08 19:56:51 dyoung Exp $ */ /* * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.44 2009/11/26 15:17:08 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.45 2010/01/08 19:56:51 dyoung Exp $"); #include "midi.h" @@ -97,7 +97,7 @@ static int autri_write_codec(void *, uint8_t, uint16_t); static int autri_reset_codec(void *); static enum ac97_host_flags autri_flags_codec(void *); -static bool autri_resume(device_t PMF_FN_PROTO); +static bool autri_resume(device_t, pmf_qual_t); static int autri_init(void *); static struct autri_dma *autri_find_dma(struct autri_softc *, void *); static void autri_setup_channel(struct autri_softc *, int, @@ -601,7 +601,7 @@ CFATTACH_DECL(autri, sizeof(struct autri_softc), autri_match, autri_attach, NULL, NULL); static bool -autri_resume(device_t dv PMF_FN_ARGS) +autri_resume(device_t dv, pmf_qual_t qual) { struct autri_softc *sc = device_private(dv); diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c index 6abb9b7ea27..f7363170a68 100644 --- a/sys/dev/pci/auvia.c +++ b/sys/dev/pci/auvia.c @@ -1,4 +1,4 @@ -/* $NetBSD: auvia.c,v 1.70 2009/11/26 15:17:08 njoly Exp $ */ +/* $NetBSD: auvia.c,v 1.71 2010/01/08 19:56:51 dyoung Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.70 2009/11/26 15:17:08 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.71 2010/01/08 19:56:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -113,7 +113,7 @@ static int auvia_trigger_output(void *, void *, void *, int, static int auvia_trigger_input(void *, void *, void *, int, void (*)(void *), void *, const audio_params_t *); -static bool auvia_resume(device_t PMF_FN_PROTO); +static bool auvia_resume(device_t, pmf_qual_t); static int auvia_intr(void *); static int auvia_attach_codec(void *, struct ac97_codec_if *); @@ -1141,7 +1141,7 @@ auvia_intr(void *arg) } static bool -auvia_resume(device_t dv PMF_FN_ARGS) +auvia_resume(device_t dv, pmf_qual_t qual) { struct auvia_softc *sc = device_private(dv); diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c index 3e1efd9bc57..b0203f9f47e 100644 --- a/sys/dev/pci/azalia.c +++ b/sys/dev/pci/azalia.c @@ -1,4 +1,4 @@ -/* $NetBSD: azalia.c,v 1.70 2009/11/12 19:40:19 dyoung Exp $ */ +/* $NetBSD: azalia.c,v 1.71 2010/01/08 19:56:51 dyoung Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.70 2009/11/12 19:40:19 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.71 2010/01/08 19:56:51 dyoung Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -156,7 +156,7 @@ typedef struct azalia_t { static int azalia_pci_match(device_t, cfdata_t, void *); static void azalia_pci_attach(device_t, device_t, void *); static int azalia_pci_detach(device_t, int); -static bool azalia_pci_resume(device_t PMF_FN_PROTO); +static bool azalia_pci_resume(device_t, pmf_qual_t); static void azalia_childdet(device_t, device_t); static int azalia_intr(void *); static int azalia_attach(azalia_t *); @@ -416,7 +416,7 @@ azalia_pci_detach(device_t self, int flags) } static bool -azalia_pci_resume(device_t dv PMF_FN_ARGS) +azalia_pci_resume(device_t dv, pmf_qual_t qual) { azalia_t *az = device_private(dv); int s; diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c index d55c7991bea..09317cfae38 100644 --- a/sys/dev/pci/cs4280.c +++ b/sys/dev/pci/cs4280.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs4280.c,v 1.55 2009/11/26 15:17:09 njoly Exp $ */ +/* $NetBSD: cs4280.c,v 1.56 2010/01/08 19:56:51 dyoung Exp $ */ /* * Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved. @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.55 2009/11/26 15:17:09 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.56 2010/01/08 19:56:51 dyoung Exp $"); #include "midi.h" @@ -110,8 +110,8 @@ static int cs4280_reset_codec(void *); #endif static enum ac97_host_flags cs4280_flags_codec(void *); -static bool cs4280_resume(device_t PMF_FN_PROTO); -static bool cs4280_suspend(device_t PMF_FN_PROTO); +static bool cs4280_resume(device_t, pmf_qual_t); +static bool cs4280_suspend(device_t, pmf_qual_t); /* Internal functions */ static const struct cs4280_card_t * cs4280_identify_card(struct pci_attach_args *); @@ -908,7 +908,7 @@ cs4280_trigger_input(void *addr, void *start, void *end, int blksize, } static bool -cs4280_suspend(device_t dv PMF_FN_ARGS) +cs4280_suspend(device_t dv, pmf_qual_t qual) { struct cs428x_softc *sc = device_private(dv); @@ -943,7 +943,7 @@ cs4280_suspend(device_t dv PMF_FN_ARGS) } static bool -cs4280_resume(device_t dv PMF_FN_ARGS) +cs4280_resume(device_t dv, pmf_qual_t qual) { struct cs428x_softc *sc = device_private(dv); diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c index c5065bcb7a8..464ac2872d8 100644 --- a/sys/dev/pci/cs4281.c +++ b/sys/dev/pci/cs4281.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs4281.c,v 1.42 2009/05/12 08:23:00 cegger Exp $ */ +/* $NetBSD: cs4281.c,v 1.43 2010/01/08 19:56:51 dyoung Exp $ */ /* * Copyright (c) 2000 Tatoku Ogaito. All rights reserved. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.42 2009/05/12 08:23:00 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.43 2010/01/08 19:56:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -106,8 +106,8 @@ static void cs4281_set_adc_rate(struct cs428x_softc *, int); static int cs4281_init(struct cs428x_softc *, int); /* Power Management */ -static bool cs4281_suspend(device_t PMF_FN_PROTO); -static bool cs4281_resume(device_t PMF_FN_PROTO); +static bool cs4281_suspend(device_t, pmf_qual_t); +static bool cs4281_resume(device_t, pmf_qual_t); static const struct audio_hw_if cs4281_hw_if = { NULL, /* open */ @@ -717,7 +717,7 @@ cs4281_trigger_input(void *addr, void *start, void *end, int blksize, } static bool -cs4281_suspend(device_t dv PMF_FN_ARGS) +cs4281_suspend(device_t dv, pmf_qual_t qual) { struct cs428x_softc *sc = device_private(dv); @@ -744,7 +744,7 @@ cs4281_suspend(device_t dv PMF_FN_ARGS) } static bool -cs4281_resume(device_t dv PMF_FN_ARGS) +cs4281_resume(device_t dv, pmf_qual_t qual) { struct cs428x_softc *sc = device_private(dv); diff --git a/sys/dev/pci/ehci_pci.c b/sys/dev/pci/ehci_pci.c index 74dba62ccb7..d28be2f8832 100644 --- a/sys/dev/pci/ehci_pci.c +++ b/sys/dev/pci/ehci_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ehci_pci.c,v 1.45 2009/06/15 09:18:45 cegger Exp $ */ +/* $NetBSD: ehci_pci.c,v 1.46 2010/01/08 19:56:51 dyoung Exp $ */ /* * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.45 2009/06/15 09:18:45 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.46 2010/01/08 19:56:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -76,8 +76,8 @@ static void ehci_release_ownership(ehci_softc_t *sc, pci_chipset_tag_t pc, pcitag_t tag); static void ehci_get_ownership(ehci_softc_t *sc, pci_chipset_tag_t pc, pcitag_t tag); -static bool ehci_pci_suspend(device_t PMF_FN_PROTO); -static bool ehci_pci_resume(device_t PMF_FN_PROTO); +static bool ehci_pci_suspend(device_t, pmf_qual_t); +static bool ehci_pci_resume(device_t, pmf_qual_t); struct ehci_pci_softc { ehci_softc_t sc; @@ -421,23 +421,23 @@ next: } static bool -ehci_pci_suspend(device_t dv PMF_FN_ARGS) +ehci_pci_suspend(device_t dv, pmf_qual_t qual) { struct ehci_pci_softc *sc = device_private(dv); - ehci_suspend(dv PMF_FN_CALL); + ehci_suspend(dv, qual); ehci_release_ownership(&sc->sc, sc->sc_pc, sc->sc_tag); return true; } static bool -ehci_pci_resume(device_t dv PMF_FN_ARGS) +ehci_pci_resume(device_t dv, pmf_qual_t qual) { struct ehci_pci_softc *sc = device_private(dv); ehci_get_ownership(&sc->sc, sc->sc_pc, sc->sc_tag); - return ehci_resume(dv PMF_FN_CALL); + return ehci_resume(dv, qual); } static int diff --git a/sys/dev/pci/esa.c b/sys/dev/pci/esa.c index fee9393c0b3..2b4fc5a15b7 100644 --- a/sys/dev/pci/esa.c +++ b/sys/dev/pci/esa.c @@ -1,4 +1,4 @@ -/* $NetBSD: esa.c,v 1.52 2009/11/26 15:17:09 njoly Exp $ */ +/* $NetBSD: esa.c,v 1.53 2010/01/08 19:56:51 dyoung Exp $ */ /* * Copyright (c) 2001-2008 Jared D. McNeill <jmcneill@invisible.ca> @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.52 2009/11/26 15:17:09 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.53 2010/01/08 19:56:51 dyoung Exp $"); #include <sys/types.h> #include <sys/errno.h> @@ -163,8 +163,8 @@ static void esa_remove_list(struct esa_voice *, struct esa_list *, int); /* power management */ -static bool esa_suspend(device_t PMF_FN_PROTO); -static bool esa_resume(device_t PMF_FN_PROTO); +static bool esa_suspend(device_t, pmf_qual_t); +static bool esa_resume(device_t, pmf_qual_t); #define ESA_NENCODINGS 8 @@ -1652,7 +1652,7 @@ esa_remove_list(struct esa_voice *vc, struct esa_list *el, int index) } static bool -esa_suspend(device_t dv PMF_FN_ARGS) +esa_suspend(device_t dv, pmf_qual_t qual) { struct esa_softc *sc = device_private(dv); bus_space_tag_t iot = sc->sc_iot; @@ -1680,7 +1680,7 @@ esa_suspend(device_t dv PMF_FN_ARGS) } static bool -esa_resume(device_t dv PMF_FN_ARGS) +esa_resume(device_t dv, pmf_qual_t qual) { struct esa_softc *sc = device_private(dv); bus_space_tag_t iot = sc->sc_iot; diff --git a/sys/dev/pci/esm.c b/sys/dev/pci/esm.c index 122c6191f91..e021df549aa 100644 --- a/sys/dev/pci/esm.c +++ b/sys/dev/pci/esm.c @@ -1,4 +1,4 @@ -/* $NetBSD: esm.c,v 1.51 2009/11/26 15:17:09 njoly Exp $ */ +/* $NetBSD: esm.c,v 1.52 2010/01/08 19:56:51 dyoung Exp $ */ /*- * Copyright (c) 2002, 2003 Matt Fredette @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.51 2009/11/26 15:17:09 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.52 2010/01/08 19:56:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -146,8 +146,8 @@ static void esmch_set_format(struct esm_chinfo *, static void esmch_combine_input(struct esm_softc *, struct esm_chinfo *); -static bool esm_suspend(device_t PMF_FN_PROTO); -static bool esm_resume(device_t PMF_FN_PROTO); +static bool esm_suspend(device_t, pmf_qual_t); +static bool esm_resume(device_t, pmf_qual_t); static void esm_childdet(device_t, device_t); static int esm_match(device_t, cfdata_t, void *); static void esm_attach(device_t, device_t, void *); @@ -1766,7 +1766,7 @@ esm_detach(device_t self, int flags) } static bool -esm_suspend(device_t dv PMF_FN_ARGS) +esm_suspend(device_t dv, pmf_qual_t qual) { struct esm_softc *ess = device_private(dv); int x; @@ -1789,7 +1789,7 @@ esm_suspend(device_t dv PMF_FN_ARGS) } static bool -esm_resume(device_t dv PMF_FN_ARGS) +esm_resume(device_t dv, pmf_qual_t qual) { struct esm_softc *ess = device_private(dv); int x; diff --git a/sys/dev/pci/fwohci_pci.c b/sys/dev/pci/fwohci_pci.c index 71d926ce6a3..3e347260382 100644 --- a/sys/dev/pci/fwohci_pci.c +++ b/sys/dev/pci/fwohci_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwohci_pci.c,v 1.33 2009/05/06 09:25:15 cegger Exp $ */ +/* $NetBSD: fwohci_pci.c,v 1.34 2010/01/08 19:56:51 dyoung Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.33 2009/05/06 09:25:15 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.34 2010/01/08 19:56:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -62,8 +62,8 @@ struct fwohci_pci_softc { static int fwohci_pci_match(device_t, cfdata_t, void *); static void fwohci_pci_attach(device_t, device_t, void *); -static bool fwohci_pci_suspend(device_t PMF_FN_PROTO); -static bool fwohci_pci_resume(device_t PMF_FN_PROTO); +static bool fwohci_pci_suspend(device_t, pmf_qual_t); +static bool fwohci_pci_resume(device_t, pmf_qual_t); CFATTACH_DECL_NEW(fwohci_pci, sizeof(struct fwohci_pci_softc), fwohci_pci_match, fwohci_pci_attach, NULL, NULL); @@ -156,7 +156,7 @@ fail: } static bool -fwohci_pci_suspend(device_t dv PMF_FN_ARGS) +fwohci_pci_suspend(device_t dv, pmf_qual_t qual) { struct fwohci_pci_softc *psc = device_private(dv); int s; @@ -169,7 +169,7 @@ fwohci_pci_suspend(device_t dv PMF_FN_ARGS) } static bool -fwohci_pci_resume(device_t dv PMF_FN_ARGS) +fwohci_pci_resume(device_t dv, pmf_qual_t qual) { struct fwohci_pci_softc *psc = device_private(dv); int s; diff --git a/sys/dev/pci/gcscaudio.c b/sys/dev/pci/gcscaudio.c index 599ffb63de7..6469d6baaab 100644 --- a/sys/dev/pci/gcscaudio.c +++ b/sys/dev/pci/gcscaudio.c @@ -1,4 +1,4 @@ -/* $NetBSD: gcscaudio.c,v 1.3 2009/11/26 15:17:09 njoly Exp $ */ +/* $NetBSD: gcscaudio.c,v 1.4 2010/01/08 19:56:51 dyoung Exp $ */ /*- * Copyright (c) 2008 SHIMIZU Ryo <ryo@nerv.org> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.3 2009/11/26 15:17:09 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.4 2010/01/08 19:56:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -151,7 +151,7 @@ static int gcscaudio_trigger_output(void *, void *, void *, int, static int gcscaudio_trigger_input(void *, void *, void *, int, void (*)(void *), void *, const audio_params_t *); -static bool gcscaudio_resume(device_t PMF_FN_PROTO); +static bool gcscaudio_resume(device_t, pmf_qual_t); static int gcscaudio_intr(void *); /* for codec_if */ @@ -1279,7 +1279,7 @@ gcscaudio_intr(void *arg) } static bool -gcscaudio_resume(device_t dv PMF_FN_ARGS) +gcscaudio_resume(device_t dv, pmf_qual_t qual) { struct gcscaudio_softc *sc = device_private(dv); diff --git a/sys/dev/pci/hdaudio/hdaudio_afg.c b/sys/dev/pci/hdaudio/hdaudio_afg.c index feda4976c9c..9fb92ca29d8 100644 --- a/sys/dev/pci/hdaudio/hdaudio_afg.c +++ b/sys/dev/pci/hdaudio/hdaudio_afg.c @@ -1,4 +1,4 @@ -/* $NetBSD: hdaudio_afg.c,v 1.17 2009/10/11 08:50:11 sborrill Exp $ */ +/* $NetBSD: hdaudio_afg.c,v 1.18 2010/01/08 19:56:52 dyoung Exp $ */ /* * Copyright (c) 2009 Precedence Technologies Ltd <support@precedence.co.uk> @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hdaudio_afg.c,v 1.17 2009/10/11 08:50:11 sborrill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdaudio_afg.c,v 1.18 2010/01/08 19:56:52 dyoung Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -309,8 +309,8 @@ static int hdaudio_afg_match(device_t, cfdata_t, void *); static void hdaudio_afg_attach(device_t, device_t, void *); static int hdaudio_afg_detach(device_t, int); static void hdaudio_afg_childdet(device_t, device_t); -static bool hdaudio_afg_suspend(device_t PMF_FN_PROTO); -static bool hdaudio_afg_resume(device_t PMF_FN_PROTO); +static bool hdaudio_afg_suspend(device_t, pmf_qual_t); +static bool hdaudio_afg_resume(device_t, pmf_qual_t); CFATTACH_DECL2_NEW( hdafg, @@ -3247,7 +3247,7 @@ hdaudio_afg_childdet(device_t self, device_t child) } static bool -hdaudio_afg_suspend(device_t self PMF_FN_ARGS) +hdaudio_afg_suspend(device_t self, pmf_qual_t qual) { struct hdaudio_afg_softc *sc = device_private(self); @@ -3257,7 +3257,7 @@ hdaudio_afg_suspend(device_t self PMF_FN_ARGS) } static bool -hdaudio_afg_resume(device_t self PMF_FN_ARGS) +hdaudio_afg_resume(device_t self, pmf_qual_t qual) { struct hdaudio_afg_softc *sc = device_private(self); int nid; diff --git a/sys/dev/pci/hdaudio/hdaudio_pci.c b/sys/dev/pci/hdaudio/hdaudio_pci.c index 5b28f528802..853777b2688 100644 --- a/sys/dev/pci/hdaudio/hdaudio_pci.c +++ b/sys/dev/pci/hdaudio/hdaudio_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: hdaudio_pci.c,v 1.3 2009/12/04 11:13:05 njoly Exp $ */ +/* $NetBSD: hdaudio_pci.c,v 1.4 2010/01/08 19:56:52 dyoung Exp $ */ /* * Copyright (c) 2009 Precedence Technologies Ltd <support@precedence.co.uk> @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.3 2009/12/04 11:13:05 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.4 2010/01/08 19:56:52 dyoung Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -65,7 +65,7 @@ static void hdaudio_pci_childdet(device_t, device_t); static int hdaudio_pci_intr(void *); /* power management */ -static bool hdaudio_pci_resume(device_t PMF_FN_PROTO); +static bool hdaudio_pci_resume(device_t, pmf_qual_t); CFATTACH_DECL2_NEW( hdaudio_pci, @@ -205,7 +205,7 @@ hdaudio_pci_intr(void *opaque) } static bool -hdaudio_pci_resume(device_t self PMF_FN_ARGS) +hdaudio_pci_resume(device_t self, pmf_qual_t qual) { struct hdaudio_pci_softc *sc = device_private(self); diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c index 379871b1fe1..5d8e34d142b 100644 --- a/sys/dev/pci/if_age.c +++ b/sys/dev/pci/if_age.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_age.c,v 1.34 2009/10/08 08:57:19 cegger Exp $ */ +/* $NetBSD: if_age.c,v 1.35 2010/01/08 19:56:51 dyoung Exp $ */ /* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */ /*- @@ -31,7 +31,7 @@ /* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.34 2009/10/08 08:57:19 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.35 2010/01/08 19:56:51 dyoung Exp $"); #include "bpfilter.h" #include "vlan.h" @@ -83,7 +83,7 @@ static int age_match(device_t, cfdata_t, void *); static void age_attach(device_t, device_t, void *); static int age_detach(device_t, int); -static bool age_resume(device_t PMF_FN_PROTO); +static bool age_resume(device_t, pmf_qual_t); static int age_miibus_readreg(device_t, int, int); static void age_miibus_writereg(device_t, int, int, int); @@ -1159,7 +1159,7 @@ age_mac_config(struct age_softc *sc) } static bool -age_resume(device_t dv PMF_FN_ARGS) +age_resume(device_t dv, pmf_qual_t qual) { struct age_softc *sc = device_private(dv); uint16_t cmd; diff --git a/sys/dev/pci/if_ath_pci.c b/sys/dev/pci/if_ath_pci.c index 35d883e60cf..1fee9469316 100644 --- a/sys/dev/pci/if_ath_pci.c +++ b/sys/dev/pci/if_ath_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ath_pci.c,v 1.35 2009/09/16 16:34:50 dyoung Exp $ */ +/* $NetBSD: if_ath_pci.c,v 1.36 2010/01/08 19:56:51 dyoung Exp $ */ /*- * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.11 2005/01/18 18:08:16 sam Exp $"); #endif #ifdef __NetBSD__ -__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.35 2009/09/16 16:34:50 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.36 2010/01/08 19:56:51 dyoung Exp $"); #endif /* @@ -118,7 +118,7 @@ ath_pci_match(device_t parent, cfdata_t match, void *aux) } static bool -ath_pci_suspend(device_t self PMF_FN_ARGS) +ath_pci_suspend(device_t self, pmf_qual_t qual) { struct ath_pci_softc *sc = device_private(self); @@ -130,7 +130,7 @@ ath_pci_suspend(device_t self PMF_FN_ARGS) } static bool -ath_pci_resume(device_t self PMF_FN_ARGS) +ath_pci_resume(device_t self, pmf_qual_t qual) { struct ath_pci_softc *sc = device_private(self); diff --git a/sys/dev/pci/if_atw_pci.c b/sys/dev/pci/if_atw_pci.c index d2be2ddbfd4..f1e0224f903 100644 --- a/sys/dev/pci/if_atw_pci.c +++ b/sys/dev/pci/if_atw_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_atw_pci.c,v 1.22 2009/09/16 16:34:50 dyoung Exp $ */ +/* $NetBSD: if_atw_pci.c,v 1.23 2010/01/08 19:56:51 dyoung Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_atw_pci.c,v 1.22 2009/09/16 16:34:50 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_atw_pci.c,v 1.23 2010/01/08 19:56:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -90,8 +90,8 @@ struct atw_pci_softc { static int atw_pci_match(device_t, cfdata_t, void *); static void atw_pci_attach(device_t, device_t, void *); -static bool atw_pci_suspend(device_t PMF_FN_PROTO); -static bool atw_pci_resume(device_t PMF_FN_PROTO); +static bool atw_pci_suspend(device_t, pmf_qual_t); +static bool atw_pci_resume(device_t, pmf_qual_t); CFATTACH_DECL_NEW(atw_pci, sizeof(struct atw_pci_softc), atw_pci_match, atw_pci_attach, NULL, NULL); @@ -134,7 +134,7 @@ atw_pci_match(device_t parent, cfdata_t match, void *aux) } static bool -atw_pci_resume(device_t self PMF_FN_ARGS) +atw_pci_resume(device_t self, pmf_qual_t qual) { struct atw_pci_softc *psc = device_private(self); struct atw_softc *sc = &psc->psc_atw; @@ -151,7 +151,7 @@ atw_pci_resume(device_t self PMF_FN_ARGS) } static bool -atw_pci_suspend(device_t self PMF_FN_ARGS) +atw_pci_suspend(device_t self, pmf_qual_t qual) { struct atw_pci_softc *psc = device_private(self); @@ -159,7 +159,7 @@ atw_pci_suspend(device_t self PMF_FN_ARGS) pci_intr_disestablish(psc->psc_pc, psc->psc_intrcookie); psc->psc_intrcookie = NULL; - return atw_suspend(self PMF_FN_CALL); + return atw_suspend(self, qual); } static void diff --git a/sys/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c index 649fe70e5cc..5c6558aa072 100644 --- a/sys/dev/pci/if_bce.c +++ b/sys/dev/pci/if_bce.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_bce.c,v 1.28 2009/11/26 15:17:09 njoly Exp $ */ +/* $NetBSD: if_bce.c,v 1.29 2010/01/08 19:56:51 dyoung Exp $ */ /* * Copyright (c) 2003 Clifford Wright. All rights reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.28 2009/11/26 15:17:09 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.29 2010/01/08 19:56:51 dyoung Exp $"); #include "bpfilter.h" #include "vlan.h" @@ -182,7 +182,7 @@ static int bce_add_rxbuf(struct bce_softc *, int); static void bce_rxdrain(struct bce_softc *); static void bce_stop(struct ifnet *, int); static void bce_reset(struct bce_softc *); -static bool bce_resume(device_t PMF_FN_PROTO); +static bool bce_resume(device_t, pmf_qual_t); static void bce_set_filter(struct ifnet *); static int bce_mii_read(device_t, int, int); static void bce_mii_write(device_t, int, int, int); @@ -1374,7 +1374,7 @@ bce_set_filter(struct ifnet *ifp) } static bool -bce_resume(device_t self PMF_FN_ARGS) +bce_resume(device_t self, pmf_qual_t qual) { struct bce_softc *sc = device_private(self); diff --git a/sys/dev/pci/if_fxp_pci.c b/sys/dev/pci/if_fxp_pci.c index 383cf967e13..238348c9588 100644 --- a/sys/dev/pci/if_fxp_pci.c +++ b/sys/dev/pci/if_fxp_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fxp_pci.c,v 1.71 2009/11/26 15:17:09 njoly Exp $ */ +/* $NetBSD: if_fxp_pci.c,v 1.72 2010/01/08 19:56:51 dyoung Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.71 2009/11/26 15:17:09 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.72 2010/01/08 19:56:51 dyoung Exp $"); #include "rnd.h" @@ -92,7 +92,7 @@ static int fxp_pci_enable(struct fxp_softc *); static void fxp_pci_disable(struct fxp_softc *); static void fxp_pci_confreg_restore(struct fxp_pci_softc *psc); -static bool fxp_pci_resume(device_t dv PMF_FN_PROTO); +static bool fxp_pci_resume(device_t dv, pmf_qual_t); CFATTACH_DECL_NEW(fxp_pci, sizeof(struct fxp_pci_softc), fxp_pci_match, fxp_pci_attach, NULL, NULL); @@ -235,7 +235,7 @@ fxp_pci_confreg_restore(struct fxp_pci_softc *psc) } static bool -fxp_pci_resume(device_t dv PMF_FN_ARGS) +fxp_pci_resume(device_t dv, pmf_qual_t qual) { struct fxp_pci_softc *psc = device_private(dv); fxp_pci_confreg_restore(psc); diff --git a/sys/dev/pci/if_gem_pci.c b/sys/dev/pci/if_gem_pci.c index 103edb4f1d0..fb4fc3ec4bb 100644 --- a/sys/dev/pci/if_gem_pci.c +++ b/sys/dev/pci/if_gem_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_gem_pci.c,v 1.38 2009/11/26 15:17:09 njoly Exp $ */ +/* $NetBSD: if_gem_pci.c,v 1.39 2010/01/08 19:56:51 dyoung Exp $ */ /* * @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.38 2009/11/26 15:17:09 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.39 2010/01/08 19:56:51 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -96,8 +96,8 @@ struct gem_pci_softc { }; static bool gem_pci_estintr(struct gem_pci_softc *); -static bool gem_pci_suspend(device_t PMF_FN_PROTO); -static bool gem_pci_resume(device_t PMF_FN_PROTO); +static bool gem_pci_suspend(device_t, pmf_qual_t); +static bool gem_pci_resume(device_t, pmf_qual_t); static int gem_pci_detach(device_t, int); int gem_pci_match(device_t, cfdata_t, void *); @@ -408,7 +408,7 @@ gem_pci_attach(device_t parent, device_t self, void *aux) } static bool -gem_pci_suspend(device_t self PMF_FN_ARGS) +gem_pci_suspend(device_t self, pmf_qual_t qual) { struct gem_pci_softc *gsc = device_private(self); @@ -441,7 +441,7 @@ gem_pci_estintr(struct gem_pci_softc *gsc) } static bool -gem_pci_resume(device_t self PMF_FN_ARGS) +gem_pci_resume(device_t self, pmf_qual_t qual) { struct gem_pci_softc *gsc = device_private(self); diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index 1a4a17d58ea..09a55abeccd 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_iwn.c,v 1.34 2009/11/21 14:51:04 njoly Exp $ */ +/* $NetBSD: if_iwn.c,v 1.35 2010/01/08 19:56:51 dyoung Exp $ */ /* $OpenBSD: if_iwn.c,v 1.49 2009/03/29 21:53:52 sthen Exp $ */ /*- @@ -23,7 +23,7 @@ * 802.11 network adapters. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.34 2009/11/21 14:51:04 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.35 2010/01/08 19:56:51 dyoung Exp $"); #include "bpfilter.h" @@ -273,7 +273,7 @@ static void iwn_hw_stop(struct iwn_softc *); static int iwn_init(struct ifnet *); static void iwn_stop(struct ifnet *, int); static void iwn_fix_channel(struct ieee80211com *, struct mbuf *); -static bool iwn_resume(device_t PMF_FN_PROTO); +static bool iwn_resume(device_t, pmf_qual_t); #define IWN_DEBUG #ifdef IWN_DEBUG @@ -5822,7 +5822,7 @@ iwn_stop(struct ifnet *ifp, int disable) } static bool -iwn_resume(device_t dv PMF_FN_ARGS) +iwn_resume(device_t dv, pmf_qual_t qual) { #if 0 struct iwn_softc *sc = device_private(dv); diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 82885c15d20..299de841a35 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_msk.c,v 1.30 2009/12/24 18:27:31 christos Exp $ */ +/* $NetBSD: if_msk.c,v 1.31 2010/01/08 19:56:51 dyoung Exp $ */ /* $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */ /* @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.30 2009/12/24 18:27:31 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.31 2010/01/08 19:56:51 dyoung Exp $"); #include "bpfilter.h" #include "rnd.h" @@ -101,8 +101,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.30 2009/12/24 18:27:31 christos Exp $") int mskc_probe(device_t, cfdata_t, void *); void mskc_attach(device_t, device_t, void *); -static bool mskc_suspend(device_t PMF_FN_PROTO); -static bool mskc_resume(device_t PMF_FN_PROTO); +static bool mskc_suspend(device_t, pmf_qual_t); +static bool mskc_resume(device_t, pmf_qual_t); int msk_probe(device_t, cfdata_t, void *); void msk_attach(device_t, device_t, void *); int mskcprint(void *, const char *); @@ -963,7 +963,7 @@ msk_probe(device_t parent, cfdata_t match, void *aux) } static bool -msk_resume(device_t dv PMF_FN_ARGS) +msk_resume(device_t dv, pmf_qual_t qual) { struct sk_if_softc *sc_if = device_private(dv); @@ -1654,7 +1654,7 @@ msk_watchdog(struct ifnet *ifp) } static bool -mskc_suspend(device_t dv PMF_FN_ARGS) +mskc_suspend(device_t dv, pmf_qual_t qual) { struct sk_softc *sc = device_private(dv); @@ -1667,7 +1667,7 @@ mskc_suspend(device_t dv PMF_FN_ARGS) } static bool -mskc_resume(device_t dv PMF_FN_ARGS) +mskc_resume(device_t dv, pmf_qual_t qual) { struct sk_softc *sc = device_private(dv); diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c index 26ecd59e63e..8c76ac5473f 100644 --- a/sys/dev/pci/if_nfe.c +++ b/sys/dev/pci/if_nfe.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_nfe.c,v 1.47 2009/11/26 15:17:09 njoly Exp $ */ +/* $NetBSD: if_nfe.c,v 1.48 2010/01/08 19:56:52 dyoung Exp $ */ /* $OpenBSD: if_nfe.c,v 1.77 2008/02/05 16:52:50 brad Exp $ */ /*- @@ -21,7 +21,7 @@ /* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.47 2009/11/26 15:17:09 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.48 2010/01/08 19:56:52 dyoung Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -112,7 +112,7 @@ void nfe_get_macaddr(struct nfe_softc *, uint8_t *); void nfe_set_macaddr(struct nfe_softc *, const uint8_t *); void nfe_tick(void *); void nfe_poweron(device_t); -bool nfe_resume(device_t PMF_FN_PROTO); +bool nfe_resume(device_t, pmf_qual_t); CFATTACH_DECL_NEW(nfe, sizeof(struct nfe_softc), nfe_match, nfe_attach, NULL, NULL); @@ -1947,7 +1947,7 @@ nfe_poweron(device_t self) } bool -nfe_resume(device_t dv PMF_FN_ARGS) +nfe_resume(device_t dv, pmf_qual_t qual) { nfe_poweron(dv); diff --git a/sys/dev/pci/if_rtw_pci.c b/sys/dev/pci/if_rtw_pci.c index a41c92d5618..04c33efad79 100644 --- a/sys/dev/pci/if_rtw_pci.c +++ b/sys/dev/pci/if_rtw_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_rtw_pci.c,v 1.15 2009/09/16 16:34:50 dyoung Exp $ */ +/* $NetBSD: if_rtw_pci.c,v 1.16 2010/01/08 19:56:52 dyoung Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_rtw_pci.c,v 1.15 2009/09/16 16:34:50 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_rtw_pci.c,v 1.16 2010/01/08 19:56:52 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -136,7 +136,7 @@ rtw_pci_match(device_t parent, cfdata_t match, void *aux) } static bool -rtw_pci_resume(device_t self PMF_FN_ARGS) +rtw_pci_resume(device_t self, pmf_qual_t qual) { struct rtw_pci_softc *psc = device_private(self); struct rtw_softc *sc = &psc->psc_rtw; @@ -149,15 +149,15 @@ rtw_pci_resume(device_t self PMF_FN_ARGS) return false; } - return rtw_resume(self PMF_FN_CALL); + return rtw_resume(self, qual); } static bool -rtw_pci_suspend(device_t self PMF_FN_ARGS) +rtw_pci_suspend(device_t self, pmf_qual_t qual) { struct rtw_pci_softc *psc = device_private(self); - if (!rtw_suspend(self PMF_FN_CALL)) + if (!rtw_suspend(self, qual)) return false; /* Unhook the interrupt handler. */ diff --git a/sys/dev/pci/if_sip.c b/sys/dev/pci/if_sip.c index a340ff43e58..32ef7b3add9 100644 --- a/sys/dev/pci/if_sip.c +++ b/sys/dev/pci/if_sip.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_sip.c,v 1.143 2009/11/26 15:17:10 njoly Exp $ */ +/* $NetBSD: if_sip.c,v 1.144 2010/01/08 19:56:52 dyoung Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.143 2009/11/26 15:17:10 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.144 2010/01/08 19:56:52 dyoung Exp $"); #include "bpfilter.h" #include "rnd.h" @@ -610,8 +610,8 @@ static int sipcom_match(device_t, cfdata_t, void *); static void sipcom_attach(device_t, device_t, void *); static void sipcom_do_detach(device_t, enum sip_attach_stage); static int sipcom_detach(device_t, int); -static bool sipcom_resume(device_t PMF_FN_PROTO); -static bool sipcom_suspend(device_t PMF_FN_PROTO); +static bool sipcom_resume(device_t, pmf_qual_t); +static bool sipcom_suspend(device_t, pmf_qual_t); int gsip_copy_small = 0; int sip_copy_small = 0; @@ -965,7 +965,7 @@ sipcom_do_detach(device_t self, enum sip_attach_stage stage) } static bool -sipcom_resume(device_t self PMF_FN_ARGS) +sipcom_resume(device_t self, pmf_qual_t qual) { struct sip_softc *sc = device_private(self); @@ -973,7 +973,7 @@ sipcom_resume(device_t self PMF_FN_ARGS) } static bool -sipcom_suspend(device_t self PMF_FN_ARGS) +sipcom_suspend(device_t self, pmf_qual_t qual) { struct sip_softc *sc = device_private(self); diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index 98f47ddfd8c..454704db47d 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_sk.c,v 1.62 2009/11/26 15:17:10 njoly Exp $ */ +/* $NetBSD: if_sk.c,v 1.63 2010/01/08 19:56:52 dyoung Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -115,7 +115,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.62 2009/11/26 15:17:10 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.63 2010/01/08 19:56:52 dyoung Exp $"); #include "bpfilter.h" #include "rnd.h" @@ -210,9 +210,9 @@ void sk_setfilt(struct sk_if_softc *, void *, int); void sk_setmulti(struct sk_if_softc *); void sk_tick(void *); -static bool skc_suspend(device_t dv PMF_FN_ARGS); -static bool skc_resume(device_t dv PMF_FN_ARGS); -static bool sk_resume(device_t dv PMF_FN_ARGS); +static bool skc_suspend(device_t dv, pmf_qual_t qual); +static bool skc_resume(device_t dv, pmf_qual_t qual); +static bool sk_resume(device_t dv, pmf_qual_t qual); /* #define SK_DEBUG 2 */ #ifdef SK_DEBUG @@ -2955,7 +2955,7 @@ sk_stop(struct ifnet *ifp, int disable) /* Power Management Framework */ static bool -skc_suspend(device_t dv PMF_FN_ARGS) +skc_suspend(device_t dv, pmf_qual_t qual) { struct sk_softc *sc = device_private(dv); @@ -2968,7 +2968,7 @@ skc_suspend(device_t dv PMF_FN_ARGS) } static bool -skc_resume(device_t dv PMF_FN_ARGS) +skc_resume(device_t dv, pmf_qual_t qual) { struct sk_softc *sc = device_private(dv); @@ -2981,7 +2981,7 @@ skc_resume(device_t dv PMF_FN_ARGS) } static bool -sk_resume(device_t dv PMF_FN_ARGS) +sk_resume(device_t dv, pmf_qual_t qual) { struct sk_if_softc *sc_if = device_private(dv); diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index 84114e02e60..3cd599ca44c 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_vr.c,v 1.100 2009/11/26 15:17:10 njoly Exp $ */ +/* $NetBSD: if_vr.c,v 1.101 2010/01/08 19:56:52 dyoung Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.100 2009/11/26 15:17:10 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.101 2010/01/08 19:56:52 dyoung Exp $"); #include "rnd.h" @@ -318,7 +318,7 @@ static void vr_setmulti(struct vr_softc *); static void vr_reset(struct vr_softc *); static int vr_restore_state(pci_chipset_tag_t, pcitag_t, device_t, pcireg_t); -static bool vr_resume(device_t PMF_FN_PROTO); +static bool vr_resume(device_t, pmf_qual_t); int vr_copy_small = 0; @@ -1758,7 +1758,7 @@ vr_restore_state(pci_chipset_tag_t pc, pcitag_t tag, device_t self, } static bool -vr_resume(device_t self PMF_FN_ARGS) +vr_resume(device_t self, pmf_qual_t qual) { struct vr_softc *sc = device_private(self); diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index d9f17e5c42d..c31abf13360 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_wpi.c,v 1.43 2009/09/05 14:09:55 tsutsui Exp $ */ +/* $NetBSD: if_wpi.c,v 1.44 2010/01/08 19:56:52 dyoung Exp $ */ /*- * Copyright (c) 2006, 2007 @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.43 2009/09/05 14:09:55 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.44 2010/01/08 19:56:52 dyoung Exp $"); /* * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters. @@ -171,7 +171,7 @@ static int wpi_reset(struct wpi_softc *); static void wpi_hw_config(struct wpi_softc *); static int wpi_init(struct ifnet *); static void wpi_stop(struct ifnet *, int); -static bool wpi_resume(device_t PMF_FN_PROTO); +static bool wpi_resume(device_t, pmf_qual_t); static int wpi_getrfkill(struct wpi_softc *); static void wpi_sysctlattach(struct wpi_softc *); @@ -3203,7 +3203,7 @@ wpi_stop(struct ifnet *ifp, int disable) } static bool -wpi_resume(device_t dv PMF_FN_ARGS) +wpi_resume(device_t dv, pmf_qual_t qual) { struct wpi_softc *sc = device_private(dv); diff --git a/sys/dev/pci/ixpide.c b/sys/dev/pci/ixpide.c index 0a469426288..68decc502b5 100644 --- a/sys/dev/pci/ixpide.c +++ b/sys/dev/pci/ixpide.c @@ -1,4 +1,4 @@ -/* $NetBSD: ixpide.c,v 1.14 2008/11/04 16:05:29 reinoud Exp $ */ +/* $NetBSD: ixpide.c,v 1.15 2010/01/08 19:56:52 dyoung Exp $ */ /* * Copyright (c) 2004 The NetBSD Foundation. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixpide.c,v 1.14 2008/11/04 16:05:29 reinoud Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixpide.c,v 1.15 2010/01/08 19:56:52 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -38,8 +38,8 @@ __KERNEL_RCSID(0, "$NetBSD: ixpide.c,v 1.14 2008/11/04 16:05:29 reinoud Exp $"); #include <dev/pci/pciidevar.h> #include <dev/pci/pciide_ixp_reg.h> -static bool ixpide_resume(device_t PMF_FN_PROTO); -static bool ixpide_suspend(device_t PMF_FN_PROTO); +static bool ixpide_resume(device_t, pmf_qual_t); +static bool ixpide_suspend(device_t, pmf_qual_t); static int ixpide_match(device_t, cfdata_t, void *); static void ixpide_attach(device_t, device_t, void *); @@ -146,7 +146,7 @@ static const uint8_t ixp_mdma_timings[] = { }; static bool -ixpide_resume(device_t dv PMF_FN_ARGS) +ixpide_resume(device_t dv, pmf_qual_t qual) { struct pciide_softc *sc = device_private(dv); @@ -159,7 +159,7 @@ ixpide_resume(device_t dv PMF_FN_ARGS) } static bool -ixpide_suspend(device_t dv PMF_FN_ARGS) +ixpide_suspend(device_t dv, pmf_qual_t qual) { struct pciide_softc *sc = device_private(dv); diff --git a/sys/dev/pci/mvsata_pci.c b/sys/dev/pci/mvsata_pci.c index a1076ee574e..fb22eb9f347 100644 --- a/sys/dev/pci/mvsata_pci.c +++ b/sys/dev/pci/mvsata_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: mvsata_pci.c,v 1.1 2009/07/27 12:34:14 kiyohara Exp $ */ +/* $NetBSD: mvsata_pci.c,v 1.2 2010/01/08 19:56:52 dyoung Exp $ */ /* * Copyright (c) 2008 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mvsata_pci.c,v 1.1 2009/07/27 12:34:14 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mvsata_pci.c,v 1.2 2010/01/08 19:56:52 dyoung Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -98,7 +98,7 @@ static void mvsata_pci_attach(device_t, device_t, void *); static int mvsata_pci_detach(device_t, int); static int mvsata_pci_intr(void *); -static bool mvsata_pci_resume(device_t PMF_FN_ARGS); +static bool mvsata_pci_resume(device_t, pmf_qual_t qual); static int mvsata_pci_sreset(struct mvsata_softc *); static int mvsata_pci_misc_reset(struct mvsata_softc *); @@ -298,7 +298,7 @@ mvsata_pci_intr(void *arg) } static bool -mvsata_pci_resume(device_t dev PMF_FN_ARGS) +mvsata_pci_resume(device_t dev, pmf_qual_t qual) { /* not yet... */ diff --git a/sys/dev/pci/neo.c b/sys/dev/pci/neo.c index 7cf97285309..a7b7c9d3b05 100644 --- a/sys/dev/pci/neo.c +++ b/sys/dev/pci/neo.c @@ -1,4 +1,4 @@ -/* $NetBSD: neo.c,v 1.43 2009/11/26 15:17:10 njoly Exp $ */ +/* $NetBSD: neo.c,v 1.44 2010/01/08 19:56:52 dyoung Exp $ */ /* * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk> @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.43 2009/11/26 15:17:10 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.44 2010/01/08 19:56:52 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -549,7 +549,7 @@ neo_match(device_t parent, cfdata_t match, void *aux) } static bool -neo_resume(device_t dv PMF_FN_ARGS) +neo_resume(device_t dv, pmf_qual_t qual) { struct neo_softc *sc = device_private(dv); diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index e73da376676..7cb79e903b4 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $NetBSD: pccbb.c,v 1.192 2009/12/15 22:17:12 snj Exp $ */ +/* $NetBSD: pccbb.c,v 1.193 2010/01/08 19:56:52 dyoung Exp $ */ /* * Copyright (c) 1998, 1999 and 2000 @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.192 2009/12/15 22:17:12 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.193 2010/01/08 19:56:52 dyoung Exp $"); /* #define CBB_DEBUG @@ -199,8 +199,8 @@ void pccbb_winlist_show(struct pccbb_win_chain *); /* for config_defer */ static void pccbb_pci_callback(device_t); -static bool pccbb_suspend(device_t PMF_FN_PROTO); -static bool pccbb_resume(device_t PMF_FN_PROTO); +static bool pccbb_suspend(device_t, pmf_qual_t); +static bool pccbb_resume(device_t, pmf_qual_t); #if defined SHOW_REGS static void cb_show_regs(pci_chipset_tag_t pc, pcitag_t tag, @@ -3179,7 +3179,7 @@ pccbb_winset(bus_addr_t align, struct pccbb_softc *sc, bus_space_tag_t bst) #endif /* rbus */ static bool -pccbb_suspend(device_t dv PMF_FN_ARGS) +pccbb_suspend(device_t dv, pmf_qual_t qual) { struct pccbb_softc *sc = device_private(dv); bus_space_tag_t base_memt = sc->sc_base_memt; /* socket regs memory */ @@ -3214,7 +3214,7 @@ pccbb_suspend(device_t dv PMF_FN_ARGS) } static bool -pccbb_resume(device_t dv PMF_FN_ARGS) +pccbb_resume(device_t dv, pmf_qual_t qual) { struct pccbb_softc *sc = device_private(dv); bus_space_tag_t base_memt = sc->sc_base_memt; /* socket regs memory */ diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 9f729e56cc2..c13dfc951c2 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci.c,v 1.124 2009/08/19 21:36:47 dyoung Exp $ */ +/* $NetBSD: pci.c,v 1.125 2010/01/08 19:56:52 dyoung Exp $ */ /* * Copyright (c) 1995, 1996, 1997, 1998 @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.124 2009/08/19 21:36:47 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.125 2010/01/08 19:56:52 dyoung Exp $"); #include "opt_pci.h" @@ -871,7 +871,7 @@ struct pci_child_power { }; static bool -pci_child_suspend(device_t dv PMF_FN_ARGS) +pci_child_suspend(device_t dv, pmf_qual_t qual) { struct pci_child_power *priv = device_pmf_bus_private(dv); pcireg_t ocsr, csr; @@ -899,7 +899,7 @@ pci_child_suspend(device_t dv PMF_FN_ARGS) } static bool -pci_child_resume(device_t dv PMF_FN_ARGS) +pci_child_resume(device_t dv, pmf_qual_t qual) { struct pci_child_power *priv = device_pmf_bus_private(dv); diff --git a/sys/dev/pci/piixide.c b/sys/dev/pci/piixide.c index 7d836f00bd2..fe5a6357686 100644 --- a/sys/dev/pci/piixide.c +++ b/sys/dev/pci/piixide.c @@ -1,4 +1,4 @@ -/* $NetBSD: piixide.c,v 1.52 2009/11/30 09:33:48 sborrill Exp $ */ +/* $NetBSD: piixide.c,v 1.53 2010/01/08 19:56:52 dyoung Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Manuel Bouyer. @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.52 2009/11/30 09:33:48 sborrill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.53 2010/01/08 19:56:52 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -45,8 +45,8 @@ static u_int32_t piix_setup_sidetim_timings(u_int8_t, u_int8_t, u_int8_t); static void piixsata_chip_map(struct pciide_softc*, struct pci_attach_args *); static int piix_dma_init(void *, int, int, void *, size_t, int); -static bool piixide_resume(device_t PMF_FN_PROTO); -static bool piixide_suspend(device_t PMF_FN_PROTO); +static bool piixide_resume(device_t, pmf_qual_t); +static bool piixide_suspend(device_t, pmf_qual_t); static int piixide_match(device_t, cfdata_t, void *); static void piixide_attach(device_t, device_t, void *); @@ -367,7 +367,7 @@ piixide_attach(device_t parent, device_t self, void *aux) } static bool -piixide_resume(device_t dv PMF_FN_ARGS) +piixide_resume(device_t dv, pmf_qual_t qual) { struct pciide_softc *sc = device_private(dv); @@ -380,7 +380,7 @@ piixide_resume(device_t dv PMF_FN_ARGS) } static bool -piixide_suspend(device_t dv PMF_FN_ARGS) +piixide_suspend(device_t dv, pmf_qual_t qual) { struct pciide_softc *sc = device_private(dv); diff --git a/sys/dev/pci/piixpm.c b/sys/dev/pci/piixpm.c index 1414d84877b..6d4746b48f2 100644 --- a/sys/dev/pci/piixpm.c +++ b/sys/dev/pci/piixpm.c @@ -1,4 +1,4 @@ -/* $NetBSD: piixpm.c,v 1.30 2009/11/03 12:51:56 pgoyette Exp $ */ +/* $NetBSD: piixpm.c,v 1.31 2010/01/08 19:56:52 dyoung Exp $ */ /* $OpenBSD: piixpm.c,v 1.20 2006/02/27 08:25:02 grange Exp $ */ /* @@ -22,7 +22,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.30 2009/11/03 12:51:56 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.31 2010/01/08 19:56:52 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -82,8 +82,8 @@ struct piixpm_softc { static int piixpm_match(device_t, cfdata_t, void *); static void piixpm_attach(device_t, device_t, void *); -static bool piixpm_suspend(device_t PMF_FN_PROTO); -static bool piixpm_resume(device_t PMF_FN_PROTO); +static bool piixpm_suspend(device_t, pmf_qual_t); +static bool piixpm_resume(device_t, pmf_qual_t); static int piixpm_i2c_acquire_bus(void *, int); static void piixpm_i2c_release_bus(void *, int); @@ -241,7 +241,7 @@ nopowermanagement: } static bool -piixpm_suspend(device_t dv PMF_FN_ARGS) +piixpm_suspend(device_t dv, pmf_qual_t qual) { struct piixpm_softc *sc = device_private(dv); @@ -254,7 +254,7 @@ piixpm_suspend(device_t dv PMF_FN_ARGS) } static bool -piixpm_resume(device_t dv PMF_FN_ARGS) +piixpm_resume(device_t dv, pmf_qual_t qual) { struct piixpm_softc *sc = device_private(dv); diff --git a/sys/dev/pci/ppb.c b/sys/dev/pci/ppb.c index 8d8cc9e9750..4139726b454 100644 --- a/sys/dev/pci/ppb.c +++ b/sys/dev/pci/ppb.c @@ -1,4 +1,4 @@ -/* $NetBSD: ppb.c,v 1.40 2009/04/02 00:09:33 dyoung Exp $ */ +/* $NetBSD: ppb.c,v 1.41 2010/01/08 19:56:52 dyoung Exp $ */ /* * Copyright (c) 1996, 1998 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.40 2009/04/02 00:09:33 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.41 2010/01/08 19:56:52 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,8 +51,8 @@ struct ppb_softc { pcireg_t sc_pciconfext[48]; }; -static bool ppb_resume(device_t PMF_FN_PROTO); -static bool ppb_suspend(device_t PMF_FN_PROTO); +static bool ppb_resume(device_t, pmf_qual_t); +static bool ppb_suspend(device_t, pmf_qual_t); static int ppbmatch(device_t parent, cfdata_t match, void *aux) @@ -169,7 +169,7 @@ ppbdetach(device_t self, int flags) } static bool -ppb_resume(device_t dv PMF_FN_ARGS) +ppb_resume(device_t dv, pmf_qual_t qual) { struct ppb_softc *sc = device_private(dv); int off; @@ -188,7 +188,7 @@ ppb_resume(device_t dv PMF_FN_ARGS) } static bool -ppb_suspend(device_t dv PMF_FN_ARGS) +ppb_suspend(device_t dv, pmf_qual_t qual) { struct ppb_softc *sc = device_private(dv); int off; diff --git a/sys/dev/pci/siisata_pci.c b/sys/dev/pci/siisata_pci.c index d1a25a82490..590fe98b044 100644 --- a/sys/dev/pci/siisata_pci.c +++ b/sys/dev/pci/siisata_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: siisata_pci.c,v 1.5 2009/10/19 18:41:16 bouyer Exp $ */ +/* $NetBSD: siisata_pci.c,v 1.6 2010/01/08 19:56:52 dyoung Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -76,7 +76,7 @@ struct siisata_pci_softc { static int siisata_pci_match(device_t, cfdata_t, void *); static void siisata_pci_attach(device_t, device_t, void *); static int siisata_pci_detach(device_t, int); -static bool siisata_pci_resume(device_t PMF_FN_PROTO); +static bool siisata_pci_resume(device_t, pmf_qual_t); struct siisata_pci_board { pci_vendor_id_t spb_vend; @@ -299,7 +299,7 @@ siisata_pci_detach(device_t dv, int flags) } static bool -siisata_pci_resume(device_t dv PMF_FN_ARGS) +siisata_pci_resume(device_t dv, pmf_qual_t qual) { struct siisata_pci_softc *psc = device_private(dv); struct siisata_softc *sc = &psc->si_sc; diff --git a/sys/dev/pci/uhci_pci.c b/sys/dev/pci/uhci_pci.c index 7e4b1e40bb8..f0a5917a907 100644 --- a/sys/dev/pci/uhci_pci.c +++ b/sys/dev/pci/uhci_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhci_pci.c,v 1.48 2009/11/26 15:17:10 njoly Exp $ */ +/* $NetBSD: uhci_pci.c,v 1.49 2010/01/08 19:56:52 dyoung Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.48 2009/11/26 15:17:10 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.49 2010/01/08 19:56:52 dyoung Exp $"); #include "ehci.h" @@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.48 2009/11/26 15:17:10 njoly Exp $"); #include <dev/usb/uhcireg.h> #include <dev/usb/uhcivar.h> -static bool uhci_pci_resume(device_t PMF_FN_PROTO); +static bool uhci_pci_resume(device_t, pmf_qual_t); struct uhci_pci_softc { uhci_softc_t sc; @@ -229,7 +229,7 @@ uhci_pci_detach(device_t self, int flags) } static bool -uhci_pci_resume(device_t dv PMF_FN_ARGS) +uhci_pci_resume(device_t dv, pmf_qual_t qual) { struct uhci_pci_softc *sc = device_private(dv); @@ -237,7 +237,7 @@ uhci_pci_resume(device_t dv PMF_FN_ARGS) pci_conf_write(sc->sc_pc, sc->sc_tag, PCI_LEGSUP, PCI_LEGSUP_USBPIRQDEN); - return uhci_resume(dv PMF_FN_CALL); + return uhci_resume(dv, qual); } CFATTACH_DECL3_NEW(uhci_pci, sizeof(struct uhci_pci_softc), diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c index c1d09941bc0..99f1aa3dbab 100644 --- a/sys/dev/pci/vga_pci.c +++ b/sys/dev/pci/vga_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: vga_pci.c,v 1.47 2009/08/18 20:46:10 jmcneill Exp $ */ +/* $NetBSD: vga_pci.c,v 1.48 2010/01/08 19:56:52 dyoung Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.47 2009/08/18 20:46:10 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.48 2010/01/08 19:56:52 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -90,7 +90,7 @@ static int vga_pci_match(device_t, cfdata_t, void *); static void vga_pci_attach(device_t, device_t, void *); static int vga_pci_rescan(device_t, const char *, const int *); static int vga_pci_lookup_quirks(struct pci_attach_args *); -static bool vga_pci_resume(device_t dv PMF_FN_PROTO); +static bool vga_pci_resume(device_t dv, pmf_qual_t); CFATTACH_DECL2_NEW(vga_pci, sizeof(struct vga_pci_softc), vga_pci_match, vga_pci_attach, NULL, NULL, vga_pci_rescan, NULL); @@ -263,7 +263,7 @@ vga_pci_rescan(device_t self, const char *ifattr, const int *locators) } static bool -vga_pci_resume(device_t dv PMF_FN_ARGS) +vga_pci_resume(device_t dv, pmf_qual_t qual) { #if defined(VGA_POST) && NACPICA > 0 extern int acpi_md_vbios_reset; diff --git a/sys/dev/pci/viaide.c b/sys/dev/pci/viaide.c index aed9a262609..6ebbde70c5f 100644 --- a/sys/dev/pci/viaide.c +++ b/sys/dev/pci/viaide.c @@ -1,4 +1,4 @@ -/* $NetBSD: viaide.c,v 1.66 2009/12/23 00:11:36 mrg Exp $ */ +/* $NetBSD: viaide.c,v 1.67 2010/01/08 19:56:52 dyoung Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Manuel Bouyer. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: viaide.c,v 1.66 2009/12/23 00:11:36 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: viaide.c,v 1.67 2010/01/08 19:56:52 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -59,8 +59,8 @@ static int viaide_match(device_t, cfdata_t, void *); static void viaide_attach(device_t, device_t, void *); static const struct pciide_product_desc * viaide_lookup(pcireg_t); -static bool viaide_suspend(device_t PMF_FN_PROTO); -static bool viaide_resume(device_t PMF_FN_PROTO); +static bool viaide_suspend(device_t, pmf_qual_t); +static bool viaide_resume(device_t, pmf_qual_t); CFATTACH_DECL_NEW(viaide, sizeof(struct pciide_softc), viaide_match, viaide_attach, NULL, NULL); @@ -400,7 +400,7 @@ via_pcib_match(struct pci_attach_args *pa) } static bool -viaide_suspend(device_t dv PMF_FN_ARGS) +viaide_suspend(device_t dv, pmf_qual_t qual) { struct pciide_softc *sc = device_private(dv); @@ -415,7 +415,7 @@ viaide_suspend(device_t dv PMF_FN_ARGS) } static bool -viaide_resume(device_t dv PMF_FN_ARGS) +viaide_resume(device_t dv, pmf_qual_t qual) { struct pciide_softc *sc = device_private(dv); diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c index af8ecb070fc..2fe42550201 100644 --- a/sys/dev/pci/yds.c +++ b/sys/dev/pci/yds.c @@ -1,4 +1,4 @@ -/* $NetBSD: yds.c,v 1.47 2009/11/26 15:17:10 njoly Exp $ */ +/* $NetBSD: yds.c,v 1.48 2010/01/08 19:56:52 dyoung Exp $ */ /* * Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.47 2009/11/26 15:17:10 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.48 2010/01/08 19:56:52 dyoung Exp $"); #include "mpu.h" @@ -677,7 +677,7 @@ yds_init(struct yds_softc *sc) } static bool -yds_suspend(device_t dv PMF_FN_ARGS) +yds_suspend(device_t dv, pmf_qual_t qual) { struct yds_softc *sc = device_private(dv); pci_chipset_tag_t pc = sc->sc_pc; @@ -692,7 +692,7 @@ yds_suspend(device_t dv PMF_FN_ARGS) } static bool -yds_resume(device_t dv PMF_FN_ARGS) +yds_resume(device_t dv, pmf_qual_t qual) { struct yds_softc *sc = device_private(dv); pci_chipset_tag_t pc = sc->sc_pc; diff --git a/sys/dev/pckbport/pckbd.c b/sys/dev/pckbport/pckbd.c index 2052fcef11c..2a8471dda03 100644 --- a/sys/dev/pckbport/pckbd.c +++ b/sys/dev/pckbport/pckbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: pckbd.c,v 1.27 2009/07/16 20:44:54 jakllsch Exp $ */ +/* $NetBSD: pckbd.c,v 1.28 2010/01/08 20:00:32 dyoung Exp $ */ /*- * Copyright (c) 1998, 2009 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.27 2009/07/16 20:44:54 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.28 2010/01/08 20:00:32 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -236,7 +236,7 @@ pckbd_is_console(pckbport_tag_t tag, pckbport_slot_t slot) } static bool -pckbd_suspend(device_t dv PMF_FN_ARGS) +pckbd_suspend(device_t dv, pmf_qual_t qual) { struct pckbd_softc *sc = device_private(dv); u_char cmd[1]; @@ -259,7 +259,7 @@ pckbd_suspend(device_t dv PMF_FN_ARGS) } static bool -pckbd_resume(device_t dv PMF_FN_ARGS) +pckbd_resume(device_t dv, pmf_qual_t qual) { struct pckbd_softc *sc = device_private(dv); u_char cmd[1], resp[1]; diff --git a/sys/dev/pckbport/pms.c b/sys/dev/pckbport/pms.c index 75feebf3812..2ecebeb7bea 100644 --- a/sys/dev/pckbport/pms.c +++ b/sys/dev/pckbport/pms.c @@ -1,4 +1,4 @@ -/* $NetBSD: pms.c,v 1.28 2009/03/08 15:06:56 ad Exp $ */ +/* $NetBSD: pms.c,v 1.29 2010/01/08 20:00:32 dyoung Exp $ */ /*- * Copyright (c) 2004 Kentaro Kurahone. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.28 2009/03/08 15:06:56 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.29 2010/01/08 20:00:32 dyoung Exp $"); #include "opt_pms.h" @@ -90,8 +90,8 @@ int pms_enable(void *); int pms_ioctl(void *, u_long, void *, int, struct lwp *); void pms_disable(void *); -static bool pms_suspend(device_t PMF_FN_PROTO); -static bool pms_resume(device_t PMF_FN_PROTO); +static bool pms_suspend(device_t, pmf_qual_t); +static bool pms_resume(device_t, pmf_qual_t); const struct wsmouse_accessops pms_accessops = { pms_enable, @@ -343,7 +343,7 @@ pms_disable(void *v) } static bool -pms_suspend(device_t dv PMF_FN_ARGS) +pms_suspend(device_t dv, pmf_qual_t qual) { struct pms_softc *sc = device_private(dv); @@ -354,7 +354,7 @@ pms_suspend(device_t dv PMF_FN_ARGS) } static bool -pms_resume(device_t dv PMF_FN_ARGS) +pms_resume(device_t dv, pmf_qual_t qual) { struct pms_softc *sc = device_private(dv); diff --git a/sys/dev/pcmcia/bt3c.c b/sys/dev/pcmcia/bt3c.c index 07b99fc0412..5f7c4df537b 100644 --- a/sys/dev/pcmcia/bt3c.c +++ b/sys/dev/pcmcia/bt3c.c @@ -1,4 +1,4 @@ -/* $NetBSD: bt3c.c,v 1.19 2009/05/12 13:18:04 cegger Exp $ */ +/* $NetBSD: bt3c.c,v 1.20 2010/01/08 20:01:00 dyoung Exp $ */ /*- * Copyright (c) 2005 Iain D. Hibbert, @@ -69,7 +69,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bt3c.c,v 1.19 2009/05/12 13:18:04 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bt3c.c,v 1.20 2010/01/08 20:01:00 dyoung Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -135,8 +135,8 @@ struct bt3c_softc { static int bt3c_match(device_t, cfdata_t, void *); static void bt3c_attach(device_t, device_t, void *); static int bt3c_detach(device_t, int); -static bool bt3c_suspend(device_t PMF_FN_PROTO); -static bool bt3c_resume(device_t PMF_FN_PROTO); +static bool bt3c_suspend(device_t, pmf_qual_t); +static bool bt3c_resume(device_t, pmf_qual_t); CFATTACH_DECL_NEW(bt3c, sizeof(struct bt3c_softc), bt3c_match, bt3c_attach, bt3c_detach, NULL); @@ -1019,7 +1019,7 @@ bt3c_detach(device_t self, int flags) } static bool -bt3c_suspend(device_t self PMF_FN_ARGS) +bt3c_suspend(device_t self, pmf_qual_t qual) { struct bt3c_softc *sc = device_private(self); @@ -1032,7 +1032,7 @@ bt3c_suspend(device_t self PMF_FN_ARGS) } static bool -bt3c_resume(device_t self PMF_FN_ARGS) +bt3c_resume(device_t self, pmf_qual_t qual) { struct bt3c_softc *sc = device_private(self); diff --git a/sys/dev/pcmcia/btbc.c b/sys/dev/pcmcia/btbc.c index 9b712bcd2a0..c59dcdb32bb 100644 --- a/sys/dev/pcmcia/btbc.c +++ b/sys/dev/pcmcia/btbc.c @@ -1,4 +1,4 @@ -/* $NetBSD: btbc.c,v 1.13 2009/05/12 13:18:04 cegger Exp $ */ +/* $NetBSD: btbc.c,v 1.14 2010/01/08 20:01:00 dyoung Exp $ */ /* * Copyright (c) 2007 KIYOHARA Takashi * All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btbc.c,v 1.13 2009/05/12 13:18:04 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btbc.c,v 1.14 2010/01/08 20:01:00 dyoung Exp $"); #include <sys/param.h> #include <sys/callout.h> @@ -104,8 +104,8 @@ struct btbc_softc { static int btbc_match(device_t, cfdata_t, void *); static void btbc_attach(device_t, device_t, void *); static int btbc_detach(device_t, int); -static bool btbc_suspend(device_t PMF_FN_PROTO); -static bool btbc_resume(device_t PMF_FN_PROTO); +static bool btbc_suspend(device_t, pmf_qual_t); +static bool btbc_resume(device_t, pmf_qual_t); static void btbc_activity_led_timeout(void *); static void btbc_enable_activity_led(struct btbc_softc *); @@ -224,7 +224,7 @@ btbc_detach(device_t self, int flags) } static bool -btbc_suspend(device_t self PMF_FN_ARGS) +btbc_suspend(device_t self, pmf_qual_t qual) { struct btbc_softc *sc = device_private(self); @@ -238,7 +238,7 @@ btbc_suspend(device_t self PMF_FN_ARGS) static bool -btbc_resume(device_t self PMF_FN_ARGS) +btbc_resume(device_t self, pmf_qual_t qual) { struct btbc_softc *sc = device_private(self); diff --git a/sys/dev/sbus/dbri.c b/sys/dev/sbus/dbri.c index 8d6e9293ade..bdb0fcc1437 100644 --- a/sys/dev/sbus/dbri.c +++ b/sys/dev/sbus/dbri.c @@ -1,4 +1,4 @@ -/* $NetBSD: dbri.c,v 1.27 2010/01/02 04:12:07 tsutsui Exp $ */ +/* $NetBSD: dbri.c,v 1.28 2010/01/08 20:01:21 dyoung Exp $ */ /* * Copyright (C) 1997 Rudolf Koenig (rfkoenig@immd4.informatik.uni-erlangen.de) @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.27 2010/01/02 04:12:07 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.28 2010/01/08 20:01:21 dyoung Exp $"); #include "audio.h" #if NAUDIO > 0 @@ -162,8 +162,8 @@ static void dbri_free(void *, void *, struct malloc_type *); static paddr_t dbri_mappage(void *, void *, off_t, int); static void dbri_set_power(struct dbri_softc *, int); static void dbri_bring_up(struct dbri_softc *); -static bool dbri_suspend(device_t PMF_FN_PROTO); -static bool dbri_resume(device_t PMF_FN_PROTO); +static bool dbri_suspend(device_t, pmf_qual_t); +static bool dbri_resume(device_t, pmf_qual_t); /* stupid support routines */ static uint32_t reverse_bytes(uint32_t, int); @@ -2173,7 +2173,7 @@ dbri_close(void *cookie) } static bool -dbri_suspend(device_t self PMF_FN_ARGS) +dbri_suspend(device_t self, pmf_qual_t qual) { struct dbri_softc *sc = device_private(self); @@ -2182,7 +2182,7 @@ dbri_suspend(device_t self PMF_FN_ARGS) } static bool -dbri_resume(device_t self PMF_FN_ARGS) +dbri_resume(device_t self, pmf_qual_t qual) { struct dbri_softc *sc = device_private(self); diff --git a/sys/dev/sbus/p9100.c b/sys/dev/sbus/p9100.c index a065abdfdca..3aeef799f01 100644 --- a/sys/dev/sbus/p9100.c +++ b/sys/dev/sbus/p9100.c @@ -1,4 +1,4 @@ -/* $NetBSD: p9100.c,v 1.50 2009/09/19 11:58:06 tsutsui Exp $ */ +/* $NetBSD: p9100.c,v 1.51 2010/01/08 20:01:21 dyoung Exp $ */ /*- * Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.50 2009/09/19 11:58:06 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.51 2010/01/08 20:01:21 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -236,8 +236,8 @@ static int p9100_intr(void *); #endif /* power management stuff */ -static bool p9100_suspend(device_t PMF_FN_PROTO); -static bool p9100_resume(device_t PMF_FN_PROTO); +static bool p9100_suspend(device_t, pmf_qual_t); +static bool p9100_resume(device_t, pmf_qual_t); #if NTCTRL > 0 static void p9100_set_extvga(void *, int); @@ -925,7 +925,7 @@ p9100_get_video(struct p9100_softc *sc) } static bool -p9100_suspend(device_t dev PMF_FN_ARGS) +p9100_suspend(device_t dev, pmf_qual_t qual) { struct p9100_softc *sc = device_private(dev); @@ -946,7 +946,7 @@ p9100_suspend(device_t dev PMF_FN_ARGS) } static bool -p9100_resume(device_t dev PMF_FN_ARGS) +p9100_resume(device_t dev, pmf_qual_t qual) { struct p9100_softc *sc = device_private(dev); diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c index 0639a242abd..60d4bd85098 100644 --- a/sys/dev/scsipi/sd.c +++ b/sys/dev/scsipi/sd.c @@ -1,4 +1,4 @@ -/* $NetBSD: sd.c,v 1.290 2009/10/21 21:12:05 rmind Exp $ */ +/* $NetBSD: sd.c,v 1.291 2010/01/08 20:05:16 dyoung Exp $ */ /*- * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc. @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.290 2009/10/21 21:12:05 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.291 2010/01/08 20:05:16 dyoung Exp $"); #include "opt_scsi.h" #include "rnd.h" @@ -100,7 +100,7 @@ static int sdgetdisklabel(struct sd_softc *); static void sdstart(struct scsipi_periph *); static void sdrestart(void *); static void sddone(struct scsipi_xfer *, int); -static bool sd_suspend(device_t PMF_FN_PROTO); +static bool sd_suspend(device_t, pmf_qual_t); static bool sd_shutdown(device_t, int); static int sd_interpret_sense(struct scsipi_xfer *); static int sdlastclose(device_t); @@ -1338,7 +1338,7 @@ sd_shutdown(device_t self, int how) } static bool -sd_suspend(device_t dv PMF_FN_ARGS) +sd_suspend(device_t dv, pmf_qual_t qual) { return sd_shutdown(dv, boothowto); /* XXX no need to poll */ } diff --git a/sys/dev/sdmmc/sdhc.c b/sys/dev/sdmmc/sdhc.c index 1ab6ebe0d72..2c21005f782 100644 --- a/sys/dev/sdmmc/sdhc.c +++ b/sys/dev/sdmmc/sdhc.c @@ -1,4 +1,4 @@ -/* $NetBSD: sdhc.c,v 1.3 2009/10/02 04:33:58 uebayasi Exp $ */ +/* $NetBSD: sdhc.c,v 1.4 2010/01/08 19:53:10 dyoung Exp $ */ /* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */ /* @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.3 2009/10/02 04:33:58 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.4 2010/01/08 19:53:10 dyoung Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -310,7 +310,7 @@ err1: } bool -sdhc_suspend(device_t dev PMF_FN_ARGS) +sdhc_suspend(device_t dev, pmf_qual_t qual) { struct sdhc_softc *sc = device_private(dev); struct sdhc_host *hp; @@ -329,7 +329,7 @@ sdhc_suspend(device_t dev PMF_FN_ARGS) } bool -sdhc_resume(device_t dev PMF_FN_ARGS) +sdhc_resume(device_t dev, pmf_qual_t qual) { struct sdhc_softc *sc = device_private(dev); struct sdhc_host *hp; diff --git a/sys/dev/sdmmc/sdhcvar.h b/sys/dev/sdmmc/sdhcvar.h index 134c60d6859..26dca23e4eb 100644 --- a/sys/dev/sdmmc/sdhcvar.h +++ b/sys/dev/sdmmc/sdhcvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: sdhcvar.h,v 1.1 2009/04/21 03:00:30 nonaka Exp $ */ +/* $NetBSD: sdhcvar.h,v 1.2 2010/01/08 19:53:10 dyoung Exp $ */ /* $OpenBSD: sdhcvar.h,v 1.3 2007/09/06 08:01:01 jsg Exp $ */ /* @@ -44,8 +44,8 @@ struct sdhc_softc { int sdhc_host_found(struct sdhc_softc *, bus_space_tag_t, bus_space_handle_t, bus_size_t); int sdhc_intr(void *); -bool sdhc_suspend(device_t dev PMF_FN_ARGS); -bool sdhc_resume(device_t dev PMF_FN_ARGS); +bool sdhc_suspend(device_t dev, pmf_qual_t qual); +bool sdhc_resume(device_t dev, pmf_qual_t qual); bool sdhc_shutdown(device_t dev, int flags); #endif /* _SDHCVAR_H_ */ diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index 7c7e3689fe6..24985ce247d 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ehci.c,v 1.164 2009/11/14 17:06:12 uebayasi Exp $ */ +/* $NetBSD: ehci.c,v 1.165 2010/01/08 20:38:43 dyoung Exp $ */ /* * Copyright (c) 2004-2008 The NetBSD Foundation, Inc. @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.164 2009/11/14 17:06:12 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.165 2010/01/08 20:38:43 dyoung Exp $"); #include "ohci.h" #include "uhci.h" @@ -1123,7 +1123,7 @@ ehci_activate(device_t self, enum devact act) * bus glue needs to call out to it. */ bool -ehci_suspend(device_t dv PMF_FN_ARGS) +ehci_suspend(device_t dv, pmf_qual_t qual) { ehci_softc_t *sc = device_private(dv); int i, s; @@ -1174,7 +1174,7 @@ ehci_suspend(device_t dv PMF_FN_ARGS) } bool -ehci_resume(device_t dv PMF_FN_ARGS) +ehci_resume(device_t dv, pmf_qual_t qual) { ehci_softc_t *sc = device_private(dv); int i; diff --git a/sys/dev/usb/ehcivar.h b/sys/dev/usb/ehcivar.h index 494eb091e0b..fd00a33769b 100644 --- a/sys/dev/usb/ehcivar.h +++ b/sys/dev/usb/ehcivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ehcivar.h,v 1.34 2009/09/04 17:55:03 dyoung Exp $ */ +/* $NetBSD: ehcivar.h,v 1.35 2010/01/08 20:39:03 dyoung Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -187,6 +187,6 @@ int ehci_intr(void *); int ehci_detach(ehci_softc_t *, int); int ehci_activate(device_t, enum devact); void ehci_childdet(device_t, device_t); -bool ehci_suspend(device_t PMF_FN_PROTO); -bool ehci_resume(device_t PMF_FN_PROTO); +bool ehci_suspend(device_t, pmf_qual_t); +bool ehci_resume(device_t, pmf_qual_t); bool ehci_shutdown(device_t, int); diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 37f64796be1..7d4829f0c4d 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ohci.c,v 1.204 2010/01/08 16:40:30 martin Exp $ */ +/* $NetBSD: ohci.c,v 1.205 2010/01/08 20:39:04 dyoung Exp $ */ /* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */ /* @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.204 2010/01/08 16:40:30 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.205 2010/01/08 20:39:04 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -997,7 +997,7 @@ ohci_shutdown(device_t self, int flags) } bool -ohci_resume(device_t dv PMF_FN_ARGS) +ohci_resume(device_t dv, pmf_qual_t qual) { ohci_softc_t *sc = device_private(dv); uint32_t ctl; @@ -1032,7 +1032,7 @@ ohci_resume(device_t dv PMF_FN_ARGS) } bool -ohci_suspend(device_t dv PMF_FN_ARGS) +ohci_suspend(device_t dv, pmf_qual_t qual) { ohci_softc_t *sc = device_private(dv); uint32_t ctl; diff --git a/sys/dev/usb/ohcivar.h b/sys/dev/usb/ohcivar.h index 1a386048a97..ca3f154940d 100644 --- a/sys/dev/usb/ohcivar.h +++ b/sys/dev/usb/ohcivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ohcivar.h,v 1.45 2008/06/28 17:42:53 bouyer Exp $ */ +/* $NetBSD: ohcivar.h,v 1.46 2010/01/08 20:39:04 dyoung Exp $ */ /* $FreeBSD: src/sys/dev/usb/ohcivar.h,v 1.13 1999/11/17 22:33:41 n_hibma Exp $ */ /* @@ -153,5 +153,5 @@ bool ohci_shutdown(device_t, int); void ohci_childdet(device_t, device_t); int ohci_activate(device_t, enum devact); #endif -bool ohci_resume(device_t PMF_FN_PROTO); -bool ohci_suspend(device_t PMF_FN_PROTO); +bool ohci_resume(device_t, pmf_qual_t); +bool ohci_suspend(device_t, pmf_qual_t); diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 0f4edd855e6..00342b4f22b 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhci.c,v 1.230 2009/11/12 19:53:56 dyoung Exp $ */ +/* $NetBSD: uhci.c,v 1.231 2010/01/08 20:39:04 dyoung Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */ /* @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.230 2009/11/12 19:53:56 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.231 2010/01/08 20:39:04 dyoung Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -691,7 +691,7 @@ uhci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer) * are almost suspended anyway. */ bool -uhci_resume(device_t dv PMF_FN_ARGS) +uhci_resume(device_t dv, pmf_qual_t qual) { uhci_softc_t *sc = device_private(dv); int cmd; @@ -736,7 +736,7 @@ uhci_resume(device_t dv PMF_FN_ARGS) } bool -uhci_suspend(device_t dv PMF_FN_ARGS) +uhci_suspend(device_t dv, pmf_qual_t qual) { uhci_softc_t *sc = device_private(dv); int cmd; diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h index d0daf1eec7e..6a5761d5315 100644 --- a/sys/dev/usb/uhcivar.h +++ b/sys/dev/usb/uhcivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: uhcivar.h,v 1.45 2008/06/28 17:42:53 bouyer Exp $ */ +/* $NetBSD: uhcivar.h,v 1.46 2010/01/08 20:39:04 dyoung Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.14 1999/11/17 22:33:42 n_hibma Exp $ */ /* @@ -189,7 +189,7 @@ int uhci_intr(void *); int uhci_detach(uhci_softc_t *, int); void uhci_childdet(device_t, device_t); int uhci_activate(device_t, enum devact); -bool uhci_resume(device_t PMF_FN_PROTO); -bool uhci_suspend(device_t PMF_FN_PROTO); +bool uhci_resume(device_t, pmf_qual_t); +bool uhci_suspend(device_t, pmf_qual_t); #endif |
