Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expand PMF_FN_* macros.

Browse Source
This commit is contained in:
dyoung 2010-01-08 19:42:11 +00:00
parent 69ebc5167f
commit 3022acc4eb
29 changed files with 139 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/arch/i386/pci/elan520.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: elan520.c,v 1.45 2010/01/08 00:09:44 dyoung Exp $ */ /* $NetBSD: elan520.c,v 1.46 2010/01/08 19:45:28 dyoung Exp $ */
/*- /*-
* Copyright (c) 2002 The NetBSD Foundation, Inc. * Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -40,7 +40,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.45 2010/01/08 00:09:44 dyoung Exp $"); __KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.46 2010/01/08 19:45:28 dyoung Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -847,7 +847,7 @@ elanpex_intr_ack(bus_space_tag_t memt, bus_space_handle_t memh)
} }
static bool static bool
elansc_suspend(device_t dev PMF_FN_ARGS) elansc_suspend(device_t dev, pmf_qual_t qual)
{ {
bool rc; bool rc;
struct elansc_softc *sc = device_private(dev); struct elansc_softc *sc = device_private(dev);
@ -861,7 +861,7 @@ elansc_suspend(device_t dev PMF_FN_ARGS)
} }
static bool 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); struct elansc_softc *sc = device_private(dev);
@ -947,7 +947,7 @@ elansc_intr_establish(device_t dev, int (*handler)(void *), void *arg)
} }
static bool 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)); struct elansc_softc *sc = device_private(device_parent(self));
@ -956,7 +956,7 @@ elanpex_resume(device_t self PMF_FN_ARGS)
} }
static bool 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)); struct elansc_softc *sc = device_private(device_parent(self));
@ -966,7 +966,7 @@ elanpex_suspend(device_t self PMF_FN_ARGS)
} }
static bool 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)); struct elansc_softc *sc = device_private(device_parent(self));
@ -975,7 +975,7 @@ elanpar_resume(device_t self PMF_FN_ARGS)
} }
static bool 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)); struct elansc_softc *sc = device_private(device_parent(self));

12
sys/arch/i386/pci/piixpcib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: piixpcib.c,v 1.16 2008/07/20 16:52:33 martin Exp $ */ /* $NetBSD: piixpcib.c,v 1.17 2010/01/08 19:45:28 dyoung Exp $ */
/*- /*-
* Copyright (c) 2004, 2006 The NetBSD Foundation, Inc. * Copyright (c) 2004, 2006 The NetBSD Foundation, Inc.
@ -36,7 +36,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: piixpcib.c,v 1.16 2008/07/20 16:52:33 martin Exp $"); __KERNEL_RCSID(0, "$NetBSD: piixpcib.c,v 1.17 2010/01/08 19:45:28 dyoung Exp $");
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
@ -79,8 +79,8 @@ struct piixpcib_softc {
static int piixpcibmatch(device_t, cfdata_t, void *); static int piixpcibmatch(device_t, cfdata_t, void *);
static void piixpcibattach(device_t, device_t, void *); static void piixpcibattach(device_t, device_t, void *);
static bool piixpcib_suspend(device_t PMF_FN_PROTO); static bool piixpcib_suspend(device_t, pmf_qual_t);
static bool piixpcib_resume(device_t PMF_FN_PROTO); static bool piixpcib_resume(device_t, pmf_qual_t);
static void speedstep_configure(struct piixpcib_softc *, static void speedstep_configure(struct piixpcib_softc *,
struct pci_attach_args *); struct pci_attach_args *);
@ -144,7 +144,7 @@ piixpcibattach(device_t parent, device_t self, void *aux)
} }
static bool 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); struct piixpcib_softc *sc = device_private(dv);
@ -160,7 +160,7 @@ piixpcib_suspend(device_t dv PMF_FN_ARGS)
} }
static bool 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); struct piixpcib_softc *sc = device_private(dv);

6
sys/arch/mips/atheros/dev/if_ath_arbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ath_arbus.c,v 1.16 2009/07/06 00:43:23 alc Exp $ */ /* $NetBSD: if_ath_arbus.c,v 1.17 2010/01/08 19:49:13 dyoung Exp $ */
/*- /*-
* Copyright (c) 2006 Jared D. McNeill <jmcneill@invisible.ca> * Copyright (c) 2006 Jared D. McNeill <jmcneill@invisible.ca>
@ -34,7 +34,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ath_arbus.c,v 1.16 2009/07/06 00:43:23 alc Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_ath_arbus.c,v 1.17 2010/01/08 19:49:13 dyoung Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -96,7 +96,7 @@ ath_arbus_match(device_t parent, cfdata_t cf, void *opaque)
} }
static bool 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); struct ath_arbus_softc *asc = device_private(dv);
ath_resume(&asc->sc_ath); ath_resume(&asc->sc_ath);

8
sys/arch/sparc/dev/fd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fd.c,v 1.147 2009/12/19 10:34:18 tsutsui Exp $ */ /* $NetBSD: fd.c,v 1.148 2010/01/08 19:49:13 dyoung Exp $ */
/*- /*-
* Copyright (c) 2000 The NetBSD Foundation, Inc. * Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -101,7 +101,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.147 2009/12/19 10:34:18 tsutsui Exp $"); __KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.148 2010/01/08 19:49:13 dyoung Exp $");
#include "opt_ddb.h" #include "opt_ddb.h"
#include "opt_md.h" #include "opt_md.h"
@ -292,7 +292,7 @@ struct fd_softc {
int fdmatch(struct device *, struct cfdata *, void *); int fdmatch(struct device *, struct cfdata *, void *);
void fdattach(struct device *, struct device *, void *); void fdattach(struct device *, struct device *, void *);
bool fdshutdown(device_t, int); 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), CFATTACH_DECL(fd, sizeof(struct fd_softc),
fdmatch, fdattach, NULL, NULL); fdmatch, fdattach, NULL, NULL);
@ -809,7 +809,7 @@ bool fdshutdown(device_t self, int how)
return true; return true;
} }
bool fdsuspend(device_t self PMF_FN_ARGS) bool fdsuspend(device_t self, pmf_qual_t qual)
{ {
return fdshutdown(self, boothowto); return fdshutdown(self, boothowto);

8
sys/arch/sparc64/dev/fdc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fdc.c,v 1.31 2009/05/15 20:52:22 jnemeth Exp $ */ /* $NetBSD: fdc.c,v 1.32 2010/01/08 19:49:14 dyoung Exp $ */
/*- /*-
* Copyright (c) 2000 The NetBSD Foundation, Inc. * Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -101,7 +101,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.31 2009/05/15 20:52:22 jnemeth Exp $"); __KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.32 2010/01/08 19:49:14 dyoung Exp $");
#include "opt_ddb.h" #include "opt_ddb.h"
#include "opt_md.h" #include "opt_md.h"
@ -324,7 +324,7 @@ struct fd_softc {
int fdmatch(struct device *, struct cfdata *, void *); int fdmatch(struct device *, struct cfdata *, void *);
void fdattach(struct device *, struct device *, void *); void fdattach(struct device *, struct device *, void *);
bool fdshutdown(device_t, int); 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), CFATTACH_DECL(fd, sizeof(struct fd_softc),
fdmatch, fdattach, NULL, NULL); fdmatch, fdattach, NULL, NULL);
@ -979,7 +979,7 @@ bool fdshutdown(device_t self, int how)
return true; return true;
} }
bool fdsuspend(device_t self PMF_FN_ARGS) bool fdsuspend(device_t self, pmf_qual_t qual)
{ {
return fdshutdown(self, boothowto); return fdshutdown(self, boothowto);

12
sys/arch/x86/pci/ichlpcib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ichlpcib.c,v 1.22 2010/01/08 00:09:45 dyoung Exp $ */ /* $NetBSD: ichlpcib.c,v 1.23 2010/01/08 19:43:26 dyoung Exp $ */
/*- /*-
* Copyright (c) 2004 The NetBSD Foundation, Inc. * Copyright (c) 2004 The NetBSD Foundation, Inc.
@ -39,7 +39,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.22 2010/01/08 00:09:45 dyoung Exp $"); __KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.23 2010/01/08 19:43:26 dyoung Exp $");
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
@ -123,8 +123,8 @@ static void lpcibattach(device_t, device_t, void *);
static int lpcibdetach(device_t, int); static int lpcibdetach(device_t, int);
static void lpcibchilddet(device_t, device_t); static void lpcibchilddet(device_t, device_t);
static int lpcibrescan(device_t, const char *, const int *); static int lpcibrescan(device_t, const char *, const int *);
static bool lpcib_suspend(device_t PMF_FN_PROTO); static bool lpcib_suspend(device_t, pmf_qual_t);
static bool lpcib_resume(device_t PMF_FN_PROTO); static bool lpcib_resume(device_t, pmf_qual_t);
static bool lpcib_shutdown(device_t, int); static bool lpcib_shutdown(device_t, int);
static void pmtimer_configure(device_t); static void pmtimer_configure(device_t);
@ -414,7 +414,7 @@ lpcib_shutdown(device_t dv, int howto)
} }
static bool 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); struct lpcib_softc *sc = device_private(dv);
pci_chipset_tag_t pc = sc->sc_pcib.sc_pc; pci_chipset_tag_t pc = sc->sc_pcib.sc_pc;
@ -443,7 +443,7 @@ lpcib_suspend(device_t dv PMF_FN_ARGS)
} }
static bool 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); struct lpcib_softc *sc = device_private(dv);
pci_chipset_tag_t pc = sc->sc_pcib.sc_pc; pci_chipset_tag_t pc = sc->sc_pcib.sc_pc;

12
sys/arch/x86/pci/pchb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pchb.c,v 1.19 2009/08/23 15:37:51 jmcneill Exp $ */ /* $NetBSD: pchb.c,v 1.20 2010/01/08 19:43:26 dyoung Exp $ */
/*- /*-
* Copyright (c) 1996, 1998, 2000 The NetBSD Foundation, Inc. * Copyright (c) 1996, 1998, 2000 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.19 2009/08/23 15:37:51 jmcneill Exp $"); __KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.20 2010/01/08 19:43:26 dyoung Exp $");
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>
@ -75,8 +75,8 @@ int pchbmatch(device_t, cfdata_t, void *);
void pchbattach(device_t, device_t, void *); void pchbattach(device_t, device_t, void *);
int pchbdetach(device_t, int); int pchbdetach(device_t, int);
static bool pchb_resume(device_t PMF_FN_ARGS); static bool pchb_resume(device_t, pmf_qual_t);
static bool pchb_suspend(device_t PMF_FN_ARGS); static bool pchb_suspend(device_t, pmf_qual_t);
CFATTACH_DECL3_NEW(pchb, sizeof(struct pchb_softc), CFATTACH_DECL3_NEW(pchb, sizeof(struct pchb_softc),
pchbmatch, pchbattach, pchbdetach, NULL, NULL, NULL, DVF_DETACH_SHUTDOWN); pchbmatch, pchbattach, pchbdetach, NULL, NULL, NULL, DVF_DETACH_SHUTDOWN);
@ -461,7 +461,7 @@ pchbdetach(device_t self, int flags)
} }
static bool 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); struct pchb_softc *sc = device_private(dv);
pci_chipset_tag_t pc; pci_chipset_tag_t pc;
@ -478,7 +478,7 @@ pchb_suspend(device_t dv PMF_FN_ARGS)
} }
static bool 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); struct pchb_softc *sc = device_private(dv);
pci_chipset_tag_t pc; pci_chipset_tag_t pc;

12
sys/arch/x86/x86/cpu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.c,v 1.65 2009/11/21 03:11:01 rmind Exp $ */ /* $NetBSD: cpu.c,v 1.66 2010/01/08 19:43:26 dyoung Exp $ */
/*- /*-
* Copyright (c) 2000, 2006, 2007, 2008 The NetBSD Foundation, Inc. * Copyright (c) 2000, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -62,7 +62,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.65 2009/11/21 03:11:01 rmind Exp $"); __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.66 2010/01/08 19:43:26 dyoung Exp $");
#include "opt_ddb.h" #include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */ #include "opt_mpbios.h" /* for MPDEBUG */
@ -120,8 +120,8 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.65 2009/11/21 03:11:01 rmind Exp $");
int cpu_match(device_t, cfdata_t, void *); int cpu_match(device_t, cfdata_t, void *);
void cpu_attach(device_t, device_t, void *); void cpu_attach(device_t, device_t, void *);
static bool cpu_suspend(device_t PMF_FN_PROTO); static bool cpu_suspend(device_t, pmf_qual_t);
static bool cpu_resume(device_t PMF_FN_PROTO); static bool cpu_resume(device_t, pmf_qual_t);
struct cpu_softc { struct cpu_softc {
device_t sc_dev; /* device tree glue */ device_t sc_dev; /* device tree glue */
@ -997,7 +997,7 @@ cpu_offline_md(void)
/* XXX joerg restructure and restart CPUs individually */ /* XXX joerg restructure and restart CPUs individually */
static bool 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_softc *sc = device_private(dv);
struct cpu_info *ci = sc->sc_info; struct cpu_info *ci = sc->sc_info;
@ -1025,7 +1025,7 @@ cpu_suspend(device_t dv PMF_FN_ARGS)
} }
static bool 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_softc *sc = device_private(dv);
struct cpu_info *ci = sc->sc_info; struct cpu_info *ci = sc->sc_info;

