From 7df8e245ceb0e06d638a81cf5ee26607314e8764 Mon Sep 17 00:00:00 2001 From: David Young Date: Fri, 8 Jan 2010 19:58:33 +0000 Subject: [PATCH] Expand PMF_FN_* macros. --- sys/dev/mii/mii_physubr.c | 6 +++--- sys/dev/mii/miivar.h | 4 ++-- sys/dev/pci/agp.c | 8 ++++---- sys/dev/pci/agp_i810.c | 8 ++++---- sys/dev/pci/agp_intel.c | 8 ++++---- sys/dev/pci/ahcisata_pci.c | 8 ++++---- sys/dev/pci/auacer.c | 8 ++++---- sys/dev/pci/auich.c | 8 ++++---- sys/dev/pci/auixp.c | 8 ++++---- sys/dev/pci/autri.c | 8 ++++---- sys/dev/pci/auvia.c | 8 ++++---- sys/dev/pci/azalia.c | 8 ++++---- sys/dev/pci/cs4280.c | 12 ++++++------ sys/dev/pci/cs4281.c | 12 ++++++------ sys/dev/pci/ehci_pci.c | 16 ++++++++-------- sys/dev/pci/esa.c | 12 ++++++------ sys/dev/pci/esm.c | 12 ++++++------ sys/dev/pci/fwohci_pci.c | 12 ++++++------ sys/dev/pci/gcscaudio.c | 8 ++++---- sys/dev/pci/hdaudio/hdaudio_afg.c | 12 ++++++------ sys/dev/pci/hdaudio/hdaudio_pci.c | 8 ++++---- sys/dev/pci/if_age.c | 8 ++++---- sys/dev/pci/if_ath_pci.c | 8 ++++---- sys/dev/pci/if_atw_pci.c | 14 +++++++------- sys/dev/pci/if_bce.c | 8 ++++---- sys/dev/pci/if_fxp_pci.c | 8 ++++---- sys/dev/pci/if_gem_pci.c | 12 ++++++------ sys/dev/pci/if_iwn.c | 8 ++++---- sys/dev/pci/if_msk.c | 14 +++++++------- sys/dev/pci/if_nfe.c | 8 ++++---- sys/dev/pci/if_rtw_pci.c | 12 ++++++------ sys/dev/pci/if_sip.c | 12 ++++++------ sys/dev/pci/if_sk.c | 16 ++++++++-------- sys/dev/pci/if_vr.c | 8 ++++---- sys/dev/pci/if_wpi.c | 8 ++++---- sys/dev/pci/ixpide.c | 12 ++++++------ sys/dev/pci/mvsata_pci.c | 8 ++++---- sys/dev/pci/neo.c | 6 +++--- sys/dev/pci/pccbb.c | 12 ++++++------ sys/dev/pci/pci.c | 8 ++++---- sys/dev/pci/piixide.c | 12 ++++++------ sys/dev/pci/piixpm.c | 12 ++++++------ sys/dev/pci/ppb.c | 12 ++++++------ sys/dev/pci/siisata_pci.c | 6 +++--- sys/dev/pci/uhci_pci.c | 10 +++++----- sys/dev/pci/vga_pci.c | 8 ++++---- sys/dev/pci/viaide.c | 12 ++++++------ sys/dev/pci/yds.c | 8 ++++---- 48 files changed, 232 insertions(+), 232 deletions(-) diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c index b02f2c340f5..222238233e6 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.64 2009/05/12 14:31:27 cegger Exp $ */ +/* $NetBSD: mii_physubr.c,v 1.65 2009/11/06 18:41:25 dyoung Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.64 2009/05/12 14:31:27 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.65 2009/11/06 18:41:25 dyoung Exp $"); #include #include @@ -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 fc55549ee14..7030113183f 100644 --- a/sys/dev/mii/miivar.h +++ b/sys/dev/mii/miivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: miivar.h,v 1.55 2009/05/12 14:31:27 cegger Exp $ */ +/* $NetBSD: miivar.h,v 1.56 2009/12/04 22:37:35 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 d12459d7be4..0c4611954db 100644 --- a/sys/dev/pci/agp.c +++ b/sys/dev/pci/agp.c @@ -1,4 +1,4 @@ -/* $NetBSD: agp.c,v 1.64 2008/11/29 23:48:12 christos Exp $ */ +/* $NetBSD: agp.c,v 1.65 2009/01/27 08:39:33 markd Exp $ */ /*- * Copyright (c) 2000 Doug Rabson @@ -65,7 +65,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.64 2008/11/29 23:48:12 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.65 2009/01/27 08:39:33 markd Exp $"); #include #include @@ -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 54123cc342c..fc7daf71ccd 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.63 2009/02/19 05:58:37 markd Exp $ */ +/* $NetBSD: agp_i810.c,v 1.64 2009/05/04 11:05:45 markd Exp $ */ /*- * Copyright (c) 2000 Doug Rabson @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.63 2009/02/19 05:58:37 markd Exp $"); +__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.64 2009/05/04 11:05:45 markd Exp $"); #include #include @@ -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 a6294711435..8d3fbfe8bfd 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.31 2008/04/10 19:13:36 cegger Exp $ */ +/* $NetBSD: agp_intel.c,v 1.32 2008/06/09 06:49:54 freza Exp $ */ /*- * Copyright (c) 2000 Doug Rabson @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: agp_intel.c,v 1.31 2008/04/10 19:13:36 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: agp_intel.c,v 1.32 2008/06/09 06:49:54 freza Exp $"); #include #include @@ -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 63a82e467ea..c6ee236b99c 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.16 2009/08/19 16:31:28 pgoyette Exp $ */ +/* $NetBSD: ahcisata_pci.c,v 1.17 2009/10/19 18:41:14 bouyer Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.16 2009/08/19 16:31:28 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.17 2009/10/19 18:41:14 bouyer Exp $"); #include #include @@ -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 5dccd780ba8..1a9a30798b7 100644 --- a/sys/dev/pci/auacer.c +++ b/sys/dev/pci/auacer.c @@ -1,4 +1,4 @@ -/* $NetBSD: auacer.c,v 1.24 2009/05/12 08:22:59 cegger Exp $ */ +/* $NetBSD: auacer.c,v 1.25 2009/11/26 15:17:08 njoly Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.24 2009/05/12 08:22:59 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.25 2009/11/26 15:17:08 njoly Exp $"); #include #include @@ -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 b1c437a64ab..b9609a59efd 100644 --- a/sys/dev/pci/auich.c +++ b/sys/dev/pci/auich.c @@ -1,4 +1,4 @@ -/* $NetBSD: auich.c,v 1.132 2009/11/26 15:17:08 njoly Exp $ */ +/* $NetBSD: auich.c,v 1.133 2009/12/30 00:24:38 jakllsch Exp $ */ /*- * Copyright (c) 2000, 2004, 2005 The NetBSD Foundation, Inc. @@ -111,7 +111,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.132 2009/11/26 15:17:08 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.133 2009/12/30 00:24:38 jakllsch Exp $"); #include #include @@ -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 bf2bf4be4dd..9e9ef937c79 100644 --- a/sys/dev/pci/auixp.c +++ b/sys/dev/pci/auixp.c @@ -1,4 +1,4 @@ -/* $NetBSD: auixp.c,v 1.31 2009/05/06 09:25:14 cegger Exp $ */ +/* $NetBSD: auixp.c,v 1.32 2009/11/26 15:17:08 njoly Exp $ */ /* * Copyright (c) 2004, 2005 Reinoud Zandijk @@ -50,7 +50,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.31 2009/05/06 09:25:14 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.32 2009/11/26 15:17:08 njoly Exp $"); #include #include @@ -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 42b3297dd75..c15947032e5 100644 --- a/sys/dev/pci/autri.c +++ b/sys/dev/pci/autri.c @@ -1,4 +1,4 @@ -/* $NetBSD: autri.c,v 1.43 2009/05/12 08:22:59 cegger Exp $ */ +/* $NetBSD: autri.c,v 1.44 2009/11/26 15:17:08 njoly Exp $ */ /* * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.43 2009/05/12 08:22:59 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.44 2009/11/26 15:17:08 njoly 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 5095aa83259..48eab31eac8 100644 --- a/sys/dev/pci/auvia.c +++ b/sys/dev/pci/auvia.c @@ -1,4 +1,4 @@ -/* $NetBSD: auvia.c,v 1.69 2009/05/06 18:25:28 cegger Exp $ */ +/* $NetBSD: auvia.c,v 1.70 2009/11/26 15:17:08 njoly Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.69 2009/05/06 18:25:28 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.70 2009/11/26 15:17:08 njoly Exp $"); #include #include @@ -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 b71d6033c38..530c0419099 100644 --- a/sys/dev/pci/azalia.c +++ b/sys/dev/pci/azalia.c @@ -1,4 +1,4 @@ -/* $NetBSD: azalia.c,v 1.69 2009/05/06 09:25:14 cegger Exp $ */ +/* $NetBSD: azalia.c,v 1.70 2009/11/12 19:40:19 dyoung Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.69 2009/05/06 09:25:14 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.70 2009/11/12 19:40:19 dyoung Exp $"); #include #include @@ -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 eedf5fbee1d..5bbadc5a2b1 100644 --- a/sys/dev/pci/cs4280.c +++ b/sys/dev/pci/cs4280.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs4280.c,v 1.54 2009/05/12 08:23:00 cegger Exp $ */ +/* $NetBSD: cs4280.c,v 1.55 2009/11/26 15:17:09 njoly Exp $ */ /* * Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved. @@ -52,7 +52,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.54 2009/05/12 08:23:00 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.55 2009/11/26 15:17:09 njoly 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 cb83ade4c57..2d2db21405c 100644 --- a/sys/dev/pci/cs4281.c +++ b/sys/dev/pci/cs4281.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs4281.c,v 1.41 2009/05/06 10:34:32 cegger Exp $ */ +/* $NetBSD: cs4281.c,v 1.42 2009/05/12 08:23:00 cegger Exp $ */ /* * Copyright (c) 2000 Tatoku Ogaito. All rights reserved. @@ -43,7 +43,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.41 2009/05/06 10:34:32 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.42 2009/05/12 08:23:00 cegger Exp $"); #include #include @@ -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 39e68547e53..5f7efad78f2 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.44 2009/04/26 09:47:31 cegger Exp $ */ +/* $NetBSD: ehci_pci.c,v 1.45 2009/06/15 09:18:45 cegger Exp $ */ /* * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.44 2009/04/26 09:47:31 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.45 2009/06/15 09:18:45 cegger Exp $"); #include #include @@ -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 777b3697bac..55abf4fdaf2 100644 --- a/sys/dev/pci/esa.c +++ b/sys/dev/pci/esa.c @@ -1,4 +1,4 @@ -/* $NetBSD: esa.c,v 1.51 2009/05/06 09:25:14 cegger Exp $ */ +/* $NetBSD: esa.c,v 1.52 2009/11/26 15:17:09 njoly Exp $ */ /* * Copyright (c) 2001-2008 Jared D. McNeill @@ -39,7 +39,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.51 2009/05/06 09:25:14 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.52 2009/11/26 15:17:09 njoly Exp $"); #include #include @@ -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 37fdccb455a..772a9654f7a 100644 --- a/sys/dev/pci/esm.c +++ b/sys/dev/pci/esm.c @@ -1,4 +1,4 @@ -/* $NetBSD: esm.c,v 1.50 2009/06/12 08:33:41 cegger Exp $ */ +/* $NetBSD: esm.c,v 1.51 2009/11/26 15:17:09 njoly Exp $ */ /*- * Copyright (c) 2002, 2003 Matt Fredette @@ -66,7 +66,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.50 2009/06/12 08:33:41 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.51 2009/11/26 15:17:09 njoly Exp $"); #include #include @@ -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 05fa5bd82c5..b8c02d43141 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.32 2008/04/28 20:23:54 martin Exp $ */ +/* $NetBSD: fwohci_pci.c,v 1.33 2009/05/06 09:25:15 cegger Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.32 2008/04/28 20:23:54 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.33 2009/05/06 09:25:15 cegger Exp $"); #include #include @@ -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 d6b3d83b6b9..e2f9b601ca6 100644 --- a/sys/dev/pci/gcscaudio.c +++ b/sys/dev/pci/gcscaudio.c @@ -1,4 +1,4 @@ -/* $NetBSD: gcscaudio.c,v 1.2 2009/05/06 09:25:15 cegger Exp $ */ +/* $NetBSD: gcscaudio.c,v 1.3 2009/11/26 15:17:09 njoly Exp $ */ /*- * Copyright (c) 2008 SHIMIZU Ryo @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.2 2009/05/06 09:25:15 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.3 2009/11/26 15:17:09 njoly Exp $"); #include #include @@ -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 3a3a46fa5f4..1ec132c903b 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.16 2009/09/29 15:58:54 sborrill Exp $ */ +/* $NetBSD: hdaudio_afg.c,v 1.17 2009/10/11 08:50:11 sborrill Exp $ */ /* * Copyright (c) 2009 Precedence Technologies Ltd @@ -60,7 +60,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: hdaudio_afg.c,v 1.16 2009/09/29 15:58:54 sborrill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdaudio_afg.c,v 1.17 2009/10/11 08:50:11 sborrill Exp $"); #include #include @@ -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 1eec9f9960c..3630b826ffc 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.2 2009/09/06 17:33:53 sborrill Exp $ */ +/* $NetBSD: hdaudio_pci.c,v 1.3 2009/12/04 11:13:05 njoly Exp $ */ /* * Copyright (c) 2009 Precedence Technologies Ltd @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.2 2009/09/06 17:33:53 sborrill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdaudio_pci.c,v 1.3 2009/12/04 11:13:05 njoly Exp $"); #include #include @@ -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 fbd81b84756..ee2b8fbd589 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.33 2009/09/05 14:09:55 tsutsui Exp $ */ +/* $NetBSD: if_age.c,v 1.34 2009/10/08 08:57:19 cegger 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 -__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.33 2009/09/05 14:09:55 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.34 2009/10/08 08:57:19 cegger 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 affdf40940e..c5f70fc195c 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.34 2009/09/05 14:13:50 tsutsui Exp $ */ +/* $NetBSD: if_ath_pci.c,v 1.35 2009/09/16 16:34:50 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.34 2009/09/05 14:13:50 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.35 2009/09/16 16:34:50 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 2867095b4df..92f9046f788 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.21 2009/05/06 09:25:15 cegger Exp $ */ +/* $NetBSD: if_atw_pci.c,v 1.22 2009/09/16 16:34:50 dyoung Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_atw_pci.c,v 1.21 2009/05/06 09:25:15 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_atw_pci.c,v 1.22 2009/09/16 16:34:50 dyoung Exp $"); #include #include @@ -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 5eb28df15ec..4cbfd0b91d7 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.27 2009/09/05 14:09:55 tsutsui Exp $ */ +/* $NetBSD: if_bce.c,v 1.28 2009/11/26 15:17:09 njoly Exp $ */ /* * Copyright (c) 2003 Clifford Wright. All rights reserved. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.27 2009/09/05 14:09:55 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.28 2009/11/26 15:17:09 njoly 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 a65ab7fac3c..2ec202c9b20 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.70 2009/09/05 14:13:50 tsutsui Exp $ */ +/* $NetBSD: if_fxp_pci.c,v 1.71 2009/11/26 15:17:09 njoly Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.70 2009/09/05 14:13:50 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.71 2009/11/26 15:17:09 njoly 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 b63bdd4f1f5..cf089707597 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.37 2009/09/05 14:13:50 tsutsui Exp $ */ +/* $NetBSD: if_gem_pci.c,v 1.38 2009/11/26 15:17:09 njoly Exp $ */ /* * @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.37 2009/09/05 14:13:50 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.38 2009/11/26 15:17:09 njoly Exp $"); #include #include @@ -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 8c01eb0d844..e95e9764045 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.33 2009/09/11 01:28:20 christos Exp $ */ +/* $NetBSD: if_iwn.c,v 1.34 2009/11/21 14:51:04 njoly 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 -__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.33 2009/09/11 01:28:20 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.34 2009/11/21 14:51:04 njoly 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 3701d35ea4a..b0e06c59b26 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.29 2009/12/14 00:52:04 matt Exp $ */ +/* $NetBSD: if_msk.c,v 1.30 2009/12/24 18:27:31 christos Exp $ */ /* $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */ /* @@ -52,7 +52,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.29 2009/12/14 00:52:04 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.30 2009/12/24 18:27:31 christos Exp $"); #include "bpfilter.h" #include "rnd.h" @@ -101,8 +101,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.29 2009/12/14 00:52:04 matt 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 1f87bf64600..7d73058873d 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.46 2009/09/05 14:09:55 tsutsui Exp $ */ +/* $NetBSD: if_nfe.c,v 1.47 2009/11/26 15:17:09 njoly 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 -__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.46 2009/09/05 14:09:55 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.47 2009/11/26 15:17:09 njoly 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 0400e50ab8c..7327590eb31 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.14 2009/09/05 14:13:50 tsutsui Exp $ */ +/* $NetBSD: if_rtw_pci.c,v 1.15 2009/09/16 16:34:50 dyoung Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_rtw_pci.c,v 1.14 2009/09/05 14:13:50 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_rtw_pci.c,v 1.15 2009/09/16 16:34:50 dyoung Exp $"); #include #include @@ -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 35ab5e898ad..adc1f287988 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.142 2009/09/16 16:34:50 dyoung Exp $ */ +/* $NetBSD: if_sip.c,v 1.143 2009/11/26 15:17:10 njoly Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -73,7 +73,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.142 2009/09/16 16:34:50 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.143 2009/11/26 15:17:10 njoly 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 6183036ae66..2cb4f7f5053 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.61 2009/09/05 14:09:55 tsutsui Exp $ */ +/* $NetBSD: if_sk.c,v 1.62 2009/11/26 15:17:10 njoly Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -115,7 +115,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.61 2009/09/05 14:09:55 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.62 2009/11/26 15:17:10 njoly 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 89114d9c9d6..e12c8a43ec8 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.99 2009/09/26 19:58:53 jmcneill Exp $ */ +/* $NetBSD: if_vr.c,v 1.100 2009/11/26 15:17:10 njoly Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.99 2009/09/26 19:58:53 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.100 2009/11/26 15:17:10 njoly 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 f9f0b3090b4..6084f6e575b 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.42 2009/05/06 09:25:16 cegger Exp $ */ +/* $NetBSD: if_wpi.c,v 1.43 2009/09/05 14:09:55 tsutsui Exp $ */ /*- * Copyright (c) 2006, 2007 @@ -18,7 +18,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.42 2009/05/06 09:25:16 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.43 2009/09/05 14:09:55 tsutsui 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 4eb3aeefa66..758c3e7c52e 100644 --- a/sys/dev/pci/ixpide.c +++ b/sys/dev/pci/ixpide.c @@ -1,4 +1,4 @@ -/* $NetBSD: ixpide.c,v 1.13 2008/09/06 22:18:56 rmind Exp $ */ +/* $NetBSD: ixpide.c,v 1.14 2008/11/04 16:05:29 reinoud Exp $ */ /* * Copyright (c) 2004 The NetBSD Foundation. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ixpide.c,v 1.13 2008/09/06 22:18:56 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixpide.c,v 1.14 2008/11/04 16:05:29 reinoud Exp $"); #include #include @@ -38,8 +38,8 @@ __KERNEL_RCSID(0, "$NetBSD: ixpide.c,v 1.13 2008/09/06 22:18:56 rmind Exp $"); #include #include -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 af9d2608dfe..6c68516cd3f 100644 --- a/sys/dev/pci/mvsata_pci.c +++ b/sys/dev/pci/mvsata_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD$ */ +/* $NetBSD: mvsata_pci.c,v 1.1 2009/07/27 12:34:14 kiyohara Exp $ */ /* * Copyright (c) 2008 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD$"); +__KERNEL_RCSID(0, "$NetBSD: mvsata_pci.c,v 1.1 2009/07/27 12:34:14 kiyohara Exp $"); #include #include @@ -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 e7259f570c9..3a3d8000998 100644 --- a/sys/dev/pci/neo.c +++ b/sys/dev/pci/neo.c @@ -1,4 +1,4 @@ -/* $NetBSD: neo.c,v 1.42 2009/05/12 08:23:01 cegger Exp $ */ +/* $NetBSD: neo.c,v 1.43 2009/11/26 15:17:10 njoly Exp $ */ /* * Copyright (c) 1999 Cameron Grant @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.42 2009/05/12 08:23:01 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.43 2009/11/26 15:17:10 njoly Exp $"); #include #include @@ -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 64ff607ed34..c43c3da7899 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $NetBSD: pccbb.c,v 1.191 2009/08/07 12:09:50 blymn Exp $ */ +/* $NetBSD: pccbb.c,v 1.192 2009/12/15 22:17:12 snj Exp $ */ /* * Copyright (c) 1998, 1999 and 2000 @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.191 2009/08/07 12:09:50 blymn Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.192 2009/12/15 22:17:12 snj 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 a888d611790..2f5d38d717b 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci.c,v 1.123 2009/07/04 21:01:10 cegger Exp $ */ +/* $NetBSD: pci.c,v 1.124 2009/08/19 21:36:47 dyoung Exp $ */ /* * Copyright (c) 1995, 1996, 1997, 1998 @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.123 2009/07/04 21:01:10 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.124 2009/08/19 21:36:47 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 1a6302f9cb8..16d35bca408 100644 --- a/sys/dev/pci/piixide.c +++ b/sys/dev/pci/piixide.c @@ -1,4 +1,4 @@ -/* $NetBSD: piixide.c,v 1.51 2009/10/19 18:41:16 bouyer Exp $ */ +/* $NetBSD: piixide.c,v 1.52 2009/11/30 09:33:48 sborrill Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Manuel Bouyer. @@ -25,7 +25,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.51 2009/10/19 18:41:16 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.52 2009/11/30 09:33:48 sborrill Exp $"); #include #include @@ -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 21b90562bf6..3fbe892eaf3 100644 --- a/sys/dev/pci/piixpm.c +++ b/sys/dev/pci/piixpm.c @@ -1,4 +1,4 @@ -/* $NetBSD: piixpm.c,v 1.29 2009/03/18 16:00:19 cegger Exp $ */ +/* $NetBSD: piixpm.c,v 1.30 2009/11/03 12:51:56 pgoyette Exp $ */ /* $OpenBSD: piixpm.c,v 1.20 2006/02/27 08:25:02 grange Exp $ */ /* @@ -22,7 +22,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.29 2009/03/18 16:00:19 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.30 2009/11/03 12:51:56 pgoyette Exp $"); #include #include @@ -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 f67703a0613..8751217b23a 100644 --- a/sys/dev/pci/ppb.c +++ b/sys/dev/pci/ppb.c @@ -1,4 +1,4 @@ -/* $NetBSD: ppb.c,v 1.39 2008/05/03 05:44:06 cegger Exp $ */ +/* $NetBSD: ppb.c,v 1.40 2009/04/02 00:09:33 dyoung Exp $ */ /* * Copyright (c) 1996, 1998 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.39 2008/05/03 05:44:06 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.40 2009/04/02 00:09:33 dyoung Exp $"); #include #include @@ -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 149db0a422c..aeff447b0ea 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.4 2009/07/04 20:36:57 jakllsch Exp $ */ +/* $NetBSD: siisata_pci.c,v 1.5 2009/10/19 18:41:16 bouyer 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 73da38651c1..1d25d69eb75 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.47 2009/05/06 09:25:17 cegger Exp $ */ +/* $NetBSD: uhci_pci.c,v 1.48 2009/11/26 15:17:10 njoly Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.47 2009/05/06 09:25:17 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.48 2009/11/26 15:17:10 njoly Exp $"); #include "ehci.h" @@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.47 2009/05/06 09:25:17 cegger Exp $") #include #include -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 b855309f4a6..4fc02968417 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.46 2009/05/06 10:34:33 cegger Exp $ */ +/* $NetBSD: vga_pci.c,v 1.47 2009/08/18 20:46:10 jmcneill Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.46 2009/05/06 10:34:33 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.47 2009/08/18 20:46:10 jmcneill Exp $"); #include #include @@ -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 90b9db95cc2..a372a1408db 100644 --- a/sys/dev/pci/viaide.c +++ b/sys/dev/pci/viaide.c @@ -1,4 +1,4 @@ -/* $NetBSD: viaide.c,v 1.65 2009/12/22 16:32:41 tsutsui Exp $ */ +/* $NetBSD: viaide.c,v 1.66 2009/12/23 00:11:36 mrg Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Manuel Bouyer. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: viaide.c,v 1.65 2009/12/22 16:32:41 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: viaide.c,v 1.66 2009/12/23 00:11:36 mrg Exp $"); #include #include @@ -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 fe8542bcffd..b8923538712 100644 --- a/sys/dev/pci/yds.c +++ b/sys/dev/pci/yds.c @@ -1,4 +1,4 @@ -/* $NetBSD: yds.c,v 1.46 2009/05/06 10:34:33 cegger Exp $ */ +/* $NetBSD: yds.c,v 1.47 2009/11/26 15:17:10 njoly Exp $ */ /* * Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto. @@ -39,7 +39,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.46 2009/05/06 10:34:33 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.47 2009/11/26 15:17:10 njoly 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; -- 2.11.4.GIT