Module Name: src
Committed By: dyoung
Date: Fri Jan 8 19:47:42 UTC 2010
Modified Files:
src/sys/dev/cardbus: cardbus.c ehci_cardbus.c if_ath_cardbus.c
if_atw_cardbus.c if_rtw_cardbus.c siisata_cardbus.c
Log Message:
Expand PMF_FN_* macros.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sys/dev/cardbus/cardbus.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/cardbus/ehci_cardbus.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/cardbus/if_ath_cardbus.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/cardbus/if_atw_cardbus.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/cardbus/if_rtw_cardbus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/cardbus/siisata_cardbus.c
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/cardbus/cardbus.c
diff -u src/sys/dev/cardbus/cardbus.c:1.98 src/sys/dev/cardbus/cardbus.c:1.99
--- src/sys/dev/cardbus/cardbus.c:1.98 Tue Dec 15 22:17:12 2009
+++ src/sys/dev/cardbus/cardbus.c Fri Jan 8 19:47:42 2010
@@ -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
@@ -27,7 +27,7 @@
*/
#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"
@@ -1166,7 +1166,7 @@
};
static bool
-cardbus_child_suspend(device_t dv PMF_FN_ARGS)
+cardbus_child_suspend(device_t dv, pmf_qual_t qual)
{
struct cardbus_child_power *priv = device_pmf_bus_private(dv);
@@ -1186,7 +1186,7 @@
}
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);
Index: src/sys/dev/cardbus/ehci_cardbus.c
diff -u src/sys/dev/cardbus/ehci_cardbus.c:1.23 src/sys/dev/cardbus/ehci_cardbus.c:1.24
--- src/sys/dev/cardbus/ehci_cardbus.c:1.23 Tue May 12 12:11:17 2009
+++ src/sys/dev/cardbus/ehci_cardbus.c Fri Jan 8 19:47:42 2010
@@ -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.
@@ -31,7 +31,7 @@
*/
#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/systm.h>
@@ -102,9 +102,9 @@
}
static bool
-ehci_cardbus_suspend(device_t dv PMF_FN_ARGS)
+ehci_cardbus_suspend(device_t dv, pmf_qual_t qual)
{
- ehci_suspend(dv PMF_FN_CALL);
+ ehci_suspend(dv, qual);
#if 0
struct ehci_cardbus_softc *sc = device_private(dv);
ehci_release_ownership(&sc->sc, sc->sc_pc, sc->sc_tag);
@@ -114,13 +114,13 @@
}
static bool
-ehci_cardbus_resume(device_t dv PMF_FN_ARGS)
+ehci_cardbus_resume(device_t dv, pmf_qual_t qual)
{
#if 0
struct ehci_cardbus_softc *sc = device_private(dv);
ehci_get_ownership(&sc->sc, sc->sc_pc, sc->sc_tag);
#endif
- return ehci_resume(dv PMF_FN_CALL);
+ return ehci_resume(dv, qual);
}
void
Index: src/sys/dev/cardbus/if_ath_cardbus.c
diff -u src/sys/dev/cardbus/if_ath_cardbus.c:1.36 src/sys/dev/cardbus/if_ath_cardbus.c:1.37
--- src/sys/dev/cardbus/if_ath_cardbus.c:1.36 Wed Oct 21 14:15:52 2009
+++ src/sys/dev/cardbus/if_ath_cardbus.c Fri Jan 8 19:47:42 2010
@@ -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
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -30,7 +30,7 @@
*/
#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 "bpfilter.h"
@@ -114,7 +114,7 @@
void ath_cardbus_setup(struct ath_cardbus_softc *);
static bool
-ath_cardbus_suspend(device_t self PMF_FN_ARGS)
+ath_cardbus_suspend(device_t self, pmf_qual_t qual)
{
struct ath_cardbus_softc *csc = device_private(self);
@@ -128,7 +128,7 @@
}
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);
Index: src/sys/dev/cardbus/if_atw_cardbus.c
diff -u src/sys/dev/cardbus/if_atw_cardbus.c:1.27 src/sys/dev/cardbus/if_atw_cardbus.c:1.28
--- src/sys/dev/cardbus/if_atw_cardbus.c:1.27 Wed Sep 16 16:34:50 2009
+++ src/sys/dev/cardbus/if_atw_cardbus.c Fri Jan 8 19:47:42 2010
@@ -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.
@@ -36,7 +36,7 @@
*/
#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 "bpfilter.h"
@@ -122,8 +122,8 @@
static void atw_cardbus_setup(struct atw_cardbus_softc *);
-static bool atw_cardbus_suspend(device_t PMF_FN_PROTO);
-static bool atw_cardbus_resume(device_t PMF_FN_PROTO);
+static bool atw_cardbus_suspend(device_t, pmf_qual_t);
+static bool atw_cardbus_resume(device_t, pmf_qual_t);
static const struct atw_cardbus_product *atw_cardbus_lookup
(const struct cardbus_attach_args *);
@@ -327,7 +327,7 @@
}
static bool
-atw_cardbus_resume(device_t self PMF_FN_ARGS)
+atw_cardbus_resume(device_t self, pmf_qual_t qual)
{
struct atw_cardbus_softc *csc = device_private(self);
struct atw_softc *sc = &csc->sc_atw;
@@ -349,7 +349,7 @@
}
static bool
-atw_cardbus_suspend(device_t self PMF_FN_ARGS)
+atw_cardbus_suspend(device_t self, pmf_qual_t qual)
{
struct atw_cardbus_softc *csc = device_private(self);
cardbus_devfunc_t ct = csc->sc_ct;
@@ -360,7 +360,7 @@
cardbus_intr_disestablish(cc, cf, csc->sc_ih);
csc->sc_ih = NULL;
- return atw_suspend(self PMF_FN_CALL);
+ return atw_suspend(self, qual);
}
static void
Index: src/sys/dev/cardbus/if_rtw_cardbus.c
diff -u src/sys/dev/cardbus/if_rtw_cardbus.c:1.32 src/sys/dev/cardbus/if_rtw_cardbus.c:1.33
--- src/sys/dev/cardbus/if_rtw_cardbus.c:1.32 Mon Oct 19 23:19:39 2009
+++ src/sys/dev/cardbus/if_rtw_cardbus.c Fri Jan 8 19:47:42 2010
@@ -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.
@@ -64,7 +64,7 @@
*/
#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 "bpfilter.h"
@@ -146,8 +146,8 @@
void rtw_cardbus_setup(struct rtw_cardbus_softc *);
-bool rtw_cardbus_resume(device_t PMF_FN_PROTO);
-bool rtw_cardbus_suspend(device_t PMF_FN_PROTO);
+bool rtw_cardbus_resume(device_t, pmf_qual_t);
+bool rtw_cardbus_suspend(device_t, pmf_qual_t);
const struct rtw_cardbus_product *rtw_cardbus_lookup(
const struct cardbus_attach_args *);
@@ -338,7 +338,7 @@
}
bool
-rtw_cardbus_resume(device_t self PMF_FN_ARGS)
+rtw_cardbus_resume(device_t self, pmf_qual_t qual)
{
struct rtw_cardbus_softc *csc = device_private(self);
struct rtw_softc *sc = &csc->sc_rtw;
@@ -362,11 +362,11 @@
RTW_WRITE(&sc->sc_regs, RTW_FEMR, RTW_FEMR_INTR);
RTW_WRITE(&sc->sc_regs, RTW_FER, RTW_FER_INTR);
- return rtw_resume(self PMF_FN_CALL);
+ return rtw_resume(self, qual);
}
bool
-rtw_cardbus_suspend(device_t self PMF_FN_ARGS)
+rtw_cardbus_suspend(device_t self, pmf_qual_t qual)
{
struct rtw_cardbus_softc *csc = device_private(self);
struct rtw_softc *sc = &csc->sc_rtw;
@@ -374,7 +374,7 @@
cardbus_chipset_tag_t cc = ct->ct_cc;
cardbus_function_tag_t cf = ct->ct_cf;
- if (!rtw_suspend(self PMF_FN_CALL))
+ if (!rtw_suspend(self, qual))
return false;
RTW_WRITE(&sc->sc_regs, RTW_FEMR,
Index: src/sys/dev/cardbus/siisata_cardbus.c
diff -u src/sys/dev/cardbus/siisata_cardbus.c:1.2 src/sys/dev/cardbus/siisata_cardbus.c:1.3
--- src/sys/dev/cardbus/siisata_cardbus.c:1.2 Mon Oct 19 18:41:12 2009
+++ src/sys/dev/cardbus/siisata_cardbus.c Fri Jan 8 19:47:42 2010
@@ -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 */
/*
@@ -83,7 +83,7 @@
static int siisata_cardbus_match(device_t, cfdata_t, void *);
static void siisata_cardbus_attach(device_t, device_t, void *);
static int siisata_cardbus_detach(device_t, int);
-static bool siisata_cardbus_resume(device_t PMF_FN_PROTO);
+static bool siisata_cardbus_resume(device_t, pmf_qual_t);
static const struct siisata_cardbus_product {
cardbus_vendor_id_t scp_vendor;
@@ -297,7 +297,7 @@
}
static bool
-siisata_cardbus_resume(device_t dv PMF_FN_ARGS)
+siisata_cardbus_resume(device_t dv, pmf_qual_t qual)
{
struct siisata_cardbus_softc *csc = device_private(dv);
struct siisata_softc *sc = &csc->si_sc;