8
sys/arch/x86/x86/x86_autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: x86_autoconf.c,v 1.47 2009/11/25 19:46:19 tron Exp $ */ /* $NetBSD: x86_autoconf.c,v 1.48 2010/01/08 19:43:26 dyoung Exp $ */
/*- /*-
* Copyright (c) 1990 The Regents of the University of California. * Copyright (c) 1990 The Regents of the University of California.
@ -35,7 +35,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.47 2009/11/25 19:46:19 tron Exp $"); __KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.48 2010/01/08 19:43:26 dyoung Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -94,13 +94,13 @@ x86_genfb_set_mapreg(void *opaque, int index, int r, int g, int b)
} }
static bool static bool
x86_genfb_suspend(device_t dev PMF_FN_ARGS) x86_genfb_suspend(device_t dev, pmf_qual_t qual)
{ {
return true; return true;
} }
static bool static bool
x86_genfb_resume(device_t dev PMF_FN_ARGS) x86_genfb_resume(device_t dev, pmf_qual_t qual)
{ {
#if NGENFB > 0 #if NGENFB > 0
struct pci_genfb_softc *psc = device_private(dev); struct pci_genfb_softc *psc = device_private(dev);

8
sys/arch/xen/x86/cpu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.c,v 1.39 2009/11/27 03:23:15 rmind Exp $ */ /* $NetBSD: cpu.c,v 1.40 2010/01/08 19:43:26 dyoung Exp $ */
/* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp */ /* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp */
/*- /*-
@ -66,7 +66,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.39 2009/11/27 03:23:15 rmind Exp $"); __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.40 2010/01/08 19:43:26 dyoung Exp $");
#include "opt_ddb.h" #include "opt_ddb.h"
#include "opt_multiprocessor.h" #include "opt_multiprocessor.h"
@ -1024,7 +1024,7 @@ cpu_offline_md(void)
#if 0 #if 0
/* XXX joerg restructure and restart CPUs individually */ /* XXX joerg restructure and restart CPUs individually */
static bool 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_softc *sc = device_private(dv);
struct cpu_info *ci = sc->sc_info; struct cpu_info *ci = sc->sc_info;
@ -1052,7 +1052,7 @@ cpu_suspend(device_t dv PMF_FN_ARGS)
} }
static bool 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_softc *sc = device_private(dv);
struct cpu_info *ci = sc->sc_info; struct cpu_info *ci = sc->sc_info;

