Module Name: src
Committed By: dyoung
Date: Fri Jan 8 20:39:04 UTC 2010
Modified Files:
src/sys/dev/usb: ehcivar.h ohci.c ohcivar.h uhci.c uhcivar.h
Log Message:
Expand PMF_FN_* macros.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/usb/ehcivar.h
cvs rdiff -u -r1.204 -r1.205 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/usb/ohcivar.h \
src/sys/dev/usb/uhcivar.h
cvs rdiff -u -r1.230 -r1.231 src/sys/dev/usb/uhci.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/usb/ehcivar.h
diff -u src/sys/dev/usb/ehcivar.h:1.34 src/sys/dev/usb/ehcivar.h:1.35
--- src/sys/dev/usb/ehcivar.h:1.34 Fri Sep 4 17:55:03 2009
+++ src/sys/dev/usb/ehcivar.h Fri Jan 8 20:39:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ehcivar.h,v 1.34 2009/09/04 17:55:03 dyoung Exp $ */
+/* $NetBSD: ehcivar.h,v 1.35 2010/01/08 20:39:03 dyoung Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -187,6 +187,6 @@
int ehci_detach(ehci_softc_t *, int);
int ehci_activate(device_t, enum devact);
void ehci_childdet(device_t, device_t);
-bool ehci_suspend(device_t PMF_FN_PROTO);
-bool ehci_resume(device_t PMF_FN_PROTO);
+bool ehci_suspend(device_t, pmf_qual_t);
+bool ehci_resume(device_t, pmf_qual_t);
bool ehci_shutdown(device_t, int);
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.204 src/sys/dev/usb/ohci.c:1.205
--- src/sys/dev/usb/ohci.c:1.204 Fri Jan 8 16:40:30 2010
+++ src/sys/dev/usb/ohci.c Fri Jan 8 20:39:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.204 2010/01/08 16:40:30 martin Exp $ */
+/* $NetBSD: ohci.c,v 1.205 2010/01/08 20:39:04 dyoung Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */
/*
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.204 2010/01/08 16:40:30 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.205 2010/01/08 20:39:04 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -997,7 +997,7 @@
}
bool
-ohci_resume(device_t dv PMF_FN_ARGS)
+ohci_resume(device_t dv, pmf_qual_t qual)
{
ohci_softc_t *sc = device_private(dv);
uint32_t ctl;
@@ -1032,7 +1032,7 @@
}
bool
-ohci_suspend(device_t dv PMF_FN_ARGS)
+ohci_suspend(device_t dv, pmf_qual_t qual)
{
ohci_softc_t *sc = device_private(dv);
uint32_t ctl;
Index: src/sys/dev/usb/ohcivar.h
diff -u src/sys/dev/usb/ohcivar.h:1.45 src/sys/dev/usb/ohcivar.h:1.46
--- src/sys/dev/usb/ohcivar.h:1.45 Sat Jun 28 17:42:53 2008
+++ src/sys/dev/usb/ohcivar.h Fri Jan 8 20:39:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ohcivar.h,v 1.45 2008/06/28 17:42:53 bouyer Exp $ */
+/* $NetBSD: ohcivar.h,v 1.46 2010/01/08 20:39:04 dyoung Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohcivar.h,v 1.13 1999/11/17 22:33:41 n_hibma Exp $ */
/*
@@ -153,5 +153,5 @@
void ohci_childdet(device_t, device_t);
int ohci_activate(device_t, enum devact);
#endif
-bool ohci_resume(device_t PMF_FN_PROTO);
-bool ohci_suspend(device_t PMF_FN_PROTO);
+bool ohci_resume(device_t, pmf_qual_t);
+bool ohci_suspend(device_t, pmf_qual_t);
Index: src/sys/dev/usb/uhcivar.h
diff -u src/sys/dev/usb/uhcivar.h:1.45 src/sys/dev/usb/uhcivar.h:1.46
--- src/sys/dev/usb/uhcivar.h:1.45 Sat Jun 28 17:42:53 2008
+++ src/sys/dev/usb/uhcivar.h Fri Jan 8 20:39:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uhcivar.h,v 1.45 2008/06/28 17:42:53 bouyer Exp $ */
+/* $NetBSD: uhcivar.h,v 1.46 2010/01/08 20:39:04 dyoung Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.14 1999/11/17 22:33:42 n_hibma Exp $ */
/*
@@ -189,7 +189,7 @@
int uhci_detach(uhci_softc_t *, int);
void uhci_childdet(device_t, device_t);
int uhci_activate(device_t, enum devact);
-bool uhci_resume(device_t PMF_FN_PROTO);
-bool uhci_suspend(device_t PMF_FN_PROTO);
+bool uhci_resume(device_t, pmf_qual_t);
+bool uhci_suspend(device_t, pmf_qual_t);
#endif
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.230 src/sys/dev/usb/uhci.c:1.231
--- src/sys/dev/usb/uhci.c:1.230 Thu Nov 12 19:53:56 2009
+++ src/sys/dev/usb/uhci.c Fri Jan 8 20:39:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.230 2009/11/12 19:53:56 dyoung Exp $ */
+/* $NetBSD: uhci.c,v 1.231 2010/01/08 20:39:04 dyoung Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
/*
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.230 2009/11/12 19:53:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.231 2010/01/08 20:39:04 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -691,7 +691,7 @@
* are almost suspended anyway.
*/
bool
-uhci_resume(device_t dv PMF_FN_ARGS)
+uhci_resume(device_t dv, pmf_qual_t qual)
{
uhci_softc_t *sc = device_private(dv);
int cmd;
@@ -736,7 +736,7 @@
}
bool
-uhci_suspend(device_t dv PMF_FN_ARGS)
+uhci_suspend(device_t dv, pmf_qual_t qual)
{
uhci_softc_t *sc = device_private(dv);
int cmd;
