Module Name: src
Committed By: dyoung
Date: Fri Jan 8 19:53:10 UTC 2010
Modified Files:
src/sys/dev/sdmmc: sdhc.c sdhcvar.h
Log Message:
Expand PMF_FN_* macros.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/sdmmc/sdhcvar.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/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.3 src/sys/dev/sdmmc/sdhc.c:1.4
--- src/sys/dev/sdmmc/sdhc.c:1.3 Fri Oct 2 04:33:58 2009
+++ src/sys/dev/sdmmc/sdhc.c Fri Jan 8 19:53:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.3 2009/10/02 04:33:58 uebayasi Exp $ */
+/* $NetBSD: sdhc.c,v 1.4 2010/01/08 19:53:10 dyoung Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.3 2009/10/02 04:33:58 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.4 2010/01/08 19:53:10 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -310,7 +310,7 @@
}
bool
-sdhc_suspend(device_t dev PMF_FN_ARGS)
+sdhc_suspend(device_t dev, pmf_qual_t qual)
{
struct sdhc_softc *sc = device_private(dev);
struct sdhc_host *hp;
@@ -329,7 +329,7 @@
}
bool
-sdhc_resume(device_t dev PMF_FN_ARGS)
+sdhc_resume(device_t dev, pmf_qual_t qual)
{
struct sdhc_softc *sc = device_private(dev);
struct sdhc_host *hp;
Index: src/sys/dev/sdmmc/sdhcvar.h
diff -u src/sys/dev/sdmmc/sdhcvar.h:1.1 src/sys/dev/sdmmc/sdhcvar.h:1.2
--- src/sys/dev/sdmmc/sdhcvar.h:1.1 Tue Apr 21 03:00:30 2009
+++ src/sys/dev/sdmmc/sdhcvar.h Fri Jan 8 19:53:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhcvar.h,v 1.1 2009/04/21 03:00:30 nonaka Exp $ */
+/* $NetBSD: sdhcvar.h,v 1.2 2010/01/08 19:53:10 dyoung Exp $ */
/* $OpenBSD: sdhcvar.h,v 1.3 2007/09/06 08:01:01 jsg Exp $ */
/*
@@ -44,8 +44,8 @@
int sdhc_host_found(struct sdhc_softc *, bus_space_tag_t,
bus_space_handle_t, bus_size_t);
int sdhc_intr(void *);
-bool sdhc_suspend(device_t dev PMF_FN_ARGS);
-bool sdhc_resume(device_t dev PMF_FN_ARGS);
+bool sdhc_suspend(device_t dev, pmf_qual_t qual);
+bool sdhc_resume(device_t dev, pmf_qual_t qual);
bool sdhc_shutdown(device_t dev, int flags);
#endif /* _SDHCVAR_H_ */