12
sys/arch/zaurus/dev/zaudio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zaudio.c,v 1.10 2009/04/18 05:20:21 nonaka Exp $ */ /* $NetBSD: zaudio.c,v 1.11 2010/01/08 19:42:11 dyoung Exp $ */
/* $OpenBSD: zaurus_audio.c,v 1.8 2005/08/18 13:23:02 robert Exp $ */ /* $OpenBSD: zaurus_audio.c,v 1.8 2005/08/18 13:23:02 robert Exp $ */
/* /*
@ -49,7 +49,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1.10 2009/04/18 05:20:21 nonaka Exp $"); __KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1.11 2010/01/08 19:42:11 dyoung Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -84,8 +84,8 @@ __KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1.10 2009/04/18 05:20:21 nonaka Exp $");
static int zaudio_match(device_t, cfdata_t, void *); static int zaudio_match(device_t, cfdata_t, void *);
static void zaudio_attach(device_t, device_t, void *); static void zaudio_attach(device_t, device_t, void *);
static bool zaudio_suspend(device_t dv PMF_FN_ARGS); static bool zaudio_suspend(device_t dv, pmf_qual_t);
static bool zaudio_resume(device_t dv PMF_FN_ARGS); static bool zaudio_resume(device_t dv, pmf_qual_t);
#define ZAUDIO_OP_SPKR 0 #define ZAUDIO_OP_SPKR 0
#define ZAUDIO_OP_HP 1 #define ZAUDIO_OP_HP 1
@ -369,7 +369,7 @@ fail_i2s:
} }
static bool 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); struct zaudio_softc *sc = device_private(dv);
@ -380,7 +380,7 @@ zaudio_suspend(device_t dv PMF_FN_ARGS)
} }
static bool 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); struct zaudio_softc *sc = device_private(dv);

8
sys/arch/zaurus/dev/zkbd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zkbd.c,v 1.9 2009/01/29 16:00:33 nonaka Exp $ */ /* $NetBSD: zkbd.c,v 1.10 2010/01/08 19:42:11 dyoung Exp $ */
/* $OpenBSD: zaurus_kbd.c,v 1.28 2005/12/21 20:36:03 deraadt Exp $ */ /* $OpenBSD: zaurus_kbd.c,v 1.28 2005/12/21 20:36:03 deraadt Exp $ */
/* /*
@ -18,7 +18,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.9 2009/01/29 16:00:33 nonaka Exp $"); __KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.10 2010/01/08 19:42:11 dyoung Exp $");
#include "opt_wsdisplay_compat.h" #include "opt_wsdisplay_compat.h"
#include "lcd.h" #include "lcd.h"
@ -131,7 +131,7 @@ static void zkbd_poll(void *v);
static int zkbd_on(void *v); static int zkbd_on(void *v);
static int zkbd_sync(void *v); static int zkbd_sync(void *v);
static int zkbd_hinge(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; int zkbd_modstate;
@ -594,7 +594,7 @@ zkbd_cnpollc(void *v, int on)
} }
static bool 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); struct zkbd_softc *sc = device_private(dv);

12
sys/arch/zaurus/dev/zlcd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zlcd.c,v 1.9 2009/01/29 16:00:33 nonaka Exp $ */ /* $NetBSD: zlcd.c,v 1.10 2010/01/08 19:42:11 dyoung Exp $ */
/* $OpenBSD: zaurus_lcd.c,v 1.20 2006/06/02 20:50:14 miod 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 */ /* NetBSD: lubbock_lcd.c,v 1.1 2003/08/09 19:38:53 bsh Exp */
@ -43,7 +43,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: zlcd.c,v 1.9 2009/01/29 16:00:33 nonaka Exp $"); __KERNEL_RCSID(0, "$NetBSD: zlcd.c,v 1.10 2010/01/08 19:42:11 dyoung Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -154,8 +154,8 @@ static void lcd_attach(device_t, device_t, void *);
CFATTACH_DECL_NEW(zlcd, sizeof(struct pxa2x0_lcd_softc), CFATTACH_DECL_NEW(zlcd, sizeof(struct pxa2x0_lcd_softc),
lcd_match, lcd_attach, NULL, NULL); lcd_match, lcd_attach, NULL, NULL);
static bool lcd_suspend(device_t dv PMF_FN_ARGS); static bool lcd_suspend(device_t dv, pmf_qual_t);
static bool lcd_resume(device_t dv PMF_FN_ARGS); static bool lcd_resume(device_t dv, pmf_qual_t);
void lcd_cnattach(void); void lcd_cnattach(void);
int lcd_max_brightness(void); int lcd_max_brightness(void);
@ -208,7 +208,7 @@ lcd_cnattach(void)
* power management * power management
*/ */
static bool 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); struct pxa2x0_lcd_softc *sc = device_private(dv);
@ -219,7 +219,7 @@ lcd_suspend(device_t dv PMF_FN_ARGS)
} }
static bool 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); struct pxa2x0_lcd_softc *sc = device_private(dv);

