diff options
| author | dyoung <dyoung@NetBSD.org> | 2010-01-08 19:53:10 +0000 |
|---|---|---|
| committer | dyoung <dyoung@NetBSD.org> | 2010-01-08 19:53:10 +0000 |
| commit | cd6e1fbf917851dd96cea886b90ce7d0899cc270 (patch) | |
| tree | 6864a87aab5fc4fe7fc5947d378c9715dcd5c1ac /sys/dev/usb | |
| parent | 3022acc4ebf7a5c3545f58fd7331a36d9bf8ceff (diff) | |
Expand PMF_FN_* macros.
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/ehci.c | 8 | ||||
| -rw-r--r-- | sys/dev/usb/ehcivar.h | 6 | ||||
| -rw-r--r-- | sys/dev/usb/ohci.c | 8 | ||||
| -rw-r--r-- | sys/dev/usb/ohcivar.h | 6 | ||||
| -rw-r--r-- | sys/dev/usb/uhci.c | 8 | ||||
| -rw-r--r-- | sys/dev/usb/uhcivar.h | 6 |
6 files changed, 21 insertions, 21 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index 7c7e3689fe6..24985ce247d 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ehci.c,v 1.164 2009/11/14 17:06:12 uebayasi Exp $ */ +/* $NetBSD: ehci.c,v 1.165 2010/01/08 20:38:43 dyoung Exp $ */ /* * Copyright (c) 2004-2008 The NetBSD Foundation, Inc. @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.164 2009/11/14 17:06:12 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.165 2010/01/08 20:38:43 dyoung Exp $"); #include "ohci.h" #include "uhci.h" @@ -1123,7 +1123,7 @@ ehci_activate(device_t self, enum devact act) * bus glue needs to call out to it. */ bool -ehci_suspend(device_t dv PMF_FN_ARGS) +ehci_suspend(device_t dv, pmf_qual_t qual) { ehci_softc_t *sc = device_private(dv); int i, s; @@ -1174,7 +1174,7 @@ ehci_suspend(device_t dv PMF_FN_ARGS) } bool -ehci_resume(device_t dv PMF_FN_ARGS) +ehci_resume(device_t dv, pmf_qual_t qual) { ehci_softc_t *sc = device_private(dv); int i; diff --git a/sys/dev/usb/ehcivar.h b/sys/dev/usb/ehcivar.h index 494eb091e0b..fd00a33769b 100644 --- a/sys/dev/usb/ehcivar.h +++ b/sys/dev/usb/ehcivar.h @@ -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_intr(void *); 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); diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 37f64796be1..7d4829f0c4d 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -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 @@ ohci_shutdown(device_t self, int flags) } 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 @@ ohci_resume(device_t dv PMF_FN_ARGS) } 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; diff --git a/sys/dev/usb/ohcivar.h b/sys/dev/usb/ohcivar.h index 1a386048a97..ca3f154940d 100644 --- a/sys/dev/usb/ohcivar.h +++ b/sys/dev/usb/ohcivar.h @@ -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 @@ bool ohci_shutdown(device_t, int); 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); diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 0f4edd855e6..00342b4f22b 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -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 @@ uhci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer) * 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 @@ uhci_resume(device_t dv PMF_FN_ARGS) } 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; diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h index d0daf1eec7e..6a5761d5315 100644 --- a/sys/dev/usb/uhcivar.h +++ b/sys/dev/usb/uhcivar.h @@ -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_intr(void *); 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 |
