Module Name: src
Committed By: dyoung
Date: Fri Jan 8 20:02:39 UTC 2010
Modified Files:
src/sys/dev/ic: aic79xx_osm.c aic7xxx_osm.c atw.c atwvar.h bwi.c
bwivar.h com.c comvar.h gem.c gemvar.h hpet.c ne2000.c ne2000var.h
pckbc.c pckbcvar.h rtw.c rtwvar.h spic.c spicvar.h
Log Message:
Expand PMF_FN_* macros.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ic/aic79xx_osm.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/ic/aic7xxx_osm.c
cvs rdiff -u -r1.147 -r1.148 src/sys/dev/ic/atw.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/ic/atwvar.h
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/ic/bwi.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/bwivar.h
cvs rdiff -u -r1.292 -r1.293 src/sys/dev/ic/com.c
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/ic/comvar.h
cvs rdiff -u -r1.89 -r1.90 src/sys/dev/ic/gem.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/ic/gemvar.h
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/hpet.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/ic/ne2000.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/ic/ne2000var.h
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/ic/pckbc.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/ic/pckbcvar.h src/sys/dev/ic/spic.c
cvs rdiff -u -r1.110 -r1.111 src/sys/dev/ic/rtw.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/ic/rtwvar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/spicvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/aic79xx_osm.c
diff -u src/sys/dev/ic/aic79xx_osm.c:1.29 src/sys/dev/ic/aic79xx_osm.c:1.30
--- src/sys/dev/ic/aic79xx_osm.c:1.29 Sat Sep 26 14:44:10 2009
+++ src/sys/dev/ic/aic79xx_osm.c Fri Jan 8 20:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx_osm.c,v 1.29 2009/09/26 14:44:10 tsutsui Exp $ */
+/* $NetBSD: aic79xx_osm.c,v 1.30 2010/01/08 20:02:39 dyoung Exp $ */
/*
* Bus independent NetBSD shim for the aic7xxx based adaptec SCSI controllers
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic79xx_osm.c,v 1.29 2009/09/26 14:44:10 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic79xx_osm.c,v 1.30 2010/01/08 20:02:39 dyoung Exp $");
#include <dev/ic/aic79xx_osm.h>
#include <dev/ic/aic79xx_inline.h>
@@ -64,8 +64,8 @@
static void ahd_set_recoveryscb(struct ahd_softc *ahd, struct scb *scb);
#endif
-static bool ahd_pmf_suspend(device_t PMF_FN_PROTO);
-static bool ahd_pmf_resume(device_t PMF_FN_PROTO);
+static bool ahd_pmf_suspend(device_t, pmf_qual_t);
+static bool ahd_pmf_resume(device_t, pmf_qual_t);
static bool ahd_pmf_shutdown(device_t, int);
/*
@@ -118,7 +118,7 @@
}
static bool
-ahd_pmf_suspend(device_t dev PMF_FN_ARGS)
+ahd_pmf_suspend(device_t dev, pmf_qual_t qual)
{
struct ahd_softc *sc = device_private(dev);
#if 0
@@ -130,7 +130,7 @@
}
static bool
-ahd_pmf_resume(device_t dev PMF_FN_ARGS)
+ahd_pmf_resume(device_t dev, pmf_qual_t qual)
{
#if 0
struct ahd_softc *sc = device_private(dev);
Index: src/sys/dev/ic/aic7xxx_osm.c
diff -u src/sys/dev/ic/aic7xxx_osm.c:1.35 src/sys/dev/ic/aic7xxx_osm.c:1.36
--- src/sys/dev/ic/aic7xxx_osm.c:1.35 Tue Sep 22 13:26:54 2009
+++ src/sys/dev/ic/aic7xxx_osm.c Fri Jan 8 20:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx_osm.c,v 1.35 2009/09/22 13:26:54 tsutsui Exp $ */
+/* $NetBSD: aic7xxx_osm.c,v 1.36 2010/01/08 20:02:39 dyoung Exp $ */
/*
* Bus independent FreeBSD shim for the aic7xxx based adaptec SCSI controllers
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic7xxx_osm.c,v 1.35 2009/09/22 13:26:54 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic7xxx_osm.c,v 1.36 2010/01/08 20:02:39 dyoung Exp $");
#include <dev/ic/aic7xxx_osm.h>
#include <dev/ic/aic7xxx_inline.h>
@@ -60,8 +60,8 @@
static int ahc_ioctl(struct scsipi_channel *channel, u_long cmd,
void *addr, int flag, struct proc *p);
-static bool ahc_pmf_suspend(device_t PMF_FN_PROTO);
-static bool ahc_pmf_resume(device_t PMF_FN_PROTO);
+static bool ahc_pmf_suspend(device_t, pmf_qual_t);
+static bool ahc_pmf_resume(device_t, pmf_qual_t);
static bool ahc_pmf_shutdown(device_t, int);
@@ -144,7 +144,7 @@
*/
static bool
-ahc_pmf_suspend(device_t dev PMF_FN_ARGS)
+ahc_pmf_suspend(device_t dev, pmf_qual_t qual)
{
struct ahc_softc *sc = device_private(dev);
#if 0
@@ -156,7 +156,7 @@
}
static bool
-ahc_pmf_resume(device_t dev PMF_FN_ARGS)
+ahc_pmf_resume(device_t dev, pmf_qual_t qual)
{
#if 0
struct ahc_softc *sc = device_private(dev);
Index: src/sys/dev/ic/atw.c
diff -u src/sys/dev/ic/atw.c:1.147 src/sys/dev/ic/atw.c:1.148
--- src/sys/dev/ic/atw.c:1.147 Thu Nov 12 19:30:49 2009
+++ src/sys/dev/ic/atw.c Fri Jan 8 20:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: atw.c,v 1.147 2009/11/12 19:30:49 dyoung Exp $ */
+/* $NetBSD: atw.c,v 1.148 2010/01/08 20:02:39 dyoung Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.147 2009/11/12 19:30:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.148 2010/01/08 20:02:39 dyoung Exp $");
#include "bpfilter.h"
@@ -321,7 +321,7 @@
}
bool
-atw_suspend(device_t self PMF_FN_ARGS)
+atw_suspend(device_t self, pmf_qual_t qual)
{
struct atw_softc *sc = device_private(self);
Index: src/sys/dev/ic/atwvar.h
diff -u src/sys/dev/ic/atwvar.h:1.33 src/sys/dev/ic/atwvar.h:1.34
--- src/sys/dev/ic/atwvar.h:1.33 Wed Sep 16 16:34:50 2009
+++ src/sys/dev/ic/atwvar.h Fri Jan 8 20:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: atwvar.h,v 1.33 2009/09/16 16:34:50 dyoung Exp $ */
+/* $NetBSD: atwvar.h,v 1.34 2010/01/08 20:02:39 dyoung Exp $ */
/*
* Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. All rights reserved.
@@ -448,6 +448,6 @@
int atw_activate(device_t, enum devact);
int atw_intr(void *arg);
bool atw_shutdown(device_t, int);
-bool atw_suspend(device_t PMF_FN_PROTO);
+bool atw_suspend(device_t, pmf_qual_t);
#endif /* _DEV_IC_ATWVAR_H_ */
Index: src/sys/dev/ic/bwi.c
diff -u src/sys/dev/ic/bwi.c:1.11 src/sys/dev/ic/bwi.c:1.12
--- src/sys/dev/ic/bwi.c:1.11 Sat Jul 25 23:43:06 2009
+++ src/sys/dev/ic/bwi.c Fri Jan 8 20:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bwi.c,v 1.11 2009/07/25 23:43:06 cegger Exp $ */
+/* $NetBSD: bwi.c,v 1.12 2010/01/08 20:02:39 dyoung Exp $ */
/* $OpenBSD: bwi.c,v 1.74 2008/02/25 21:13:30 mglocker Exp $ */
/*
@@ -49,7 +49,7 @@
#include "bpfilter.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.11 2009/07/25 23:43:06 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwi.c,v 1.12 2010/01/08 20:02:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -9729,7 +9729,7 @@
}
bool
-bwi_suspend(device_t dv PMF_FN_ARGS)
+bwi_suspend(device_t dv, pmf_qual_t qual)
{
struct bwi_softc *sc = device_private(dv);
@@ -9739,7 +9739,7 @@
}
bool
-bwi_resume(device_t dv PMF_FN_ARGS)
+bwi_resume(device_t dv, pmf_qual_t qual)
{
struct bwi_softc *sc = device_private(dv);
Index: src/sys/dev/ic/bwivar.h
diff -u src/sys/dev/ic/bwivar.h:1.4 src/sys/dev/ic/bwivar.h:1.5
--- src/sys/dev/ic/bwivar.h:1.4 Sun Apr 26 10:07:48 2009
+++ src/sys/dev/ic/bwivar.h Fri Jan 8 20:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bwivar.h,v 1.4 2009/04/26 10:07:48 cegger Exp $ */
+/* $NetBSD: bwivar.h,v 1.5 2010/01/08 20:02:39 dyoung Exp $ */
/* $OpenBSD: bwivar.h,v 1.23 2008/02/25 20:36:54 mglocker Exp $ */
/*
@@ -792,7 +792,7 @@
void bwi_detach(struct bwi_softc *);
/* Power Management Framework */
-bool bwi_suspend(device_t db PMF_FN_ARGS);
-bool bwi_resume(device_t db PMF_FN_ARGS);
+bool bwi_suspend(device_t, pmf_qual_t);
+bool bwi_resume(device_t, pmf_qual_t);
#endif /* !_DEV_IC_BWIVAR_H */
Index: src/sys/dev/ic/com.c
diff -u src/sys/dev/ic/com.c:1.292 src/sys/dev/ic/com.c:1.293
--- src/sys/dev/ic/com.c:1.292 Sun Dec 6 23:15:59 2009
+++ src/sys/dev/ic/com.c Fri Jan 8 20:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.292 2009/12/06 23:15:59 dyoung Exp $ */
+/* $NetBSD: com.c,v 1.293 2010/01/08 20:02:39 dyoung Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.292 2009/12/06 23:15:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.293 2010/01/08 20:02:39 dyoung Exp $");
#include "opt_com.h"
#include "opt_ddb.h"
@@ -2404,7 +2404,7 @@
}
bool
-com_suspend(device_t self PMF_FN_ARGS)
+com_suspend(device_t self, pmf_qual_t qual)
{
struct com_softc *sc = device_private(self);
@@ -2420,7 +2420,7 @@
}
bool
-com_resume(device_t self PMF_FN_ARGS)
+com_resume(device_t self, pmf_qual_t qual)
{
struct com_softc *sc = device_private(self);
Index: src/sys/dev/ic/comvar.h
diff -u src/sys/dev/ic/comvar.h:1.68 src/sys/dev/ic/comvar.h:1.69
--- src/sys/dev/ic/comvar.h:1.68 Thu Nov 12 20:37:44 2009
+++ src/sys/dev/ic/comvar.h Fri Jan 8 20:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: comvar.h,v 1.68 2009/11/12 20:37:44 dyoung Exp $ */
+/* $NetBSD: comvar.h,v 1.69 2010/01/08 20:02:39 dyoung Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -237,9 +237,9 @@
void com_attach_subr(struct com_softc *);
int com_probe_subr(struct com_regs *);
int com_detach(device_t, int);
-bool com_resume(device_t PMF_FN_PROTO);
+bool com_resume(device_t, pmf_qual_t);
bool com_cleanup(device_t, int);
-bool com_suspend(device_t PMF_FN_PROTO);
+bool com_suspend(device_t, pmf_qual_t);
#ifndef IPL_SERIAL
#define IPL_SERIAL IPL_TTY
Index: src/sys/dev/ic/gem.c
diff -u src/sys/dev/ic/gem.c:1.89 src/sys/dev/ic/gem.c:1.90
--- src/sys/dev/ic/gem.c:1.89 Sat Dec 5 16:43:25 2009
+++ src/sys/dev/ic/gem.c Fri Jan 8 20:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: gem.c,v 1.89 2009/12/05 16:43:25 jdc Exp $ */
+/* $NetBSD: gem.c,v 1.90 2010/01/08 20:02:39 dyoung Exp $ */
/*
*
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.89 2009/12/05 16:43:25 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.90 2010/01/08 20:02:39 dyoung Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -2603,7 +2603,7 @@
}
bool
-gem_resume(device_t self PMF_FN_ARGS)
+gem_resume(device_t self, pmf_qual_t qual)
{
struct gem_softc *sc = device_private(self);
@@ -2613,7 +2613,7 @@
}
bool
-gem_suspend(device_t self PMF_FN_ARGS)
+gem_suspend(device_t self, pmf_qual_t qual)
{
struct gem_softc *sc = device_private(self);
bus_space_tag_t t = sc->sc_bustag;
Index: src/sys/dev/ic/gemvar.h
diff -u src/sys/dev/ic/gemvar.h:1.19 src/sys/dev/ic/gemvar.h:1.20
--- src/sys/dev/ic/gemvar.h:1.19 Mon Jul 27 18:10:53 2009
+++ src/sys/dev/ic/gemvar.h Fri Jan 8 20:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: gemvar.h,v 1.19 2009/07/27 18:10:53 dyoung Exp $ */
+/* $NetBSD: gemvar.h,v 1.20 2010/01/08 20:02:39 dyoung Exp $ */
/*
*
@@ -308,8 +308,8 @@
#ifdef _KERNEL
bool gem_shutdown(device_t, int);
-bool gem_suspend(device_t PMF_FN_PROTO);
-bool gem_resume(device_t PMF_FN_PROTO);
+bool gem_suspend(device_t, pmf_qual_t);
+bool gem_resume(device_t, pmf_qual_t);
void gem_attach(struct gem_softc *, const uint8_t *);
int gem_intr(void *);
int gem_detach(struct gem_softc *, int);
Index: src/sys/dev/ic/hpet.c
diff -u src/sys/dev/ic/hpet.c:1.8 src/sys/dev/ic/hpet.c:1.9
--- src/sys/dev/ic/hpet.c:1.8 Wed Sep 30 15:22:11 2009
+++ src/sys/dev/ic/hpet.c Fri Jan 8 20:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hpet.c,v 1.8 2009/09/30 15:22:11 njoly Exp $ */
+/* $NetBSD: hpet.c,v 1.9 2010/01/08 20:02:39 dyoung Exp $ */
/*
* Copyright (c) 2006 Nicolas Joly
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpet.c,v 1.8 2009/09/30 15:22:11 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpet.c,v 1.9 2010/01/08 20:02:39 dyoung Exp $");
#include <sys/systm.h>
#include <sys/device.h>
@@ -48,7 +48,7 @@
#include <dev/ic/hpetvar.h>
static u_int hpet_get_timecount(struct timecounter *);
-static bool hpet_resume(device_t PMF_FN_PROTO);
+static bool hpet_resume(device_t, pmf_qual_t);
int
hpet_detach(device_t dv, int flags)
@@ -113,7 +113,7 @@
}
static bool
-hpet_resume(device_t dv PMF_FN_ARGS)
+hpet_resume(device_t dv, pmf_qual_t qual)
{
struct hpet_softc *sc = device_private(dv);
uint32_t val;
Index: src/sys/dev/ic/ne2000.c
diff -u src/sys/dev/ic/ne2000.c:1.63 src/sys/dev/ic/ne2000.c:1.64
--- src/sys/dev/ic/ne2000.c:1.63 Sat Jan 2 19:27:41 2010
+++ src/sys/dev/ic/ne2000.c Fri Jan 8 20:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ne2000.c,v 1.63 2010/01/02 19:27:41 christos Exp $ */
+/* $NetBSD: ne2000.c,v 1.64 2010/01/08 20:02:39 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ne2000.c,v 1.63 2010/01/02 19:27:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ne2000.c,v 1.64 2010/01/08 20:02:39 dyoung Exp $");
#include "opt_ipkdb.h"
@@ -917,7 +917,7 @@
#endif
bool
-ne2000_suspend(device_t self PMF_FN_ARGS)
+ne2000_suspend(device_t self, pmf_qual_t qual)
{
struct ne2000_softc *sc = device_private(self);
struct dp8390_softc *dsc = &sc->sc_dp8390;
@@ -933,7 +933,7 @@
}
bool
-ne2000_resume(device_t self PMF_FN_ARGS)
+ne2000_resume(device_t self, pmf_qual_t qual)
{
struct ne2000_softc *sc = device_private(self);
struct dp8390_softc *dsc = &sc->sc_dp8390;
Index: src/sys/dev/ic/ne2000var.h
diff -u src/sys/dev/ic/ne2000var.h:1.22 src/sys/dev/ic/ne2000var.h:1.23
--- src/sys/dev/ic/ne2000var.h:1.22 Sat Jan 2 19:27:41 2010
+++ src/sys/dev/ic/ne2000var.h Fri Jan 8 20:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ne2000var.h,v 1.22 2010/01/02 19:27:41 christos Exp $ */
+/* $NetBSD: ne2000var.h,v 1.23 2010/01/08 20:02:39 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
#endif
/* pmf(9) */
-bool ne2000_suspend(device_t PMF_FN_PROTO);
-bool ne2000_resume(device_t PMF_FN_PROTO);
+bool ne2000_suspend(device_t, pmf_qual_t);
+bool ne2000_resume(device_t, pmf_qual_t);
#endif /* _DEV_IC_NE2000VAR_H_ */
Index: src/sys/dev/ic/pckbc.c
diff -u src/sys/dev/ic/pckbc.c:1.46 src/sys/dev/ic/pckbc.c:1.47
--- src/sys/dev/ic/pckbc.c:1.46 Tue May 12 14:25:18 2009
+++ src/sys/dev/ic/pckbc.c Fri Jan 8 20:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc.c,v 1.46 2009/05/12 14:25:18 cegger Exp $ */
+/* $NetBSD: pckbc.c,v 1.47 2010/01/08 20:02:39 dyoung Exp $ */
/*
* Copyright (c) 2004 Ben Harris.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.46 2009/05/12 14:25:18 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.47 2010/01/08 20:02:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -680,7 +680,7 @@
}
bool
-pckbc_resume(device_t dv PMF_FN_ARGS)
+pckbc_resume(device_t dv, pmf_qual_t qual)
{
struct pckbc_softc *sc = device_private(dv);
struct pckbc_internal *t;
Index: src/sys/dev/ic/pckbcvar.h
diff -u src/sys/dev/ic/pckbcvar.h:1.15 src/sys/dev/ic/pckbcvar.h:1.16
--- src/sys/dev/ic/pckbcvar.h:1.15 Sat Mar 15 13:23:25 2008
+++ src/sys/dev/ic/pckbcvar.h Fri Jan 8 20:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbcvar.h,v 1.15 2008/03/15 13:23:25 cube Exp $ */
+/* $NetBSD: pckbcvar.h,v 1.16 2010/01/08 20:02:39 dyoung Exp $ */
/*
* Copyright (c) 1998
@@ -112,6 +112,6 @@
int pckbc_machdep_cnattach(pckbc_tag_t, pckbc_slot_t);
/* power management */
-bool pckbc_resume(device_t PMF_FN_PROTO);
+bool pckbc_resume(device_t, pmf_qual_t);
#endif /* _DEV_IC_PCKBCVAR_H_ */
Index: src/sys/dev/ic/spic.c
diff -u src/sys/dev/ic/spic.c:1.15 src/sys/dev/ic/spic.c:1.16
--- src/sys/dev/ic/spic.c:1.15 Sun May 4 16:13:35 2008
+++ src/sys/dev/ic/spic.c Fri Jan 8 20:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: spic.c,v 1.15 2008/05/04 16:13:35 xtraeme Exp $ */
+/* $NetBSD: spic.c,v 1.16 2010/01/08 20:02:39 dyoung Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spic.c,v 1.15 2008/05/04 16:13:35 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spic.c,v 1.16 2010/01/08 20:02:39 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -290,7 +290,7 @@
}
bool
-spic_suspend(device_t dev PMF_FN_ARGS)
+spic_suspend(device_t dev, pmf_qual_t qual)
{
struct spic_softc *sc = device_private(dev);
@@ -300,7 +300,7 @@
}
bool
-spic_resume(device_t dev PMF_FN_ARGS)
+spic_resume(device_t dev, pmf_qual_t qual)
{
struct spic_softc *sc = device_private(dev);
Index: src/sys/dev/ic/rtw.c
diff -u src/sys/dev/ic/rtw.c:1.110 src/sys/dev/ic/rtw.c:1.111
--- src/sys/dev/ic/rtw.c:1.110 Mon Oct 19 23:19:39 2009
+++ src/sys/dev/ic/rtw.c Fri Jan 8 20:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rtw.c,v 1.110 2009/10/19 23:19:39 rmind Exp $ */
+/* $NetBSD: rtw.c,v 1.111 2010/01/08 20:02:39 dyoung Exp $ */
/*-
* Copyright (c) 2004, 2005, 2006, 2007 David Young. All rights
* reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.110 2009/10/19 23:19:39 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.111 2010/01/08 20:02:39 dyoung Exp $");
#include "bpfilter.h"
@@ -2493,7 +2493,7 @@
}
bool
-rtw_suspend(device_t self PMF_FN_ARGS)
+rtw_suspend(device_t self, pmf_qual_t qual)
{
int rc;
struct rtw_softc *sc = device_private(self);
@@ -2515,7 +2515,7 @@
}
bool
-rtw_resume(device_t self PMF_FN_ARGS)
+rtw_resume(device_t self, pmf_qual_t qual)
{
struct rtw_softc *sc = device_private(self);
Index: src/sys/dev/ic/rtwvar.h
diff -u src/sys/dev/ic/rtwvar.h:1.39 src/sys/dev/ic/rtwvar.h:1.40
--- src/sys/dev/ic/rtwvar.h:1.39 Mon Oct 19 23:19:39 2009
+++ src/sys/dev/ic/rtwvar.h Fri Jan 8 20:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwvar.h,v 1.39 2009/10/19 23:19:39 rmind Exp $ */
+/* $NetBSD: rtwvar.h,v 1.40 2010/01/08 20:02:39 dyoung Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
*
@@ -502,8 +502,8 @@
int rtw_detach(struct rtw_softc *);
int rtw_intr(void *);
-bool rtw_suspend(device_t PMF_FN_PROTO);
-bool rtw_resume(device_t PMF_FN_PROTO);
+bool rtw_suspend(device_t, pmf_qual_t);
+bool rtw_resume(device_t, pmf_qual_t);
int rtw_activate(device_t, enum devact);
Index: src/sys/dev/ic/spicvar.h
diff -u src/sys/dev/ic/spicvar.h:1.5 src/sys/dev/ic/spicvar.h:1.6
--- src/sys/dev/ic/spicvar.h:1.5 Sun May 4 16:13:35 2008
+++ src/sys/dev/ic/spicvar.h Fri Jan 8 20:02:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: spicvar.h,v 1.5 2008/05/04 16:13:35 xtraeme Exp $ */
+/* $NetBSD: spicvar.h,v 1.6 2010/01/08 20:02:39 dyoung Exp $ */
#include <dev/sysmon/sysmonvar.h>
@@ -23,7 +23,7 @@
};
void spic_attach(struct spic_softc *);
-bool spic_suspend(device_t PMF_FN_PROTO);
-bool spic_resume(device_t PMF_FN_PROTO);
+bool spic_suspend(device_t, pmf_qual_t);
+bool spic_resume(device_t, pmf_qual_t);
int spic_intr(void *);
