Module Name: src
Committed By: dyoung
Date: Fri Jan 8 19:49:14 UTC 2010
Modified Files:
src/sys/arch/mips/atheros/dev: if_ath_arbus.c
src/sys/arch/sparc/dev: fd.c
src/sys/arch/sparc64/dev: fdc.c
Log Message:
Expand PMF_FN_* macros.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/mips/atheros/dev/if_ath_arbus.c
cvs rdiff -u -r1.147 -r1.148 src/sys/arch/sparc/dev/fd.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc64/dev/fdc.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/arch/mips/atheros/dev/if_ath_arbus.c
diff -u src/sys/arch/mips/atheros/dev/if_ath_arbus.c:1.16 src/sys/arch/mips/atheros/dev/if_ath_arbus.c:1.17
--- src/sys/arch/mips/atheros/dev/if_ath_arbus.c:1.16 Mon Jul 6 00:43:23 2009
+++ src/sys/arch/mips/atheros/dev/if_ath_arbus.c Fri Jan 8 19:49:13 2010
@@ -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 <jmcne...@invisible.ca>
@@ -34,7 +34,7 @@
*/
#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/systm.h>
@@ -96,7 +96,7 @@
}
static bool
-ath_arbus_resume(device_t dv PMF_FN_ARGS)
+ath_arbus_resume(device_t dv, pmf_qual_t qual)
{
struct ath_arbus_softc *asc = device_private(dv);
ath_resume(&asc->sc_ath);
Index: src/sys/arch/sparc/dev/fd.c
diff -u src/sys/arch/sparc/dev/fd.c:1.147 src/sys/arch/sparc/dev/fd.c:1.148
--- src/sys/arch/sparc/dev/fd.c:1.147 Sat Dec 19 10:34:18 2009
+++ src/sys/arch/sparc/dev/fd.c Fri Jan 8 19:49:13 2010
@@ -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.
@@ -101,7 +101,7 @@
*/
#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_md.h"
@@ -292,7 +292,7 @@
int fdmatch(struct device *, struct cfdata *, void *);
void fdattach(struct device *, struct device *, void *);
bool fdshutdown(device_t, int);
-bool fdsuspend(device_t PMF_FN_PROTO);
+bool fdsuspend(device_t, pmf_qual_t);
CFATTACH_DECL(fd, sizeof(struct fd_softc),
fdmatch, fdattach, NULL, NULL);
@@ -809,7 +809,7 @@
return true;
}
-bool fdsuspend(device_t self PMF_FN_ARGS)
+bool fdsuspend(device_t self, pmf_qual_t qual)
{
return fdshutdown(self, boothowto);
Index: src/sys/arch/sparc64/dev/fdc.c
diff -u src/sys/arch/sparc64/dev/fdc.c:1.31 src/sys/arch/sparc64/dev/fdc.c:1.32
--- src/sys/arch/sparc64/dev/fdc.c:1.31 Fri May 15 20:52:22 2009
+++ src/sys/arch/sparc64/dev/fdc.c Fri Jan 8 19:49:14 2010
@@ -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.
@@ -101,7 +101,7 @@
*/
#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_md.h"
@@ -324,7 +324,7 @@
int fdmatch(struct device *, struct cfdata *, void *);
void fdattach(struct device *, struct device *, void *);
bool fdshutdown(device_t, int);
-bool fdsuspend(device_t PMF_FN_PROTO);
+bool fdsuspend(device_t, pmf_qual_t);
CFATTACH_DECL(fd, sizeof(struct fd_softc),
fdmatch, fdattach, NULL, NULL);
@@ -979,7 +979,7 @@
return true;
}
-bool fdsuspend(device_t self PMF_FN_ARGS)
+bool fdsuspend(device_t self, pmf_qual_t qual)
{
return fdshutdown(self, boothowto);
