From 1272102922e80672e967201a83f2920505b32a3a Mon Sep 17 00:00:00 2001 From: David Young Date: Fri, 8 Jan 2010 19:53:10 +0000 Subject: [PATCH] Expand PMF_FN_* macros. --- sys/arch/i386/pci/elan520.c | 16 ++++++++-------- sys/arch/i386/pci/piixpcib.c | 12 ++++++------ sys/arch/mips/atheros/dev/if_ath_arbus.c | 6 +++--- sys/arch/sparc/dev/fd.c | 8 ++++---- sys/arch/sparc64/dev/fdc.c | 8 ++++---- sys/arch/x86/pci/ichlpcib.c | 12 ++++++------ sys/arch/x86/pci/pchb.c | 12 ++++++------ sys/arch/x86/x86/cpu.c | 12 ++++++------ sys/arch/x86/x86/x86_autoconf.c | 8 ++++---- sys/arch/xen/x86/cpu.c | 8 ++++---- sys/arch/zaurus/dev/zaudio.c | 12 ++++++------ sys/arch/zaurus/dev/zkbd.c | 8 ++++---- sys/arch/zaurus/dev/zlcd.c | 12 ++++++------ sys/arch/zaurus/dev/zssp.c | 8 ++++---- sys/arch/zaurus/dev/ztp.c | 12 ++++++------ sys/dev/ata/ata.c | 12 ++++++------ sys/dev/ata/wd.c | 8 ++++---- sys/dev/cardbus/cardbus.c | 8 ++++---- sys/dev/cardbus/ehci_cardbus.c | 12 ++++++------ sys/dev/cardbus/if_ath_cardbus.c | 8 ++++---- sys/dev/cardbus/if_atw_cardbus.c | 14 +++++++------- sys/dev/cardbus/if_rtw_cardbus.c | 16 ++++++++-------- sys/dev/cardbus/siisata_cardbus.c | 11 +++-------- sys/dev/gpio/gpio.c | 8 ++++---- sys/dev/sdmmc/sdhc.c | 8 ++++---- sys/dev/sdmmc/sdhcvar.h | 6 +++--- sys/dev/wscons/wsdisplay.c | 8 ++++---- sys/dev/wscons/wskbd.c | 8 ++++---- sys/dev/wsfb/genfbvar.h | 8 ++++---- sys/external/bsd/drm/dist/bsd-core/i915_drv.c | 4 ++-- sys/external/bsd/drm/dist/bsd-core/radeon_drv.c | 4 ++-- 31 files changed, 146 insertions(+), 151 deletions(-) diff --git a/sys/arch/i386/pci/elan520.c b/sys/arch/i386/pci/elan520.c index 8f558bd4ab8..cae29dd6805 100644 --- a/sys/arch/i386/pci/elan520.c +++ b/sys/arch/i386/pci/elan520.c @@ -1,4 +1,4 @@ -/* $NetBSD: elan520.c,v 1.44 2009/12/01 01:08:45 dyoung Exp $ */ +/* $NetBSD: elan520.c,v 1.45 2010/01/08 00:09:44 dyoung Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.44 2009/12/01 01:08:45 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.45 2010/01/08 00:09:44 dyoung Exp $"); #include #include @@ -847,7 +847,7 @@ elanpex_intr_ack(bus_space_tag_t memt, bus_space_handle_t memh) } static bool -elansc_suspend(device_t dev PMF_FN_ARGS) +elansc_suspend(device_t dev, pmf_qual_t qual) { bool rc; struct elansc_softc *sc = device_private(dev); @@ -861,7 +861,7 @@ elansc_suspend(device_t dev PMF_FN_ARGS) } static bool -elansc_resume(device_t dev PMF_FN_ARGS) +elansc_resume(device_t dev, pmf_qual_t qual) { struct elansc_softc *sc = device_private(dev); @@ -947,7 +947,7 @@ elansc_intr_establish(device_t dev, int (*handler)(void *), void *arg) } static bool -elanpex_resume(device_t self PMF_FN_ARGS) +elanpex_resume(device_t self, pmf_qual_t qual) { struct elansc_softc *sc = device_private(device_parent(self)); @@ -956,7 +956,7 @@ elanpex_resume(device_t self PMF_FN_ARGS) } static bool -elanpex_suspend(device_t self PMF_FN_ARGS) +elanpex_suspend(device_t self, pmf_qual_t qual) { struct elansc_softc *sc = device_private(device_parent(self)); @@ -966,7 +966,7 @@ elanpex_suspend(device_t self PMF_FN_ARGS) } static bool -elanpar_resume(device_t self PMF_FN_ARGS) +elanpar_resume(device_t self, pmf_qual_t qual) { struct elansc_softc *sc = device_private(device_parent(self)); @@ -975,7 +975,7 @@ elanpar_resume(device_t self PMF_FN_ARGS) } static bool -elanpar_suspend(device_t self PMF_FN_ARGS) +elanpar_suspend(device_t self, pmf_qual_t qual) { struct elansc_softc *sc = device_private(device_parent(self)); diff --git a/sys/arch/i386/pci/piixpcib.c b/sys/arch/i386/pci/piixpcib.c index f056c26aa2a..b35acfa386d 100644 --- a/sys/arch/i386/pci/piixpcib.c +++ b/sys/arch/i386/pci/piixpcib.c @@ -1,4 +1,4 @@ -/* $NetBSD: piixpcib.c,v 1.15 2008/05/05 11:49:40 xtraeme Exp $ */ +/* $NetBSD: piixpcib.c,v 1.16 2008/07/20 16:52:33 martin Exp $ */ /*- * Copyright (c) 2004, 2006 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: piixpcib.c,v 1.15 2008/05/05 11:49:40 xtraeme Exp $"); +__KERNEL_RCSID(0, "$NetBSD: piixpcib.c,v 1.16 2008/07/20 16:52:33 martin Exp $"); #include #include @@ -79,8 +79,8 @@ struct piixpcib_softc { static int piixpcibmatch(device_t, cfdata_t, void *); static void piixpcibattach(device_t, device_t, void *); -static bool piixpcib_suspend(device_t PMF_FN_PROTO); -static bool piixpcib_resume(device_t PMF_FN_PROTO); +static bool piixpcib_suspend(device_t, pmf_qual_t); +static bool piixpcib_resume(device_t, pmf_qual_t); static void speedstep_configure(struct piixpcib_softc *, struct pci_attach_args *); @@ -144,7 +144,7 @@ piixpcibattach(device_t parent, device_t self, void *aux) } static bool -piixpcib_suspend(device_t dv PMF_FN_ARGS) +piixpcib_suspend(device_t dv, pmf_qual_t qual) { struct piixpcib_softc *sc = device_private(dv); @@ -160,7 +160,7 @@ piixpcib_suspend(device_t dv PMF_FN_ARGS) } static bool -piixpcib_resume(device_t dv PMF_FN_ARGS) +piixpcib_resume(device_t dv, pmf_qual_t qual) { struct piixpcib_softc *sc = device_private(dv); diff --git a/sys/arch/mips/atheros/dev/if_ath_arbus.c b/sys/arch/mips/atheros/dev/if_ath_arbus.c index 3092742b740..b78eba60c80 100644 --- a/sys/arch/mips/atheros/dev/if_ath_arbus.c +++ b/sys/arch/mips/atheros/dev/if_ath_arbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ath_arbus.c,v 1.15 2008/07/09 19:47:23 joerg Exp $ */ +/* $NetBSD: if_ath_arbus.c,v 1.16 2009/07/06 00:43:23 alc Exp $ */ /*- * Copyright (c) 2006 Jared D. McNeill @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_ath_arbus.c,v 1.15 2008/07/09 19:47:23 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ath_arbus.c,v 1.16 2009/07/06 00:43:23 alc Exp $"); #include #include @@ -96,7 +96,7 @@ ath_arbus_match(device_t parent, cfdata_t cf, void *opaque) } static bool -ath_arbus_resume(device_t dv PMF_FN_ARGS) +ath_arbus_resume(device_t dv, pmf_qual_t qual) { struct ath_arbus_softc *asc = device_private(dv); ath_resume(&asc->sc_ath); diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c index f1692c63c3a..0c2c2e869c5 100644 --- a/sys/arch/sparc/dev/fd.c +++ b/sys/arch/sparc/dev/fd.c @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.146 2009/05/25 19:22:53 jnemeth Exp $ */ +/* $NetBSD: fd.c,v 1.147 2009/12/19 10:34:18 tsutsui Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -101,7 +101,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.146 2009/05/25 19:22:53 jnemeth Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.147 2009/12/19 10:34:18 tsutsui Exp $"); #include "opt_ddb.h" #include "opt_md.h" @@ -292,7 +292,7 @@ struct fd_softc { int fdmatch(struct device *, struct cfdata *, void *); void fdattach(struct device *, struct device *, void *); bool fdshutdown(device_t, int); -bool fdsuspend(device_t PMF_FN_PROTO); +bool fdsuspend(device_t, pmf_qual_t); CFATTACH_DECL(fd, sizeof(struct fd_softc), fdmatch, fdattach, NULL, NULL); @@ -809,7 +809,7 @@ bool fdshutdown(device_t self, int how) return true; } -bool fdsuspend(device_t self PMF_FN_ARGS) +bool fdsuspend(device_t self, pmf_qual_t qual) { return fdshutdown(self, boothowto); diff --git a/sys/arch/sparc64/dev/fdc.c b/sys/arch/sparc64/dev/fdc.c index a225370d6b6..b46df8e53b8 100644 --- a/sys/arch/sparc64/dev/fdc.c +++ b/sys/arch/sparc64/dev/fdc.c @@ -1,4 +1,4 @@ -/* $NetBSD: fdc.c,v 1.30 2009/03/18 16:00:15 cegger Exp $ */ +/* $NetBSD: fdc.c,v 1.31 2009/05/15 20:52:22 jnemeth Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -101,7 +101,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.30 2009/03/18 16:00:15 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.31 2009/05/15 20:52:22 jnemeth Exp $"); #include "opt_ddb.h" #include "opt_md.h" @@ -324,7 +324,7 @@ struct fd_softc { int fdmatch(struct device *, struct cfdata *, void *); void fdattach(struct device *, struct device *, void *); bool fdshutdown(device_t, int); -bool fdsuspend(device_t PMF_FN_PROTO); +bool fdsuspend(device_t, pmf_qual_t); CFATTACH_DECL(fd, sizeof(struct fd_softc), fdmatch, fdattach, NULL, NULL); @@ -979,7 +979,7 @@ bool fdshutdown(device_t self, int how) return true; } -bool fdsuspend(device_t self PMF_FN_ARGS) +bool fdsuspend(device_t self, pmf_qual_t qual) { return fdshutdown(self, boothowto); diff --git a/sys/arch/x86/pci/ichlpcib.c b/sys/arch/x86/pci/ichlpcib.c index 0efad14dda5..be5140ff3d0 100644 --- a/sys/arch/x86/pci/ichlpcib.c +++ b/sys/arch/x86/pci/ichlpcib.c @@ -1,4 +1,4 @@ -/* $NetBSD: ichlpcib.c,v 1.21 2009/09/27 18:27:01 jakllsch Exp $ */ +/* $NetBSD: ichlpcib.c,v 1.22 2010/01/08 00:09:45 dyoung Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.21 2009/09/27 18:27:01 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.22 2010/01/08 00:09:45 dyoung Exp $"); #include #include @@ -123,8 +123,8 @@ static void lpcibattach(device_t, device_t, void *); static int lpcibdetach(device_t, int); static void lpcibchilddet(device_t, device_t); static int lpcibrescan(device_t, const char *, const int *); -static bool lpcib_suspend(device_t PMF_FN_PROTO); -static bool lpcib_resume(device_t PMF_FN_PROTO); +static bool lpcib_suspend(device_t, pmf_qual_t); +static bool lpcib_resume(device_t, pmf_qual_t); static bool lpcib_shutdown(device_t, int); static void pmtimer_configure(device_t); @@ -414,7 +414,7 @@ lpcib_shutdown(device_t dv, int howto) } static bool -lpcib_suspend(device_t dv PMF_FN_ARGS) +lpcib_suspend(device_t dv, pmf_qual_t qual) { struct lpcib_softc *sc = device_private(dv); pci_chipset_tag_t pc = sc->sc_pcib.sc_pc; @@ -443,7 +443,7 @@ lpcib_suspend(device_t dv PMF_FN_ARGS) } static bool -lpcib_resume(device_t dv PMF_FN_ARGS) +lpcib_resume(device_t dv, pmf_qual_t qual) { struct lpcib_softc *sc = device_private(dv); pci_chipset_tag_t pc = sc->sc_pcib.sc_pc; diff --git a/sys/arch/x86/pci/pchb.c b/sys/arch/x86/pci/pchb.c index 93d391422f8..835331b7d4f 100644 --- a/sys/arch/x86/pci/pchb.c +++ b/sys/arch/x86/pci/pchb.c @@ -1,4 +1,4 @@ -/* $NetBSD: pchb.c,v 1.18 2009/04/07 17:52:36 dyoung Exp $ */ +/* $NetBSD: pchb.c,v 1.19 2009/08/23 15:37:51 jmcneill Exp $ */ /*- * Copyright (c) 1996, 1998, 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.18 2009/04/07 17:52:36 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.19 2009/08/23 15:37:51 jmcneill Exp $"); #include #include @@ -75,8 +75,8 @@ int pchbmatch(device_t, cfdata_t, void *); void pchbattach(device_t, device_t, void *); int pchbdetach(device_t, int); -static bool pchb_resume(device_t PMF_FN_ARGS); -static bool pchb_suspend(device_t PMF_FN_ARGS); +static bool pchb_resume(device_t, pmf_qual_t); +static bool pchb_suspend(device_t, pmf_qual_t); CFATTACH_DECL3_NEW(pchb, sizeof(struct pchb_softc), pchbmatch, pchbattach, pchbdetach, NULL, NULL, NULL, DVF_DETACH_SHUTDOWN); @@ -461,7 +461,7 @@ pchbdetach(device_t self, int flags) } static bool -pchb_suspend(device_t dv PMF_FN_ARGS) +pchb_suspend(device_t dv, pmf_qual_t qual) { struct pchb_softc *sc = device_private(dv); pci_chipset_tag_t pc; @@ -478,7 +478,7 @@ pchb_suspend(device_t dv PMF_FN_ARGS) } static bool -pchb_resume(device_t dv PMF_FN_ARGS) +pchb_resume(device_t dv, pmf_qual_t qual) { struct pchb_softc *sc = device_private(dv); pci_chipset_tag_t pc; diff --git a/sys/arch/x86/x86/cpu.c b/sys/arch/x86/x86/cpu.c index ba2824667c1..5a7651ae2f8 100644 --- a/sys/arch/x86/x86/cpu.c +++ b/sys/arch/x86/x86/cpu.c @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.64 2009/11/07 07:27:49 cegger Exp $ */ +/* $NetBSD: cpu.c,v 1.65 2009/11/21 03:11:01 rmind Exp $ */ /*- * Copyright (c) 2000, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.64 2009/11/07 07:27:49 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.65 2009/11/21 03:11:01 rmind Exp $"); #include "opt_ddb.h" #include "opt_mpbios.h" /* for MPDEBUG */ @@ -120,8 +120,8 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.64 2009/11/07 07:27:49 cegger Exp $"); int cpu_match(device_t, cfdata_t, void *); void cpu_attach(device_t, device_t, void *); -static bool cpu_suspend(device_t PMF_FN_PROTO); -static bool cpu_resume(device_t PMF_FN_PROTO); +static bool cpu_suspend(device_t, pmf_qual_t); +static bool cpu_resume(device_t, pmf_qual_t); struct cpu_softc { device_t sc_dev; /* device tree glue */ @@ -997,7 +997,7 @@ cpu_offline_md(void) /* XXX joerg restructure and restart CPUs individually */ static bool -cpu_suspend(device_t dv PMF_FN_ARGS) +cpu_suspend(device_t dv, pmf_qual_t qual) { struct cpu_softc *sc = device_private(dv); struct cpu_info *ci = sc->sc_info; @@ -1025,7 +1025,7 @@ cpu_suspend(device_t dv PMF_FN_ARGS) } static bool -cpu_resume(device_t dv PMF_FN_ARGS) +cpu_resume(device_t dv, pmf_qual_t qual) { struct cpu_softc *sc = device_private(dv); struct cpu_info *ci = sc->sc_info; diff --git a/sys/arch/x86/x86/x86_autoconf.c b/sys/arch/x86/x86/x86_autoconf.c index 02fe62bebaa..bb203ba811f 100644 --- a/sys/arch/x86/x86/x86_autoconf.c +++ b/sys/arch/x86/x86/x86_autoconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: x86_autoconf.c,v 1.46 2009/11/06 23:10:22 dyoung Exp $ */ +/* $NetBSD: x86_autoconf.c,v 1.47 2009/11/25 19:46:19 tron Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.46 2009/11/06 23:10:22 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.47 2009/11/25 19:46:19 tron Exp $"); #include #include @@ -94,13 +94,13 @@ x86_genfb_set_mapreg(void *opaque, int index, int r, int g, int b) } static bool -x86_genfb_suspend(device_t dev PMF_FN_ARGS) +x86_genfb_suspend(device_t dev, pmf_qual_t qual) { return true; } static bool -x86_genfb_resume(device_t dev PMF_FN_ARGS) +x86_genfb_resume(device_t dev, pmf_qual_t qual) { #if NGENFB > 0 struct pci_genfb_softc *psc = device_private(dev); diff --git a/sys/arch/xen/x86/cpu.c b/sys/arch/xen/x86/cpu.c index 4ab68f0f78c..11711b2fd1d 100644 --- a/sys/arch/xen/x86/cpu.c +++ b/sys/arch/xen/x86/cpu.c @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.38 2009/11/24 13:04:04 cegger Exp $ */ +/* $NetBSD: cpu.c,v 1.39 2009/11/27 03:23:15 rmind Exp $ */ /* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp */ /*- @@ -66,7 +66,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.38 2009/11/24 13:04:04 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.39 2009/11/27 03:23:15 rmind Exp $"); #include "opt_ddb.h" #include "opt_multiprocessor.h" @@ -1024,7 +1024,7 @@ cpu_offline_md(void) #if 0 /* XXX joerg restructure and restart CPUs individually */ static bool -cpu_suspend(device_t dv PMF_FN_ARGS) +cpu_suspend(device_t dv, pmf_qual_t qual) { struct cpu_softc *sc = device_private(dv); struct cpu_info *ci = sc->sc_info; @@ -1052,7 +1052,7 @@ cpu_suspend(device_t dv PMF_FN_ARGS) } static bool -cpu_resume(device_t dv PMF_FN_ARGS) +cpu_resume(device_t dv, pmf_qual_t qual) { struct cpu_softc *sc = device_private(dv); struct cpu_info *ci = sc->sc_info; diff --git a/sys/arch/zaurus/dev/zaudio.c b/sys/arch/zaurus/dev/zaudio.c index 9ab55ed1f55..b1ad5e0b09a 100644 --- a/sys/arch/zaurus/dev/zaudio.c +++ b/sys/arch/zaurus/dev/zaudio.c @@ -1,4 +1,4 @@ -/* $NetBSD: zaudio.c,v 1.9 2009/03/13 13:55:18 nonaka Exp $ */ +/* $NetBSD: zaudio.c,v 1.10 2009/04/18 05:20:21 nonaka Exp $ */ /* $OpenBSD: zaurus_audio.c,v 1.8 2005/08/18 13:23:02 robert Exp $ */ /* @@ -49,7 +49,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1.9 2009/03/13 13:55:18 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1.10 2009/04/18 05:20:21 nonaka Exp $"); #include #include @@ -84,8 +84,8 @@ __KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1.9 2009/03/13 13:55:18 nonaka Exp $"); static int zaudio_match(device_t, cfdata_t, void *); static void zaudio_attach(device_t, device_t, void *); -static bool zaudio_suspend(device_t dv PMF_FN_ARGS); -static bool zaudio_resume(device_t dv PMF_FN_ARGS); +static bool zaudio_suspend(device_t dv, pmf_qual_t); +static bool zaudio_resume(device_t dv, pmf_qual_t); #define ZAUDIO_OP_SPKR 0 #define ZAUDIO_OP_HP 1 @@ -369,7 +369,7 @@ fail_i2s: } static bool -zaudio_suspend(device_t dv PMF_FN_ARGS) +zaudio_suspend(device_t dv, pmf_qual_t qual) { struct zaudio_softc *sc = device_private(dv); @@ -380,7 +380,7 @@ zaudio_suspend(device_t dv PMF_FN_ARGS) } static bool -zaudio_resume(device_t dv PMF_FN_ARGS) +zaudio_resume(device_t dv, pmf_qual_t qual) { struct zaudio_softc *sc = device_private(dv); diff --git a/sys/arch/zaurus/dev/zkbd.c b/sys/arch/zaurus/dev/zkbd.c index e1c540cf17f..b9d9260b0fb 100644 --- a/sys/arch/zaurus/dev/zkbd.c +++ b/sys/arch/zaurus/dev/zkbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: zkbd.c,v 1.8 2009/01/29 12:28:15 nonaka Exp $ */ +/* $NetBSD: zkbd.c,v 1.9 2009/01/29 16:00:33 nonaka Exp $ */ /* $OpenBSD: zaurus_kbd.c,v 1.28 2005/12/21 20:36:03 deraadt Exp $ */ /* @@ -18,7 +18,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.8 2009/01/29 12:28:15 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.9 2009/01/29 16:00:33 nonaka Exp $"); #include "opt_wsdisplay_compat.h" #include "lcd.h" @@ -131,7 +131,7 @@ static void zkbd_poll(void *v); static int zkbd_on(void *v); static int zkbd_sync(void *v); static int zkbd_hinge(void *v); -static bool zkbd_resume(device_t dv PMF_FN_ARGS); +static bool zkbd_resume(device_t dv, pmf_qual_t); int zkbd_modstate; @@ -594,7 +594,7 @@ zkbd_cnpollc(void *v, int on) } static bool -zkbd_resume(device_t dv PMF_FN_ARGS) +zkbd_resume(device_t dv, pmf_qual_t qual) { struct zkbd_softc *sc = device_private(dv); diff --git a/sys/arch/zaurus/dev/zlcd.c b/sys/arch/zaurus/dev/zlcd.c index c3f6b7f4ff3..c3666c7be61 100644 --- a/sys/arch/zaurus/dev/zlcd.c +++ b/sys/arch/zaurus/dev/zlcd.c @@ -1,4 +1,4 @@ -/* $NetBSD: zlcd.c,v 1.8 2009/01/29 12:28:15 nonaka Exp $ */ +/* $NetBSD: zlcd.c,v 1.9 2009/01/29 16:00:33 nonaka Exp $ */ /* $OpenBSD: zaurus_lcd.c,v 1.20 2006/06/02 20:50:14 miod Exp $ */ /* NetBSD: lubbock_lcd.c,v 1.1 2003/08/09 19:38:53 bsh Exp */ @@ -43,7 +43,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: zlcd.c,v 1.8 2009/01/29 12:28:15 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zlcd.c,v 1.9 2009/01/29 16:00:33 nonaka Exp $"); #include #include @@ -154,8 +154,8 @@ static void lcd_attach(device_t, device_t, void *); CFATTACH_DECL_NEW(zlcd, sizeof(struct pxa2x0_lcd_softc), lcd_match, lcd_attach, NULL, NULL); -static bool lcd_suspend(device_t dv PMF_FN_ARGS); -static bool lcd_resume(device_t dv PMF_FN_ARGS); +static bool lcd_suspend(device_t dv, pmf_qual_t); +static bool lcd_resume(device_t dv, pmf_qual_t); void lcd_cnattach(void); int lcd_max_brightness(void); @@ -208,7 +208,7 @@ lcd_cnattach(void) * power management */ static bool -lcd_suspend(device_t dv PMF_FN_ARGS) +lcd_suspend(device_t dv, pmf_qual_t qual) { struct pxa2x0_lcd_softc *sc = device_private(dv); @@ -219,7 +219,7 @@ lcd_suspend(device_t dv PMF_FN_ARGS) } static bool -lcd_resume(device_t dv PMF_FN_ARGS) +lcd_resume(device_t dv, pmf_qual_t qual) { struct pxa2x0_lcd_softc *sc = device_private(dv); diff --git a/sys/arch/zaurus/dev/zssp.c b/sys/arch/zaurus/dev/zssp.c index 356efa37085..7d466fe330f 100644 --- a/sys/arch/zaurus/dev/zssp.c +++ b/sys/arch/zaurus/dev/zssp.c @@ -1,4 +1,4 @@ -/* $NetBSD: zssp.c,v 1.6 2009/01/29 16:00:33 nonaka Exp $ */ +/* $NetBSD: zssp.c,v 1.7 2009/03/11 09:10:39 nonaka Exp $ */ /* $OpenBSD: zaurus_ssp.c,v 1.6 2005/04/08 21:58:49 uwe Exp $ */ /* @@ -18,7 +18,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: zssp.c,v 1.6 2009/01/29 16:00:33 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zssp.c,v 1.7 2009/03/11 09:10:39 nonaka Exp $"); #include #include @@ -54,7 +54,7 @@ CFATTACH_DECL_NEW(zssp, sizeof(struct zssp_softc), zssp_match, zssp_attach, NULL, NULL); static void zssp_init(void); -static bool zssp_resume(device_t dv PMF_FN_ARGS); +static bool zssp_resume(device_t dv, pmf_qual_t); static struct zssp_softc *zssp_sc; @@ -116,7 +116,7 @@ zssp_init(void) } static bool -zssp_resume(device_t dv PMF_FN_ARGS) +zssp_resume(device_t dv, pmf_qual_t qual) { int s; diff --git a/sys/arch/zaurus/dev/ztp.c b/sys/arch/zaurus/dev/ztp.c index 6c55b341820..f21d6b9b277 100644 --- a/sys/arch/zaurus/dev/ztp.c +++ b/sys/arch/zaurus/dev/ztp.c @@ -1,4 +1,4 @@ -/* $NetBSD: ztp.c,v 1.7 2009/03/03 18:42:19 nonaka Exp $ */ +/* $NetBSD: ztp.c,v 1.8 2009/12/12 07:49:31 nonaka Exp $ */ /* $OpenBSD: zts.c,v 1.9 2005/04/24 18:55:49 uwe Exp $ */ /* @@ -18,7 +18,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ztp.c,v 1.7 2009/03/03 18:42:19 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ztp.c,v 1.8 2009/12/12 07:49:31 nonaka Exp $"); #include "lcd.h" @@ -116,8 +116,8 @@ CFATTACH_DECL_NEW(ztp, sizeof(struct ztp_softc), static int ztp_enable(void *); static void ztp_disable(void *); -static bool ztp_suspend(device_t dv PMF_FN_ARGS); -static bool ztp_resume(device_t dv PMF_FN_ARGS); +static bool ztp_suspend(device_t dv, pmf_qual_t); +static bool ztp_resume(device_t dv, pmf_qual_t); static void ztp_poll(void *); static int ztp_irq(void *); static int ztp_ioctl(void *, u_long, void *, int, struct lwp *); @@ -237,7 +237,7 @@ ztp_disable(void *v) } static bool -ztp_suspend(device_t dv PMF_FN_ARGS) +ztp_suspend(device_t dv, pmf_qual_t qual) { struct ztp_softc *sc = device_private(dv); @@ -258,7 +258,7 @@ ztp_suspend(device_t dv PMF_FN_ARGS) } static bool -ztp_resume(device_t dv PMF_FN_ARGS) +ztp_resume(device_t dv, pmf_qual_t qual) { struct ztp_softc *sc = device_private(dv); diff --git a/sys/dev/ata/ata.c b/sys/dev/ata/ata.c index acb713a231f..d91ab6286d0 100644 --- a/sys/dev/ata/ata.c +++ b/sys/dev/ata/ata.c @@ -1,4 +1,4 @@ -/* $NetBSD: ata.c,v 1.108 2009/10/19 18:41:12 bouyer Exp $ */ +/* $NetBSD: ata.c,v 1.109 2009/11/12 19:20:08 dyoung Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -25,7 +25,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.108 2009/10/19 18:41:12 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.109 2009/11/12 19:20:08 dyoung Exp $"); #include "opt_ata.h" @@ -106,8 +106,8 @@ const struct cdevsw atabus_cdevsw = { extern struct cfdriver atabus_cd; static void atabus_childdetached(device_t, device_t); -static bool atabus_resume(device_t PMF_FN_PROTO); -static bool atabus_suspend(device_t PMF_FN_PROTO); +static bool atabus_resume(device_t, pmf_qual_t); +static bool atabus_suspend(device_t, pmf_qual_t); static void atabusconfig_thread(void *); /* @@ -1525,7 +1525,7 @@ atabusioctl(dev_t dev, u_long cmd, void *addr, int flag, }; static bool -atabus_suspend(device_t dv PMF_FN_ARGS) +atabus_suspend(device_t dv, pmf_qual_t qual) { struct atabus_softc *sc = device_private(dv); struct ata_channel *chp = sc->sc_chan; @@ -1536,7 +1536,7 @@ atabus_suspend(device_t dv PMF_FN_ARGS) } static bool -atabus_resume(device_t dv PMF_FN_ARGS) +atabus_resume(device_t dv, pmf_qual_t qual) { struct atabus_softc *sc = device_private(dv); struct ata_channel *chp = sc->sc_chan; diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c index 6fb1e78de32..e3ad27fb3a9 100644 --- a/sys/dev/ata/wd.c +++ b/sys/dev/ata/wd.c @@ -1,4 +1,4 @@ -/* $NetBSD: wd.c,v 1.379 2009/10/19 18:41:12 bouyer Exp $ */ +/* $NetBSD: wd.c,v 1.380 2009/12/17 21:03:10 bouyer Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -54,7 +54,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.379 2009/10/19 18:41:12 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.380 2009/12/17 21:03:10 bouyer Exp $"); #include "opt_ata.h" @@ -126,7 +126,7 @@ int wdprint(void *, char *); void wdperror(const struct wd_softc *); static int wdlastclose(device_t); -static bool wd_suspend(device_t PMF_FN_PROTO); +static bool wd_suspend(device_t, pmf_qual_t); static int wd_standby(struct wd_softc *, int); CFATTACH_DECL3_NEW(wd, sizeof(struct wd_softc), @@ -394,7 +394,7 @@ wdattach(device_t parent, device_t self, void *aux) } static bool -wd_suspend(device_t dv PMF_FN_ARGS) +wd_suspend(device_t dv, pmf_qual_t qual) { struct wd_softc *sc = device_private(dv); diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index 1e053da45f9..df267f5b13e 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: cardbus.c,v 1.97 2009/05/12 12:11:17 cegger Exp $ */ +/* $NetBSD: cardbus.c,v 1.98 2009/12/15 22:17:12 snj Exp $ */ /* * Copyright (c) 1997, 1998, 1999 and 2000 @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.97 2009/05/12 12:11:17 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.98 2009/12/15 22:17:12 snj Exp $"); #include "opt_cardbus.h" @@ -1166,7 +1166,7 @@ struct cardbus_child_power { }; static bool -cardbus_child_suspend(device_t dv PMF_FN_ARGS) +cardbus_child_suspend(device_t dv, pmf_qual_t qual) { struct cardbus_child_power *priv = device_pmf_bus_private(dv); @@ -1186,7 +1186,7 @@ cardbus_child_suspend(device_t dv PMF_FN_ARGS) } static bool -cardbus_child_resume(device_t dv PMF_FN_ARGS) +cardbus_child_resume(device_t dv, pmf_qual_t qual) { struct cardbus_child_power *priv = device_pmf_bus_private(dv); diff --git a/sys/dev/cardbus/ehci_cardbus.c b/sys/dev/cardbus/ehci_cardbus.c index 333590e281c..1589704204b 100644 --- a/sys/dev/cardbus/ehci_cardbus.c +++ b/sys/dev/cardbus/ehci_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: ehci_cardbus.c,v 1.22 2008/06/24 19:44:52 drochner Exp $ */ +/* $NetBSD: ehci_cardbus.c,v 1.23 2009/05/12 12:11:17 cegger Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.22 2008/06/24 19:44:52 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.23 2009/05/12 12:11:17 cegger Exp $"); #include #include @@ -102,9 +102,9 @@ ehci_cardbus_match(device_t parent, cfdata_t match, void *aux) } static bool -ehci_cardbus_suspend(device_t dv PMF_FN_ARGS) +ehci_cardbus_suspend(device_t dv, pmf_qual_t qual) { - ehci_suspend(dv PMF_FN_CALL); + ehci_suspend(dv, qual); #if 0 struct ehci_cardbus_softc *sc = device_private(dv); ehci_release_ownership(&sc->sc, sc->sc_pc, sc->sc_tag); @@ -114,13 +114,13 @@ ehci_cardbus_suspend(device_t dv PMF_FN_ARGS) } static bool -ehci_cardbus_resume(device_t dv PMF_FN_ARGS) +ehci_cardbus_resume(device_t dv, pmf_qual_t qual) { #if 0 struct ehci_cardbus_softc *sc = device_private(dv); ehci_get_ownership(&sc->sc, sc->sc_pc, sc->sc_tag); #endif - return ehci_resume(dv PMF_FN_CALL); + return ehci_resume(dv, qual); } void diff --git a/sys/dev/cardbus/if_ath_cardbus.c b/sys/dev/cardbus/if_ath_cardbus.c index b22caa358c8..9bb78ba39be 100644 --- a/sys/dev/cardbus/if_ath_cardbus.c +++ b/sys/dev/cardbus/if_ath_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ath_cardbus.c,v 1.35 2009/09/16 16:34:50 dyoung Exp $ */ +/* $NetBSD: if_ath_cardbus.c,v 1.36 2009/10/21 14:15:52 rmind Exp $ */ /* * Copyright (c) 2003 * Ichiro FUKUHARA . @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.35 2009/09/16 16:34:50 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.36 2009/10/21 14:15:52 rmind Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -114,7 +114,7 @@ CFATTACH_DECL_NEW(ath_cardbus, sizeof(struct ath_cardbus_softc), void ath_cardbus_setup(struct ath_cardbus_softc *); static bool -ath_cardbus_suspend(device_t self PMF_FN_ARGS) +ath_cardbus_suspend(device_t self, pmf_qual_t qual) { struct ath_cardbus_softc *csc = device_private(self); @@ -128,7 +128,7 @@ ath_cardbus_suspend(device_t self PMF_FN_ARGS) } static bool -ath_cardbus_resume(device_t self PMF_FN_ARGS) +ath_cardbus_resume(device_t self, pmf_qual_t qual) { struct ath_cardbus_softc *csc = device_private(self); diff --git a/sys/dev/cardbus/if_atw_cardbus.c b/sys/dev/cardbus/if_atw_cardbus.c index 92d15e9c7a3..e1efea49238 100644 --- a/sys/dev/cardbus/if_atw_cardbus.c +++ b/sys/dev/cardbus/if_atw_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_atw_cardbus.c,v 1.26 2009/04/02 00:09:33 dyoung Exp $ */ +/* $NetBSD: if_atw_cardbus.c,v 1.27 2009/09/16 16:34:50 dyoung Exp $ */ /*- * Copyright (c) 1999, 2000, 2003 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.26 2009/04/02 00:09:33 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.27 2009/09/16 16:34:50 dyoung Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -122,8 +122,8 @@ CFATTACH_DECL3_NEW(atw_cardbus, sizeof(struct atw_cardbus_softc), static void atw_cardbus_setup(struct atw_cardbus_softc *); -static bool atw_cardbus_suspend(device_t PMF_FN_PROTO); -static bool atw_cardbus_resume(device_t PMF_FN_PROTO); +static bool atw_cardbus_suspend(device_t, pmf_qual_t); +static bool atw_cardbus_resume(device_t, pmf_qual_t); static const struct atw_cardbus_product *atw_cardbus_lookup (const struct cardbus_attach_args *); @@ -327,7 +327,7 @@ atw_cardbus_detach(device_t self, int flags) } static bool -atw_cardbus_resume(device_t self PMF_FN_ARGS) +atw_cardbus_resume(device_t self, pmf_qual_t qual) { struct atw_cardbus_softc *csc = device_private(self); struct atw_softc *sc = &csc->sc_atw; @@ -349,7 +349,7 @@ atw_cardbus_resume(device_t self PMF_FN_ARGS) } static bool -atw_cardbus_suspend(device_t self PMF_FN_ARGS) +atw_cardbus_suspend(device_t self, pmf_qual_t qual) { struct atw_cardbus_softc *csc = device_private(self); cardbus_devfunc_t ct = csc->sc_ct; @@ -360,7 +360,7 @@ atw_cardbus_suspend(device_t self PMF_FN_ARGS) cardbus_intr_disestablish(cc, cf, csc->sc_ih); csc->sc_ih = NULL; - return atw_suspend(self PMF_FN_CALL); + return atw_suspend(self, qual); } static void diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c index ae1c2641d8f..80fb9d2440e 100644 --- a/sys/dev/cardbus/if_rtw_cardbus.c +++ b/sys/dev/cardbus/if_rtw_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_rtw_cardbus.c,v 1.31 2009/09/16 16:34:50 dyoung Exp $ */ +/* $NetBSD: if_rtw_cardbus.c,v 1.32 2009/10/19 23:19:39 rmind Exp $ */ /*- * Copyright (c) 2004, 2005 David Young. All rights reserved. @@ -64,7 +64,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.31 2009/09/16 16:34:50 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.32 2009/10/19 23:19:39 rmind Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -146,8 +146,8 @@ CFATTACH_DECL_NEW(rtw_cardbus, sizeof(struct rtw_cardbus_softc), void rtw_cardbus_setup(struct rtw_cardbus_softc *); -bool rtw_cardbus_resume(device_t PMF_FN_PROTO); -bool rtw_cardbus_suspend(device_t PMF_FN_PROTO); +bool rtw_cardbus_resume(device_t, pmf_qual_t); +bool rtw_cardbus_suspend(device_t, pmf_qual_t); const struct rtw_cardbus_product *rtw_cardbus_lookup( const struct cardbus_attach_args *); @@ -338,7 +338,7 @@ rtw_cardbus_detach(device_t self, int flags) } bool -rtw_cardbus_resume(device_t self PMF_FN_ARGS) +rtw_cardbus_resume(device_t self, pmf_qual_t qual) { struct rtw_cardbus_softc *csc = device_private(self); struct rtw_softc *sc = &csc->sc_rtw; @@ -362,11 +362,11 @@ rtw_cardbus_resume(device_t self PMF_FN_ARGS) RTW_WRITE(&sc->sc_regs, RTW_FEMR, RTW_FEMR_INTR); RTW_WRITE(&sc->sc_regs, RTW_FER, RTW_FER_INTR); - return rtw_resume(self PMF_FN_CALL); + return rtw_resume(self, qual); } bool -rtw_cardbus_suspend(device_t self PMF_FN_ARGS) +rtw_cardbus_suspend(device_t self, pmf_qual_t qual) { struct rtw_cardbus_softc *csc = device_private(self); struct rtw_softc *sc = &csc->sc_rtw; @@ -374,7 +374,7 @@ rtw_cardbus_suspend(device_t self PMF_FN_ARGS) cardbus_chipset_tag_t cc = ct->ct_cc; cardbus_function_tag_t cf = ct->ct_cf; - if (!rtw_suspend(self PMF_FN_CALL)) + if (!rtw_suspend(self, qual)) return false; RTW_WRITE(&sc->sc_regs, RTW_FEMR, diff --git a/sys/dev/cardbus/siisata_cardbus.c b/sys/dev/cardbus/siisata_cardbus.c index b03ce6f3c05..413d43f5af1 100644 --- a/sys/dev/cardbus/siisata_cardbus.c +++ b/sys/dev/cardbus/siisata_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: siisata_pci.c,v 1.1 2008/05/23 21:11:40 jnemeth Exp $ */ +/* $NetBSD: siisata_cardbus.c,v 1.2 2009/10/19 18:41:12 bouyer Exp $ */ /* Id: siisata_pci.c,v 1.11 2008/05/21 16:20:11 jakllsch Exp */ /* @@ -12,11 +12,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Manuel Bouyer. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -88,7 +83,7 @@ struct siisata_cardbus_softc { static int siisata_cardbus_match(device_t, cfdata_t, void *); static void siisata_cardbus_attach(device_t, device_t, void *); static int siisata_cardbus_detach(device_t, int); -static bool siisata_cardbus_resume(device_t PMF_FN_PROTO); +static bool siisata_cardbus_resume(device_t, pmf_qual_t); static const struct siisata_cardbus_product { cardbus_vendor_id_t scp_vendor; @@ -302,7 +297,7 @@ siisata_cardbus_detach(device_t self, int flags) } static bool -siisata_cardbus_resume(device_t dv PMF_FN_ARGS) +siisata_cardbus_resume(device_t dv, pmf_qual_t qual) { struct siisata_cardbus_softc *csc = device_private(dv); struct siisata_softc *sc = &csc->si_sc; diff --git a/sys/dev/gpio/gpio.c b/sys/dev/gpio/gpio.c index ac45dc55bca..284c62a916b 100644 --- a/sys/dev/gpio/gpio.c +++ b/sys/dev/gpio/gpio.c @@ -1,4 +1,4 @@ -/* $NetBSD: gpio.c,v 1.28 2009/08/23 12:08:56 mbalmer Exp $ */ +/* $NetBSD: gpio.c,v 1.29 2009/11/05 18:20:40 dyoung Exp $ */ /* $OpenBSD: gpio.c,v 1.6 2006/01/14 12:33:49 grange Exp $ */ /* @@ -19,7 +19,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.28 2009/08/23 12:08:56 mbalmer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.29 2009/11/05 18:20:40 dyoung Exp $"); /* * General Purpose Input/Output framework. @@ -66,7 +66,7 @@ int gpio_submatch(device_t, cfdata_t, const int *, void *); void gpio_attach(device_t, device_t, void *); int gpio_rescan(device_t, const char *, const int *); void gpio_childdetached(device_t, device_t); -bool gpio_resume(device_t PMF_FN_PROTO); +bool gpio_resume(device_t, pmf_qual_t); int gpio_detach(device_t, int); int gpio_search(device_t, cfdata_t, const int *, void *); int gpio_print(void *, const char *); @@ -108,7 +108,7 @@ gpio_submatch(device_t parent, cfdata_t cf, const int *ip, void *aux) } bool -gpio_resume(device_t self PMF_FN_ARGS) +gpio_resume(device_t self, pmf_qual_t qual) { struct gpio_softc *sc = device_private(self); int pin; diff --git a/sys/dev/sdmmc/sdhc.c b/sys/dev/sdmmc/sdhc.c index 4cce6532cec..63b9c5f5da5 100644 --- a/sys/dev/sdmmc/sdhc.c +++ b/sys/dev/sdmmc/sdhc.c @@ -1,4 +1,4 @@ -/* $NetBSD$ */ +/* $NetBSD: sdhc.c,v 1.3 2009/10/02 04:33:58 uebayasi Exp $ */ /* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */ /* @@ -23,7 +23,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD$"); +__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.3 2009/10/02 04:33:58 uebayasi Exp $"); #include #include @@ -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 b514619342e..d98b882bff7 100644 --- a/sys/dev/sdmmc/sdhcvar.h +++ b/sys/dev/sdmmc/sdhcvar.h @@ -1,4 +1,4 @@ -/* $NetBSD$ */ +/* $NetBSD: sdhcvar.h,v 1.1 2009/04/21 03:00:30 nonaka 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/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c index f1d33878162..493a749a5ba 100644 --- a/sys/dev/wscons/wsdisplay.c +++ b/sys/dev/wscons/wsdisplay.c @@ -1,4 +1,4 @@ -/* $NetBSD: wsdisplay.c,v 1.125 2009/01/15 04:22:11 yamt Exp $ */ +/* $NetBSD: wsdisplay.c,v 1.126 2009/01/22 20:40:20 drochner Exp $ */ /* * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.125 2009/01/15 04:22:11 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.126 2009/01/22 20:40:20 drochner Exp $"); #include "opt_wsdisplay_compat.h" #include "opt_wsmsgattrs.h" @@ -166,7 +166,7 @@ static int wsdisplay_emul_match(device_t , cfdata_t, void *); static void wsdisplay_emul_attach(device_t, device_t, void *); static int wsdisplay_noemul_match(device_t, cfdata_t, void *); static void wsdisplay_noemul_attach(device_t, device_t, void *); -static bool wsdisplay_suspend(device_t PMF_FN_PROTO); +static bool wsdisplay_suspend(device_t, pmf_qual_t); CFATTACH_DECL_NEW(wsdisplay_emul, sizeof (struct wsdisplay_softc), wsdisplay_emul_match, wsdisplay_emul_attach, NULL, NULL); @@ -677,7 +677,7 @@ wsdisplay_handlex(int resume) } static bool -wsdisplay_suspend(device_t dv PMF_FN_ARGS) +wsdisplay_suspend(device_t dv, pmf_qual_t qual) { struct wsdisplay_softc *sc = device_private(dv); #ifdef DIAGNOSTIC diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c index 723fb8d0758..924426a00d3 100644 --- a/sys/dev/wscons/wskbd.c +++ b/sys/dev/wscons/wskbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: wskbd.c,v 1.121 2009/01/13 18:05:55 christos Exp $ */ +/* $NetBSD: wskbd.c,v 1.122 2009/01/15 04:22:11 yamt Exp $ */ /* * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. @@ -105,7 +105,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.121 2009/01/13 18:05:55 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.122 2009/01/15 04:22:11 yamt Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -347,7 +347,7 @@ struct wssrcops wskbd_srcops = { }; #endif -static bool wskbd_suspend(device_t dv PMF_FN_PROTO); +static bool wskbd_suspend(device_t dv, pmf_qual_t); static void wskbd_repeat(void *v); static int wskbd_console_initted; @@ -505,7 +505,7 @@ wskbd_attach(device_t parent, device_t self, void *aux) } static bool -wskbd_suspend(device_t dv PMF_FN_ARGS) +wskbd_suspend(device_t dv, pmf_qual_t qual) { struct wskbd_softc *sc = device_private(dv); diff --git a/sys/dev/wsfb/genfbvar.h b/sys/dev/wsfb/genfbvar.h index 438b298ba8e..beffeff2868 100644 --- a/sys/dev/wsfb/genfbvar.h +++ b/sys/dev/wsfb/genfbvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: genfbvar.h,v 1.10 2009/02/17 02:19:33 jmcneill Exp $ */ +/* $NetBSD: genfbvar.h,v 1.11 2009/08/24 11:03:44 jmcneill Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v 1.10 2009/02/17 02:19:33 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v 1.11 2009/08/24 11:03:44 jmcneill Exp $"); #ifndef GENFBVAR_H #define GENFBVAR_H @@ -57,8 +57,8 @@ struct genfb_colormap_callback { }; struct genfb_pmf_callback { - bool (*gpc_suspend)(device_t PMF_FN_PROTO); - bool (*gpc_resume)(device_t PMF_FN_PROTO); + bool (*gpc_suspend)(device_t, pmf_qual_t); + bool (*gpc_resume)(device_t, pmf_qual_t); }; struct genfb_softc { diff --git a/sys/external/bsd/drm/dist/bsd-core/i915_drv.c b/sys/external/bsd/drm/dist/bsd-core/i915_drv.c index 1ae1013e3bc..ecbb518e21d 100644 --- a/sys/external/bsd/drm/dist/bsd-core/i915_drv.c +++ b/sys/external/bsd/drm/dist/bsd-core/i915_drv.c @@ -163,7 +163,7 @@ MODULE_DEPEND(i915, drm, 1, 1, 1); #elif defined(__NetBSD__) static bool -i915drm_suspend(device_t self PMF_FN_ARGS) +i915drm_suspend(device_t self, pmf_qual_t qual) { struct drm_device *dev = device_private(self); @@ -172,7 +172,7 @@ i915drm_suspend(device_t self PMF_FN_ARGS) } static bool -i915drm_resume(device_t self PMF_FN_ARGS) +i915drm_resume(device_t self, pmf_qual_t qual) { struct drm_device *dev = device_private(self); diff --git a/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c b/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c index d541be76395..28899251c6f 100644 --- a/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c +++ b/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c @@ -135,7 +135,7 @@ MODULE_DEPEND(radeon, drm, 1, 1, 1); #elif defined(__NetBSD__) static bool -radeondrm_suspend(device_t self PMF_FN_ARGS) +radeondrm_suspend(device_t self, pmf_qual_t qual) { struct drm_device *rad_dev = device_private(self); drm_radeon_cp_stop_t stop_args; @@ -148,7 +148,7 @@ radeondrm_suspend(device_t self PMF_FN_ARGS) } static bool -radeondrm_resume(device_t self PMF_FN_ARGS) +radeondrm_resume(device_t self, pmf_qual_t qual) { struct drm_device *rad_dev = device_private(self); if (radeon_cp_resume(rad_dev, NULL, NULL) != 0) -- 2.11.4.GIT