8
sys/arch/zaurus/dev/zssp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zssp.c,v 1.7 2009/03/11 09:10:39 nonaka Exp $ */ /* $NetBSD: zssp.c,v 1.8 2010/01/08 19:42:11 dyoung Exp $ */
/* $OpenBSD: zaurus_ssp.c,v 1.6 2005/04/08 21:58:49 uwe Exp $ */ /* $OpenBSD: zaurus_ssp.c,v 1.6 2005/04/08 21:58:49 uwe Exp $ */
/* /*
@ -18,7 +18,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: zssp.c,v 1.7 2009/03/11 09:10:39 nonaka Exp $"); __KERNEL_RCSID(0, "$NetBSD: zssp.c,v 1.8 2010/01/08 19:42:11 dyoung Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -54,7 +54,7 @@ CFATTACH_DECL_NEW(zssp, sizeof(struct zssp_softc),
zssp_match, zssp_attach, NULL, NULL); zssp_match, zssp_attach, NULL, NULL);
static void zssp_init(void); 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; static struct zssp_softc *zssp_sc;
@ -116,7 +116,7 @@ zssp_init(void)
} }
static bool static bool
zssp_resume(device_t dv PMF_FN_ARGS) zssp_resume(device_t dv, pmf_qual_t qual)
{ {
int s; int s;

12
sys/arch/zaurus/dev/ztp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ztp.c,v 1.8 2009/12/12 07:49:31 nonaka Exp $ */ /* $NetBSD: ztp.c,v 1.9 2010/01/08 19:42:11 dyoung Exp $ */
/* $OpenBSD: zts.c,v 1.9 2005/04/24 18:55:49 uwe Exp $ */ /* $OpenBSD: zts.c,v 1.9 2005/04/24 18:55:49 uwe Exp $ */
/* /*
@ -18,7 +18,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ztp.c,v 1.8 2009/12/12 07:49:31 nonaka Exp $"); __KERNEL_RCSID(0, "$NetBSD: ztp.c,v 1.9 2010/01/08 19:42:11 dyoung Exp $");
#include "lcd.h" #include "lcd.h"
@ -116,8 +116,8 @@ CFATTACH_DECL_NEW(ztp, sizeof(struct ztp_softc),
static int ztp_enable(void *); static int ztp_enable(void *);
static void ztp_disable(void *); static void ztp_disable(void *);
static bool ztp_suspend(device_t dv PMF_FN_ARGS); static bool ztp_suspend(device_t dv, pmf_qual_t);
static bool ztp_resume(device_t dv PMF_FN_ARGS); static bool ztp_resume(device_t dv, pmf_qual_t);
static void ztp_poll(void *); static void ztp_poll(void *);
static int ztp_irq(void *); static int ztp_irq(void *);
static int ztp_ioctl(void *, u_long, void *, int, struct lwp *); static int ztp_ioctl(void *, u_long, void *, int, struct lwp *);
@ -237,7 +237,7 @@ ztp_disable(void *v)
} }
static bool 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); struct ztp_softc *sc = device_private(dv);
@ -258,7 +258,7 @@ ztp_suspend(device_t dv PMF_FN_ARGS)
} }
static bool 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); struct ztp_softc *sc = device_private(dv);

12
sys/dev/ata/ata.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ata.c,v 1.109 2009/11/12 19:20:08 dyoung Exp $ */ /* $NetBSD: ata.c,v 1.110 2010/01/08 19:48:11 dyoung Exp $ */
/* /*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@ -25,7 +25,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.109 2009/11/12 19:20:08 dyoung Exp $"); __KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.110 2010/01/08 19:48:11 dyoung Exp $");
#include "opt_ata.h" #include "opt_ata.h"
@ -106,8 +106,8 @@ const struct cdevsw atabus_cdevsw = {
extern struct cfdriver atabus_cd; extern struct cfdriver atabus_cd;
static void atabus_childdetached(device_t, device_t); static void atabus_childdetached(device_t, device_t);
static bool atabus_resume(device_t PMF_FN_PROTO); static bool atabus_resume(device_t, pmf_qual_t);
static bool atabus_suspend(device_t PMF_FN_PROTO); static bool atabus_suspend(device_t, pmf_qual_t);
static void atabusconfig_thread(void *); static void atabusconfig_thread(void *);
/* /*
@ -1525,7 +1525,7 @@ atabusioctl(dev_t dev, u_long cmd, void *addr, int flag,
}; };
static bool 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 atabus_softc *sc = device_private(dv);
struct ata_channel *chp = sc->sc_chan; struct ata_channel *chp = sc->sc_chan;
@ -1536,7 +1536,7 @@ atabus_suspend(device_t dv PMF_FN_ARGS)
} }
static bool 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 atabus_softc *sc = device_private(dv);
struct ata_channel *chp = sc->sc_chan; struct ata_channel *chp = sc->sc_chan;

8
sys/dev/ata/wd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wd.c,v 1.380 2009/12/17 21:03:10 bouyer Exp $ */ /* $NetBSD: wd.c,v 1.381 2010/01/08 19:48:12 dyoung Exp $ */
/* /*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@ -54,7 +54,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.380 2009/12/17 21:03:10 bouyer Exp $"); __KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.381 2010/01/08 19:48:12 dyoung Exp $");
#include "opt_ata.h" #include "opt_ata.h"
@ -126,7 +126,7 @@ int wdprint(void *, char *);
void wdperror(const struct wd_softc *); void wdperror(const struct wd_softc *);
static int wdlastclose(device_t); 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); static int wd_standby(struct wd_softc *, int);
CFATTACH_DECL3_NEW(wd, sizeof(struct wd_softc), CFATTACH_DECL3_NEW(wd, sizeof(struct wd_softc),
@ -394,7 +394,7 @@ wdattach(device_t parent, device_t self, void *aux)
} }
static bool 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); struct wd_softc *sc = device_private(dv);

8
sys/dev/cardbus/cardbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cardbus.c,v 1.98 2009/12/15 22:17:12 snj Exp $ */ /* $NetBSD: cardbus.c,v 1.99 2010/01/08 19:47:42 dyoung Exp $ */
/* /*
* Copyright (c) 1997, 1998, 1999 and 2000 * Copyright (c) 1997, 1998, 1999 and 2000
@ -27,7 +27,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.98 2009/12/15 22:17:12 snj Exp $"); __KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.99 2010/01/08 19:47:42 dyoung Exp $");
#include "opt_cardbus.h" #include "opt_cardbus.h"
@ -1166,7 +1166,7 @@ struct cardbus_child_power {
}; };
static bool 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); 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 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); struct cardbus_child_power *priv = device_pmf_bus_private(dv);

12
sys/dev/cardbus/ehci_cardbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ehci_cardbus.c,v 1.23 2009/05/12 12:11:17 cegger Exp $ */ /* $NetBSD: ehci_cardbus.c,v 1.24 2010/01/08 19:47:42 dyoung Exp $ */
/* /*
* Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.23 2009/05/12 12:11:17 cegger Exp $"); __KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.24 2010/01/08 19:47:42 dyoung Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -102,9 +102,9 @@ ehci_cardbus_match(device_t parent, cfdata_t match, void *aux)
} }
static bool 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 #if 0
struct ehci_cardbus_softc *sc = device_private(dv); struct ehci_cardbus_softc *sc = device_private(dv);
ehci_release_ownership(&sc->sc, sc->sc_pc, sc->sc_tag); 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 static bool
ehci_cardbus_resume(device_t dv PMF_FN_ARGS) ehci_cardbus_resume(device_t dv, pmf_qual_t qual)
{ {
#if 0 #if 0
struct ehci_cardbus_softc *sc = device_private(dv); struct ehci_cardbus_softc *sc = device_private(dv);
ehci_get_ownership(&sc->sc, sc->sc_pc, sc->sc_tag); ehci_get_ownership(&sc->sc, sc->sc_pc, sc->sc_tag);
#endif #endif
return ehci_resume(dv PMF_FN_CALL); return ehci_resume(dv, qual);
} }
void void

8
sys/dev/cardbus/if_ath_cardbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ath_cardbus.c,v 1.36 2009/10/21 14:15:52 rmind Exp $ */ /* $NetBSD: if_ath_cardbus.c,v 1.37 2010/01/08 19:47:42 dyoung Exp $ */
/* /*
* Copyright (c) 2003 * Copyright (c) 2003
* Ichiro FUKUHARA <ichiro@ichiro.org>. * Ichiro FUKUHARA <ichiro@ichiro.org>.
@ -30,7 +30,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.36 2009/10/21 14:15:52 rmind Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.37 2010/01/08 19:47:42 dyoung Exp $");
#include "opt_inet.h" #include "opt_inet.h"
#include "bpfilter.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 *); void ath_cardbus_setup(struct ath_cardbus_softc *);
static bool 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); struct ath_cardbus_softc *csc = device_private(self);
@ -128,7 +128,7 @@ ath_cardbus_suspend(device_t self PMF_FN_ARGS)
} }
static bool 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); struct ath_cardbus_softc *csc = device_private(self);

14
sys/dev/cardbus/if_atw_cardbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_atw_cardbus.c,v 1.27 2009/09/16 16:34:50 dyoung Exp $ */ /* $NetBSD: if_atw_cardbus.c,v 1.28 2010/01/08 19:47:42 dyoung Exp $ */
/*- /*-
* Copyright (c) 1999, 2000, 2003 The NetBSD Foundation, Inc. * Copyright (c) 1999, 2000, 2003 The NetBSD Foundation, Inc.
@ -36,7 +36,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.27 2009/09/16 16:34:50 dyoung Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.28 2010/01/08 19:47:42 dyoung Exp $");
#include "opt_inet.h" #include "opt_inet.h"
#include "bpfilter.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 void atw_cardbus_setup(struct atw_cardbus_softc *);
static bool atw_cardbus_suspend(device_t PMF_FN_PROTO); static bool atw_cardbus_suspend(device_t, pmf_qual_t);
static bool atw_cardbus_resume(device_t PMF_FN_PROTO); static bool atw_cardbus_resume(device_t, pmf_qual_t);
static const struct atw_cardbus_product *atw_cardbus_lookup static const struct atw_cardbus_product *atw_cardbus_lookup
(const struct cardbus_attach_args *); (const struct cardbus_attach_args *);
@ -327,7 +327,7 @@ atw_cardbus_detach(device_t self, int flags)
} }
static bool 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_cardbus_softc *csc = device_private(self);
struct atw_softc *sc = &csc->sc_atw; struct atw_softc *sc = &csc->sc_atw;
@ -349,7 +349,7 @@ atw_cardbus_resume(device_t self PMF_FN_ARGS)
} }
static bool 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); struct atw_cardbus_softc *csc = device_private(self);
cardbus_devfunc_t ct = csc->sc_ct; 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); cardbus_intr_disestablish(cc, cf, csc->sc_ih);
csc->sc_ih = NULL; csc->sc_ih = NULL;
return atw_suspend(self PMF_FN_CALL); return atw_suspend(self, qual);
} }
static void static void

16
sys/dev/cardbus/if_rtw_cardbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_rtw_cardbus.c,v 1.32 2009/10/19 23:19:39 rmind Exp $ */ /* $NetBSD: if_rtw_cardbus.c,v 1.33 2010/01/08 19:47:42 dyoung Exp $ */
/*- /*-
* Copyright (c) 2004, 2005 David Young. All rights reserved. * Copyright (c) 2004, 2005 David Young. All rights reserved.
@ -64,7 +64,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.32 2009/10/19 23:19:39 rmind Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.33 2010/01/08 19:47:42 dyoung Exp $");
#include "opt_inet.h" #include "opt_inet.h"
#include "bpfilter.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 *); void rtw_cardbus_setup(struct rtw_cardbus_softc *);
bool rtw_cardbus_resume(device_t PMF_FN_PROTO); bool rtw_cardbus_resume(device_t, pmf_qual_t);
bool rtw_cardbus_suspend(device_t PMF_FN_PROTO); bool rtw_cardbus_suspend(device_t, pmf_qual_t);
const struct rtw_cardbus_product *rtw_cardbus_lookup( const struct rtw_cardbus_product *rtw_cardbus_lookup(
const struct cardbus_attach_args *); const struct cardbus_attach_args *);
@ -338,7 +338,7 @@ rtw_cardbus_detach(device_t self, int flags)
} }
bool 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_cardbus_softc *csc = device_private(self);
struct rtw_softc *sc = &csc->sc_rtw; 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_FEMR, RTW_FEMR_INTR);
RTW_WRITE(&sc->sc_regs, RTW_FER, RTW_FER_INTR); RTW_WRITE(&sc->sc_regs, RTW_FER, RTW_FER_INTR);
return rtw_resume(self PMF_FN_CALL); return rtw_resume(self, qual);
} }
bool 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_cardbus_softc *csc = device_private(self);
struct rtw_softc *sc = &csc->sc_rtw; 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_chipset_tag_t cc = ct->ct_cc;
cardbus_function_tag_t cf = ct->ct_cf; cardbus_function_tag_t cf = ct->ct_cf;
if (!rtw_suspend(self PMF_FN_CALL)) if (!rtw_suspend(self, qual))
return false; return false;
RTW_WRITE(&sc->sc_regs, RTW_FEMR, RTW_WRITE(&sc->sc_regs, RTW_FEMR,

6
sys/dev/cardbus/siisata_cardbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: siisata_cardbus.c,v 1.2 2009/10/19 18:41:12 bouyer Exp $ */ /* $NetBSD: siisata_cardbus.c,v 1.3 2010/01/08 19:47:42 dyoung Exp $ */
/* Id: siisata_pci.c,v 1.11 2008/05/21 16:20:11 jakllsch Exp */ /* Id: siisata_pci.c,v 1.11 2008/05/21 16:20:11 jakllsch Exp */
/* /*
@ -83,7 +83,7 @@ struct siisata_cardbus_softc {
static int siisata_cardbus_match(device_t, cfdata_t, void *); static int siisata_cardbus_match(device_t, cfdata_t, void *);
static void siisata_cardbus_attach(device_t, device_t, void *); static void siisata_cardbus_attach(device_t, device_t, void *);
static int siisata_cardbus_detach(device_t, int); 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 { static const struct siisata_cardbus_product {
cardbus_vendor_id_t scp_vendor; cardbus_vendor_id_t scp_vendor;
@ -297,7 +297,7 @@ siisata_cardbus_detach(device_t self, int flags)
} }
static bool 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_cardbus_softc *csc = device_private(dv);
struct siisata_softc *sc = &csc->si_sc; struct siisata_softc *sc = &csc->si_sc;

8
sys/dev/gpio/gpio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gpio.c,v 1.29 2009/11/05 18:20:40 dyoung Exp $ */ /* $NetBSD: gpio.c,v 1.30 2010/01/08 19:48:18 dyoung Exp $ */
/* $OpenBSD: gpio.c,v 1.6 2006/01/14 12:33:49 grange Exp $ */ /* $OpenBSD: gpio.c,v 1.6 2006/01/14 12:33:49 grange Exp $ */
/* /*
@ -19,7 +19,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.29 2009/11/05 18:20:40 dyoung Exp $"); __KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.30 2010/01/08 19:48:18 dyoung Exp $");
/* /*
* General Purpose Input/Output framework. * 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 *); void gpio_attach(device_t, device_t, void *);
int gpio_rescan(device_t, const char *, const int *); int gpio_rescan(device_t, const char *, const int *);
void gpio_childdetached(device_t, device_t); 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_detach(device_t, int);
int gpio_search(device_t, cfdata_t, const int *, void *); int gpio_search(device_t, cfdata_t, const int *, void *);
int gpio_print(void *, const char *); int gpio_print(void *, const char *);
@ -108,7 +108,7 @@ gpio_submatch(device_t parent, cfdata_t cf, const int *ip, void *aux)
} }
bool 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); struct gpio_softc *sc = device_private(self);
int pin; int pin;

8
sys/dev/wscons/wsdisplay.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsdisplay.c,v 1.126 2009/01/22 20:40:20 drochner Exp $ */ /* $NetBSD: wsdisplay.c,v 1.127 2010/01/08 19:51:11 dyoung Exp $ */
/* /*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -31,7 +31,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.126 2009/01/22 20:40:20 drochner Exp $"); __KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.127 2010/01/08 19:51:11 dyoung Exp $");
#include "opt_wsdisplay_compat.h" #include "opt_wsdisplay_compat.h"
#include "opt_wsmsgattrs.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 void wsdisplay_emul_attach(device_t, device_t, void *);
static int wsdisplay_noemul_match(device_t, cfdata_t, void *); static int wsdisplay_noemul_match(device_t, cfdata_t, void *);
static void wsdisplay_noemul_attach(device_t, device_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), CFATTACH_DECL_NEW(wsdisplay_emul, sizeof (struct wsdisplay_softc),
wsdisplay_emul_match, wsdisplay_emul_attach, NULL, NULL); wsdisplay_emul_match, wsdisplay_emul_attach, NULL, NULL);
@ -677,7 +677,7 @@ wsdisplay_handlex(int resume)
} }
static bool 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); struct wsdisplay_softc *sc = device_private(dv);
#ifdef DIAGNOSTIC #ifdef DIAGNOSTIC

8
sys/dev/wscons/wskbd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wskbd.c,v 1.122 2009/01/15 04:22:11 yamt Exp $ */ /* $NetBSD: wskbd.c,v 1.123 2010/01/08 19:51:11 dyoung Exp $ */
/* /*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -105,7 +105,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.122 2009/01/15 04:22:11 yamt Exp $"); __KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.123 2010/01/08 19:51:11 dyoung Exp $");
#include "opt_ddb.h" #include "opt_ddb.h"
#include "opt_kgdb.h" #include "opt_kgdb.h"
@ -347,7 +347,7 @@ struct wssrcops wskbd_srcops = {
}; };
#endif #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 void wskbd_repeat(void *v);
static int wskbd_console_initted; static int wskbd_console_initted;
@ -505,7 +505,7 @@ wskbd_attach(device_t parent, device_t self, void *aux)
} }
static bool 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); struct wskbd_softc *sc = device_private(dv);

8
sys/dev/wsfb/genfbvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: genfbvar.h,v 1.11 2009/08/24 11:03:44 jmcneill Exp $ */ /* $NetBSD: genfbvar.h,v 1.12 2010/01/08 19:51:11 dyoung Exp $ */
/*- /*-
* Copyright (c) 2007 Michael Lorenz * Copyright (c) 2007 Michael Lorenz
@ -27,7 +27,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v 1.11 2009/08/24 11:03:44 jmcneill Exp $"); __KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v 1.12 2010/01/08 19:51:11 dyoung Exp $");
#ifndef GENFBVAR_H #ifndef GENFBVAR_H
#define GENFBVAR_H #define GENFBVAR_H
@ -57,8 +57,8 @@ struct genfb_colormap_callback {
}; };
struct genfb_pmf_callback { struct genfb_pmf_callback {
bool (*gpc_suspend)(device_t PMF_FN_PROTO); bool (*gpc_suspend)(device_t, pmf_qual_t);
bool (*gpc_resume)(device_t PMF_FN_PROTO); bool (*gpc_resume)(device_t, pmf_qual_t);
}; };
struct genfb_softc { struct genfb_softc {

4
sys/external/bsd/drm/dist/bsd-core/i915_drv.c vendored
View File

@ -163,7 +163,7 @@ MODULE_DEPEND(i915, drm, 1, 1, 1);
#elif defined(__NetBSD__) #elif defined(__NetBSD__)
static bool 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); struct drm_device *dev = device_private(self);
@ -172,7 +172,7 @@ i915drm_suspend(device_t self PMF_FN_ARGS)
} }
static bool 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); struct drm_device *dev = device_private(self);

4
sys/external/bsd/drm/dist/bsd-core/radeon_drv.c vendored
View File

@ -135,7 +135,7 @@ MODULE_DEPEND(radeon, drm, 1, 1, 1);
#elif defined(__NetBSD__) #elif defined(__NetBSD__)
static bool 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); struct drm_device *rad_dev = device_private(self);
drm_radeon_cp_stop_t stop_args; drm_radeon_cp_stop_t stop_args;
@ -148,7 +148,7 @@ radeondrm_suspend(device_t self PMF_FN_ARGS)
} }
static bool 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); struct drm_device *rad_dev = device_private(self);
if (radeon_cp_resume(rad_dev, NULL, NULL) != 0) if (radeon_cp_resume(rad_dev, NULL, NULL) != 0)