From cf11bf708f9feff1ffa6aad9697e2c6953a88db5 Mon Sep 17 00:00:00 2001 From: David Young Date: Fri, 8 Jan 2010 20:40:41 +0000 Subject: [PATCH] Expand PMF_FN_* macros. --- sys/dev/acpi/acpi.c | 12 ++++++------ sys/dev/acpi/acpi_acad.c | 8 ++++---- sys/dev/acpi/acpi_bat.c | 8 ++++---- sys/dev/acpi/acpi_ec.c | 12 ++++++------ sys/dev/acpi/acpi_lid.c | 8 ++++---- sys/dev/acpi/asus_acpi.c | 12 ++++++------ sys/dev/acpi/dalb_acpi.c | 8 ++++---- sys/dev/acpi/hpqlb_acpi.c | 8 ++++---- sys/dev/acpi/sony_acpi.c | 12 ++++++------ sys/dev/acpi/thinkpad_acpi.c | 8 ++++---- sys/dev/acpi/wmi_acpi.c | 12 ++++++------ sys/dev/usb/ehci.c | 8 ++++---- sys/dev/usb/ehcivar.h | 6 +++--- sys/dev/usb/ohci.c | 8 ++++---- sys/dev/usb/ohcivar.h | 6 +++--- sys/dev/usb/uhci.c | 8 ++++---- sys/dev/usb/uhcivar.h | 6 +++--- 17 files changed, 75 insertions(+), 75 deletions(-) diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index c4f7bcacd4e..5260b70bcae 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $NetBSD: acpi.c,v 1.140 2010/01/05 13:39:49 jruoho Exp $ */ +/* $NetBSD: acpi.c,v 1.141 2010/01/08 00:09:44 dyoung Exp $ */ /*- * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.140 2010/01/05 13:39:49 jruoho Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.141 2010/01/08 00:09:44 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 7b45603aae4..c691c79ca5f 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.34 2009/05/12 09:29:46 cegger Exp $ */ +/* $NetBSD: acpi_acad.c,v 1.35 2009/08/25 10:34:08 jmcneill Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -44,7 +44,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.34 2009/05/12 09:29:46 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.35 2009/08/25 10:34:08 jmcneill Exp $"); #include #include @@ -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 f484d93b241..95185975d0a 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.73 2009/09/16 10:47:54 mlelstv Exp $ */ +/* $NetBSD: acpi_bat.c,v 1.74 2009/09/29 21:41:38 jmcneill Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -79,7 +79,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.73 2009/09/16 10:47:54 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.74 2009/09/29 21:41:38 jmcneill Exp $"); #include #include @@ -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 8231c1f198d..50228d53d5f 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.56 2009/07/06 00:54:00 alc Exp $ */ +/* $NetBSD: acpi_ec.c,v 1.57 2009/09/16 10:47:54 mlelstv Exp $ */ /*- * Copyright (c) 2007 Joerg Sonnenberger . @@ -59,7 +59,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.56 2009/07/06 00:54:00 alc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.57 2009/09/16 10:47:54 mlelstv Exp $"); #include #include @@ -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 e8ae9510dbd..e3fe8d6f944 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.29 2009/11/29 21:32:50 cegger Exp $ */ +/* $NetBSD: acpi_lid.c,v 1.30 2009/12/31 10:12:51 jruoho Exp $ */ /* * Copyright 2001, 2003 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.29 2009/11/29 21:32:50 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.30 2009/12/31 10:12:51 jruoho Exp $"); #include #include @@ -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 34d51ff30b3..fce6c6268cf 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.10 2009/08/04 23:23:39 jmcneill Exp $ */ +/* $NetBSD: asus_acpi.c,v 1.11 2009/09/16 10:47:55 mlelstv Exp $ */ /*- * Copyright (c) 2007, 2008, 2009 Jared D. McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.10 2009/08/04 23:23:39 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.11 2009/09/16 10:47:55 mlelstv Exp $"); #include #include @@ -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 4ca9281cff3..554f3666934 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.3 2009/09/16 10:47:55 mlelstv Exp $ */ +/* $NetBSD: dalb_acpi.c,v 1.4 2010/01/05 13:39:49 jruoho Exp $ */ /*- * Copyright (c) 2008 Christoph Egger @@ -27,7 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.3 2009/09/16 10:47:55 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.4 2010/01/05 13:39:49 jruoho 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 b4c115a2877..eed7f7db195 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.2 2008/05/02 01:53:33 simonb Exp $ */ +/* $NetBSD: hpqlb_acpi.c,v 1.3 2009/09/25 20:26:59 dyoung Exp $ */ /*- * Copyright (c) 2008 Christoph Egger @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: hpqlb_acpi.c,v 1.2 2008/05/02 01:53:33 simonb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpqlb_acpi.c,v 1.3 2009/09/25 20:26:59 dyoung Exp $"); #include #include @@ -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 204db0e763c..c22e2f27227 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.10 2009/08/19 00:19:37 christos Exp $ */ +/* $NetBSD: sony_acpi.c,v 1.11 2009/09/16 10:47:55 mlelstv Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.10 2009/08/19 00:19:37 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sony_acpi.c,v 1.11 2009/09/16 10:47:55 mlelstv Exp $"); #include #include @@ -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 455e5912b06..ccf3e99abbf 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.20 2009/09/25 20:26:26 dyoung Exp $ */ +/* $NetBSD: thinkpad_acpi.c,v 1.21 2009/11/29 21:32:50 cegger Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.20 2009/09/25 20:26:26 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.21 2009/11/29 21:32:50 cegger Exp $"); #include #include @@ -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 3e989d7ad62..523562981bb 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.6 2010/01/04 09:43:30 jruoho Exp $ */ +/* $NetBSD: wmi_acpi.c,v 1.7 2010/01/04 10:06:53 jruoho Exp $ */ /*- * Copyright (c) 2009, 2010 Jukka Ruohonen @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: wmi_acpi.c,v 1.6 2010/01/04 09:43:30 jruoho Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wmi_acpi.c,v 1.7 2010/01/04 10:06:53 jruoho Exp $"); #include #include @@ -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/usb/ehci.c b/sys/dev/usb/ehci.c index 2d87ec34955..93d32ccbbdf 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $NetBSD$ */ +/* $NetBSD: ehci.c,v 1.164 2009/11/14 17:06:12 uebayasi Exp $ */ /* * Copyright (c) 2004-2008 The NetBSD Foundation, Inc. @@ -52,7 +52,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD$"); +__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.164 2009/11/14 17:06:12 uebayasi 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 85bc2b03df3..a4ca3c2a9a4 100644 --- a/sys/dev/usb/ehcivar.h +++ b/sys/dev/usb/ehcivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ehcivar.h,v 1.33 2008/10/14 18:12:38 jmcneill Exp $ */ +/* $NetBSD: ehcivar.h,v 1.34 2009/09/04 17:55: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 bd3ad63f4ab..7db281d0d3f 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ohci.c,v 1.203 2009/11/12 19:49:03 dyoung Exp $ */ +/* $NetBSD: ohci.c,v 1.204 2010/01/08 16:40:30 martin 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 -__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.203 2009/11/12 19:49:03 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.204 2010/01/08 16:40:30 martin Exp $"); #include #include @@ -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 c22613fbf53..401ced52b02 100644 --- a/sys/dev/usb/ohcivar.h +++ b/sys/dev/usb/ohcivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ohcivar.h,v 1.44 2008/04/28 20:23:59 martin Exp $ */ +/* $NetBSD: ohcivar.h,v 1.45 2008/06/28 17:42:53 bouyer 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 c11d8a87e62..9690edb52c9 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhci.c,v 1.229 2009/11/01 06:36:44 uebayasi Exp $ */ +/* $NetBSD: uhci.c,v 1.230 2009/11/12 19:53:56 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 -__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.229 2009/11/01 06:36:44 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.230 2009/11/12 19:53:56 dyoung Exp $"); #include #include @@ -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 38051a02884..933efdaaa64 100644 --- a/sys/dev/usb/uhcivar.h +++ b/sys/dev/usb/uhcivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: uhcivar.h,v 1.44 2008/04/28 20:23:59 martin Exp $ */ +/* $NetBSD: uhcivar.h,v 1.45 2008/06/28 17:42:53 bouyer 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 -- 2.11.4.GIT