Module Name: src Committed By: dyoung Date: Fri Jan 8 20:07:15 UTC 2010
Modified Files: src/sys/kern: kern_pmf.c subr_autoconf.c src/sys/sys: device.h pmf.h Log Message: Expand PMF_FN_* macros. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/kern/kern_pmf.c cvs rdiff -u -r1.194 -r1.195 src/sys/kern/subr_autoconf.c cvs rdiff -u -r1.130 -r1.131 src/sys/sys/device.h cvs rdiff -u -r1.16 -r1.17 src/sys/sys/pmf.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/kern/kern_pmf.c diff -u src/sys/kern/kern_pmf.c:1.30 src/sys/kern/kern_pmf.c:1.31 --- src/sys/kern/kern_pmf.c:1.30 Tue Oct 27 02:55:07 2009 +++ src/sys/kern/kern_pmf.c Fri Jan 8 20:07:14 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_pmf.c,v 1.30 2009/10/27 02:55:07 rmind Exp $ */ +/* $NetBSD: kern_pmf.c,v 1.31 2010/01/08 20:07:14 dyoung Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_pmf.c,v 1.30 2009/10/27 02:55:07 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_pmf.c,v 1.31 2010/01/08 20:07:14 dyoung Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -116,8 +116,8 @@ static pmf_event_workitem_t *pmf_event_workitem_get(void); static void pmf_event_workitem_put(pmf_event_workitem_t *); -bool pmf_device_resume_locked(device_t PMF_FN_PROTO); -bool pmf_device_suspend_locked(device_t PMF_FN_PROTO); +bool pmf_device_resume_locked(device_t, pmf_qual_t); +bool pmf_device_suspend_locked(device_t, pmf_qual_t); static bool device_pmf_any_suspensor(device_t, devact_level_t); static bool @@ -229,7 +229,7 @@ } bool -pmf_system_bus_resume(PMF_FN_ARGS1) +pmf_system_bus_resume(pmf_qual_t qual) { bool rv; device_t curdev; @@ -248,7 +248,7 @@ aprint_debug(" %s", device_xname(curdev)); - if (!device_pmf_bus_resume(curdev PMF_FN_CALL)) { + if (!device_pmf_bus_resume(curdev, qual)) { rv = false; aprint_debug("(failed)"); } @@ -260,7 +260,7 @@ } bool -pmf_system_resume(PMF_FN_ARGS1) +pmf_system_resume(pmf_qual_t qual) { bool rv; device_t curdev, parent; @@ -284,7 +284,7 @@ aprint_debug(" %s", device_xname(curdev)); - if (!pmf_device_resume(curdev PMF_FN_CALL)) { + if (!pmf_device_resume(curdev, qual)) { rv = false; aprint_debug("(failed)"); } @@ -301,7 +301,7 @@ } bool -pmf_system_suspend(PMF_FN_ARGS1) +pmf_system_suspend(pmf_qual_t qual) { device_t curdev; deviter_t di; @@ -338,7 +338,7 @@ aprint_debug(" %s", device_xname(curdev)); /* XXX joerg check return value and abort suspend */ - if (!pmf_device_suspend(curdev PMF_FN_CALL)) + if (!pmf_device_suspend(curdev, qual)) aprint_debug("(failed)"); } deviter_release(&di); @@ -410,8 +410,8 @@ bool pmf_device_register1(device_t dev, - bool (*suspend)(device_t PMF_FN_PROTO), - bool (*resume)(device_t PMF_FN_PROTO), + bool (*suspend)(device_t, pmf_qual_t), + bool (*resume)(device_t, pmf_qual_t), bool (*shutdown)(device_t, int)) { if (!device_pmf_driver_register(dev, suspend, resume, shutdown)) @@ -676,7 +676,7 @@ } bool -pmf_device_suspend(device_t dev PMF_FN_ARGS) +pmf_device_suspend(device_t dev, pmf_qual_t qual) { bool rc; @@ -687,7 +687,7 @@ if (!device_pmf_lock(dev)) return false; - rc = pmf_device_suspend_locked(dev PMF_FN_CALL); + rc = pmf_device_suspend_locked(dev, qual); device_pmf_unlock(dev); @@ -696,28 +696,28 @@ } bool -pmf_device_suspend_locked(device_t dev PMF_FN_ARGS) +pmf_device_suspend_locked(device_t dev, pmf_qual_t qual) { - if (!device_pmf_add_suspensor(dev PMF_FN_CALL)) + if (!device_pmf_add_suspensor(dev, qual)) return false; PMF_TRANSITION_PRINTF2(1, ("%s: class suspend\n", device_xname(dev))); - if (!device_pmf_class_suspend(dev PMF_FN_CALL)) + if (!device_pmf_class_suspend(dev, qual)) return false; PMF_TRANSITION_PRINTF2(1, ("%s: driver suspend\n", device_xname(dev))); - if (!device_pmf_driver_suspend(dev PMF_FN_CALL)) + if (!device_pmf_driver_suspend(dev, qual)) return false; PMF_TRANSITION_PRINTF2(1, ("%s: bus suspend\n", device_xname(dev))); - if (!device_pmf_bus_suspend(dev PMF_FN_CALL)) + if (!device_pmf_bus_suspend(dev, qual)) return false; return true; } bool -pmf_device_resume(device_t dev PMF_FN_ARGS) +pmf_device_resume(device_t dev, pmf_qual_t qual) { bool rc; @@ -728,7 +728,7 @@ if (!device_pmf_lock(dev)) return false; - rc = pmf_device_resume_locked(dev PMF_FN_CALL); + rc = pmf_device_resume_locked(dev, qual); device_pmf_unlock(dev); @@ -737,30 +737,30 @@ } bool -pmf_device_resume_locked(device_t dev PMF_FN_ARGS) +pmf_device_resume_locked(device_t dev, pmf_qual_t qual) { - device_pmf_remove_suspensor(dev PMF_FN_CALL); + device_pmf_remove_suspensor(dev, qual); if (device_pmf_any_suspensor(dev, DEVACT_LEVEL_FULL)) return true; PMF_TRANSITION_PRINTF2(1, ("%s: bus resume\n", device_xname(dev))); - if (!device_pmf_bus_resume(dev PMF_FN_CALL)) + if (!device_pmf_bus_resume(dev, qual)) return false; PMF_TRANSITION_PRINTF2(1, ("%s: driver resume\n", device_xname(dev))); - if (!device_pmf_driver_resume(dev PMF_FN_CALL)) + if (!device_pmf_driver_resume(dev, qual)) return false; PMF_TRANSITION_PRINTF2(1, ("%s: class resume\n", device_xname(dev))); - if (!device_pmf_class_resume(dev PMF_FN_CALL)) + if (!device_pmf_class_resume(dev, qual)) return false; return true; } bool -pmf_device_recursive_suspend(device_t dv PMF_FN_ARGS) +pmf_device_recursive_suspend(device_t dv, pmf_qual_t qual) { bool rv = true; device_t curdev; @@ -780,7 +780,7 @@ } deviter_release(&di); - return rv && pmf_device_suspend(dv PMF_FN_CALL); + return rv && pmf_device_suspend(dv, qual); } void @@ -791,7 +791,7 @@ } bool -pmf_device_recursive_resume(device_t dv PMF_FN_ARGS) +pmf_device_recursive_resume(device_t dv, pmf_qual_t qual) { device_t parent; struct pmf_qual pq; @@ -807,11 +807,11 @@ return false; } - return pmf_device_resume(dv PMF_FN_CALL); + return pmf_device_resume(dv, qual); } bool -pmf_device_descendants_release(device_t dv PMF_FN_ARGS) +pmf_device_descendants_release(device_t dv, pmf_qual_t qual) { bool rv = true; device_t curdev; @@ -821,8 +821,8 @@ curdev = deviter_next(&di)) { if (device_parent(curdev) != dv) continue; - device_pmf_remove_suspensor(curdev PMF_FN_CALL); - if (!pmf_device_descendants_release(curdev PMF_FN_CALL)) { + device_pmf_remove_suspensor(curdev, qual); + if (!pmf_device_descendants_release(curdev, qual)) { rv = false; break; } @@ -832,20 +832,20 @@ } bool -pmf_device_descendants_resume(device_t dv PMF_FN_ARGS) +pmf_device_descendants_resume(device_t dv, pmf_qual_t qual) { bool rv = true; device_t curdev; deviter_t di; - KASSERT(pmf_qual_descend_ok(PMF_FN_CALL1)); + KASSERT(pmf_qual_descend_ok(qual)); for (curdev = deviter_first(&di, 0); curdev != NULL; curdev = deviter_next(&di)) { if (device_parent(curdev) != dv) continue; - if (!pmf_device_resume(curdev PMF_FN_CALL) || - !pmf_device_descendants_resume(curdev PMF_FN_CALL)) { + if (!pmf_device_resume(curdev, qual) || + !pmf_device_descendants_resume(curdev, qual)) { rv = false; break; } @@ -855,24 +855,24 @@ } bool -pmf_device_subtree_release(device_t dv PMF_FN_ARGS) +pmf_device_subtree_release(device_t dv, pmf_qual_t qual) { struct pmf_qual pq; - device_pmf_remove_suspensor(dv PMF_FN_CALL); + device_pmf_remove_suspensor(dv, qual); return pmf_device_descendants_release(dv, &pq); } bool -pmf_device_subtree_resume(device_t dv PMF_FN_ARGS) +pmf_device_subtree_resume(device_t dv, pmf_qual_t qual) { struct pmf_qual pq; - if (!pmf_device_subtree_release(dv PMF_FN_CALL)) + if (!pmf_device_subtree_release(dv, qual)) return false; - if (!pmf_device_recursive_resume(dv PMF_FN_CALL)) + if (!pmf_device_recursive_resume(dv, qual)) return false; pmf_qual_recursive_copy(&pq, qual); @@ -883,7 +883,7 @@ #include <net/if.h> static bool -pmf_class_network_suspend(device_t dev PMF_FN_ARGS) +pmf_class_network_suspend(device_t dev, pmf_qual_t qual) { struct ifnet *ifp = device_pmf_class_private(dev); int s; @@ -896,7 +896,7 @@ } static bool -pmf_class_network_resume(device_t dev PMF_FN_ARGS) +pmf_class_network_resume(device_t dev, pmf_qual_t qual) { struct ifnet *ifp = device_pmf_class_private(dev); int s; Index: src/sys/kern/subr_autoconf.c diff -u src/sys/kern/subr_autoconf.c:1.194 src/sys/kern/subr_autoconf.c:1.195 --- src/sys/kern/subr_autoconf.c:1.194 Fri Jan 8 12:07:08 2010 +++ src/sys/kern/subr_autoconf.c Fri Jan 8 20:07:14 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_autoconf.c,v 1.194 2010/01/08 12:07:08 rmind Exp $ */ +/* $NetBSD: subr_autoconf.c,v 1.195 2010/01/08 20:07:14 dyoung Exp $ */ /* * Copyright (c) 1996, 2000 Christopher G. Demetriou @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.194 2010/01/08 12:07:08 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.195 2010/01/08 20:07:14 dyoung Exp $"); #ifdef _KERNEL_OPT #include "opt_ddb.h" @@ -2099,15 +2099,15 @@ } bool -device_pmf_driver_suspend(device_t dev PMF_FN_ARGS) +device_pmf_driver_suspend(device_t dev, pmf_qual_t qual) { if ((dev->dv_flags & DVF_DRIVER_SUSPENDED) != 0) return true; if ((dev->dv_flags & DVF_CLASS_SUSPENDED) == 0) return false; - if (pmf_qual_depth(PMF_FN_CALL1) <= DEVACT_LEVEL_DRIVER && + if (pmf_qual_depth(qual) <= DEVACT_LEVEL_DRIVER && dev->dv_driver_suspend != NULL && - !(*dev->dv_driver_suspend)(dev PMF_FN_CALL)) + !(*dev->dv_driver_suspend)(dev, qual)) return false; dev->dv_flags |= DVF_DRIVER_SUSPENDED; @@ -2115,15 +2115,15 @@ } bool -device_pmf_driver_resume(device_t dev PMF_FN_ARGS) +device_pmf_driver_resume(device_t dev, pmf_qual_t qual) { if ((dev->dv_flags & DVF_DRIVER_SUSPENDED) == 0) return true; if ((dev->dv_flags & DVF_BUS_SUSPENDED) != 0) return false; - if (pmf_qual_depth(PMF_FN_CALL1) <= DEVACT_LEVEL_DRIVER && + if (pmf_qual_depth(qual) <= DEVACT_LEVEL_DRIVER && dev->dv_driver_resume != NULL && - !(*dev->dv_driver_resume)(dev PMF_FN_CALL)) + !(*dev->dv_driver_resume)(dev, qual)) return false; dev->dv_flags &= ~DVF_DRIVER_SUSPENDED; @@ -2142,8 +2142,8 @@ bool device_pmf_driver_register(device_t dev, - bool (*suspend)(device_t PMF_FN_PROTO), - bool (*resume)(device_t PMF_FN_PROTO), + bool (*suspend)(device_t, pmf_qual_t), + bool (*resume)(device_t, pmf_qual_t), bool (*shutdown)(device_t, int)) { dev->dv_driver_suspend = suspend; @@ -2280,16 +2280,16 @@ } bool -device_pmf_bus_suspend(device_t dev PMF_FN_ARGS) +device_pmf_bus_suspend(device_t dev, pmf_qual_t qual) { if ((dev->dv_flags & DVF_BUS_SUSPENDED) != 0) return true; if ((dev->dv_flags & DVF_CLASS_SUSPENDED) == 0 || (dev->dv_flags & DVF_DRIVER_SUSPENDED) == 0) return false; - if (pmf_qual_depth(PMF_FN_CALL1) <= DEVACT_LEVEL_BUS && + if (pmf_qual_depth(qual) <= DEVACT_LEVEL_BUS && dev->dv_bus_suspend != NULL && - !(*dev->dv_bus_suspend)(dev PMF_FN_CALL)) + !(*dev->dv_bus_suspend)(dev, qual)) return false; dev->dv_flags |= DVF_BUS_SUSPENDED; @@ -2297,13 +2297,13 @@ } bool -device_pmf_bus_resume(device_t dev PMF_FN_ARGS) +device_pmf_bus_resume(device_t dev, pmf_qual_t qual) { if ((dev->dv_flags & DVF_BUS_SUSPENDED) == 0) return true; - if (pmf_qual_depth(PMF_FN_CALL1) <= DEVACT_LEVEL_BUS && + if (pmf_qual_depth(qual) <= DEVACT_LEVEL_BUS && dev->dv_bus_resume != NULL && - !(*dev->dv_bus_resume)(dev PMF_FN_CALL)) + !(*dev->dv_bus_resume)(dev, qual)) return false; dev->dv_flags &= ~DVF_BUS_SUSPENDED; @@ -2322,8 +2322,8 @@ void device_pmf_bus_register(device_t dev, void *priv, - bool (*suspend)(device_t PMF_FN_PROTO), - bool (*resume)(device_t PMF_FN_PROTO), + bool (*suspend)(device_t, pmf_qual_t), + bool (*resume)(device_t, pmf_qual_t), bool (*shutdown)(device_t, int), void (*deregister)(device_t)) { dev->dv_bus_private = priv; @@ -2352,13 +2352,13 @@ } bool -device_pmf_class_suspend(device_t dev PMF_FN_ARGS) +device_pmf_class_suspend(device_t dev, pmf_qual_t qual) { if ((dev->dv_flags & DVF_CLASS_SUSPENDED) != 0) return true; - if (pmf_qual_depth(PMF_FN_CALL1) <= DEVACT_LEVEL_CLASS && + if (pmf_qual_depth(qual) <= DEVACT_LEVEL_CLASS && dev->dv_class_suspend != NULL && - !(*dev->dv_class_suspend)(dev PMF_FN_CALL)) + !(*dev->dv_class_suspend)(dev, qual)) return false; dev->dv_flags |= DVF_CLASS_SUSPENDED; @@ -2366,16 +2366,16 @@ } bool -device_pmf_class_resume(device_t dev PMF_FN_ARGS) +device_pmf_class_resume(device_t dev, pmf_qual_t qual) { if ((dev->dv_flags & DVF_CLASS_SUSPENDED) == 0) return true; if ((dev->dv_flags & DVF_BUS_SUSPENDED) != 0 || (dev->dv_flags & DVF_DRIVER_SUSPENDED) != 0) return false; - if (pmf_qual_depth(PMF_FN_CALL1) <= DEVACT_LEVEL_CLASS && + if (pmf_qual_depth(qual) <= DEVACT_LEVEL_CLASS && dev->dv_class_resume != NULL && - !(*dev->dv_class_resume)(dev PMF_FN_CALL)) + !(*dev->dv_class_resume)(dev, qual)) return false; dev->dv_flags &= ~DVF_CLASS_SUSPENDED; @@ -2384,8 +2384,8 @@ void device_pmf_class_register(device_t dev, void *priv, - bool (*suspend)(device_t PMF_FN_PROTO), - bool (*resume)(device_t PMF_FN_PROTO), + bool (*suspend)(device_t, pmf_qual_t), + bool (*resume)(device_t, pmf_qual_t), void (*deregister)(device_t)) { dev->dv_class_private = priv; Index: src/sys/sys/device.h diff -u src/sys/sys/device.h:1.130 src/sys/sys/device.h:1.131 --- src/sys/sys/device.h:1.130 Fri Jan 8 00:09:45 2010 +++ src/sys/sys/device.h Fri Jan 8 20:07:14 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: device.h,v 1.130 2010/01/08 00:09:45 dyoung Exp $ */ +/* $NetBSD: device.h,v 1.131 2010/01/08 20:07:14 dyoung Exp $ */ /* * Copyright (c) 1996, 2000 Christopher G. Demetriou @@ -158,20 +158,20 @@ size_t dv_activity_count; void (**dv_activity_handlers)(device_t, devactive_t); - bool (*dv_driver_suspend)(device_t PMF_FN_PROTO); - bool (*dv_driver_resume)(device_t PMF_FN_PROTO); + bool (*dv_driver_suspend)(device_t, pmf_qual_t); + bool (*dv_driver_resume)(device_t, pmf_qual_t); bool (*dv_driver_shutdown)(device_t, int); bool (*dv_driver_child_register)(device_t); void *dv_bus_private; - bool (*dv_bus_suspend)(device_t PMF_FN_PROTO); - bool (*dv_bus_resume)(device_t PMF_FN_PROTO); + bool (*dv_bus_suspend)(device_t, pmf_qual_t); + bool (*dv_bus_resume)(device_t, pmf_qual_t); bool (*dv_bus_shutdown)(device_t, int); void (*dv_bus_deregister)(device_t); void *dv_class_private; - bool (*dv_class_suspend)(device_t PMF_FN_PROTO); - bool (*dv_class_resume)(device_t PMF_FN_PROTO); + bool (*dv_class_suspend)(device_t, pmf_qual_t); + bool (*dv_class_resume)(device_t, pmf_qual_t); void (*dv_class_deregister)(device_t); devgen_t dv_add_gen, @@ -522,13 +522,13 @@ bool device_pmf_is_registered(device_t); -bool device_pmf_driver_suspend(device_t PMF_FN_PROTO); -bool device_pmf_driver_resume(device_t PMF_FN_PROTO); +bool device_pmf_driver_suspend(device_t, pmf_qual_t); +bool device_pmf_driver_resume(device_t, pmf_qual_t); bool device_pmf_driver_shutdown(device_t, int); bool device_pmf_driver_register(device_t, - bool (*)(device_t PMF_FN_PROTO), - bool (*)(device_t PMF_FN_PROTO), + bool (*)(device_t, pmf_qual_t), + bool (*)(device_t, pmf_qual_t), bool (*)(device_t, int)); void device_pmf_driver_deregister(device_t); @@ -537,8 +537,8 @@ bool (*)(device_t)); void *device_pmf_bus_private(device_t); -bool device_pmf_bus_suspend(device_t PMF_FN_PROTO); -bool device_pmf_bus_resume(device_t PMF_FN_PROTO); +bool device_pmf_bus_suspend(device_t, pmf_qual_t); +bool device_pmf_bus_resume(device_t, pmf_qual_t); bool device_pmf_bus_shutdown(device_t, int); device_lock_t device_getlock(device_t); @@ -546,24 +546,24 @@ bool device_pmf_lock(device_t); bool device_is_self_suspended(device_t); -void device_pmf_self_suspend(device_t PMF_FN_PROTO); -void device_pmf_self_resume(device_t PMF_FN_PROTO); -bool device_pmf_self_wait(device_t PMF_FN_PROTO); +void device_pmf_self_suspend(device_t, pmf_qual_t); +void device_pmf_self_resume(device_t, pmf_qual_t); +bool device_pmf_self_wait(device_t, pmf_qual_t); void device_pmf_bus_register(device_t, void *, - bool (*)(device_t PMF_FN_PROTO), - bool (*)(device_t PMF_FN_PROTO), + bool (*)(device_t, pmf_qual_t), + bool (*)(device_t, pmf_qual_t), bool (*)(device_t, int), void (*)(device_t)); void device_pmf_bus_deregister(device_t); void *device_pmf_class_private(device_t); -bool device_pmf_class_suspend(device_t PMF_FN_PROTO); -bool device_pmf_class_resume(device_t PMF_FN_PROTO); +bool device_pmf_class_suspend(device_t, pmf_qual_t); +bool device_pmf_class_resume(device_t, pmf_qual_t); void device_pmf_class_register(device_t, void *, - bool (*)(device_t PMF_FN_PROTO), - bool (*)(device_t PMF_FN_PROTO), + bool (*)(device_t, pmf_qual_t), + bool (*)(device_t, pmf_qual_t), void (*)(device_t)); void device_pmf_class_deregister(device_t); Index: src/sys/sys/pmf.h diff -u src/sys/sys/pmf.h:1.16 src/sys/sys/pmf.h:1.17 --- src/sys/sys/pmf.h:1.16 Wed Sep 16 16:34:56 2009 +++ src/sys/sys/pmf.h Fri Jan 8 20:07:15 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmf.h,v 1.16 2009/09/16 16:34:56 dyoung Exp $ */ +/* $NetBSD: pmf.h,v 1.17 2010/01/08 20:07:15 dyoung Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca> @@ -64,16 +64,6 @@ * const device_suspensor_system, * const device_suspensor_drvctl; -#define PMF_FN_PROTO1 pmf_qual_t -#define PMF_FN_ARGS1 pmf_qual_t qual -#define PMF_FN_CALL1 qual - -#define PMF_FN_PROTO , pmf_qual_t -#define PMF_FN_ARGS , pmf_qual_t qual -#define PMF_FN_CALL , qual - -#define PMF_FLAGS_FMT "%x" /* "n/a" */ - void pmf_init(void); bool pmf_event_inject(device_t, pmf_generic_event_t); @@ -85,30 +75,30 @@ bool pmf_set_platform(const char *, const char *); const char *pmf_get_platform(const char *); -bool pmf_system_resume(PMF_FN_PROTO1); -bool pmf_system_bus_resume(PMF_FN_PROTO1); -bool pmf_system_suspend(PMF_FN_PROTO1); +bool pmf_system_resume(pmf_qual_t); +bool pmf_system_bus_resume(pmf_qual_t); +bool pmf_system_suspend(pmf_qual_t); void pmf_system_shutdown(int); bool pmf_device_register1(device_t, - bool (*)(device_t PMF_FN_PROTO), - bool (*)(device_t PMF_FN_PROTO), + bool (*)(device_t, pmf_qual_t), + bool (*)(device_t, pmf_qual_t), bool (*)(device_t, int)); /* compatibility */ #define pmf_device_register(__d, __s, __r) \ pmf_device_register1((__d), (__s), (__r), NULL) void pmf_device_deregister(device_t); -bool pmf_device_suspend(device_t PMF_FN_PROTO); -bool pmf_device_resume(device_t PMF_FN_PROTO); +bool pmf_device_suspend(device_t, pmf_qual_t); +bool pmf_device_resume(device_t, pmf_qual_t); -bool pmf_device_recursive_suspend(device_t PMF_FN_PROTO); -bool pmf_device_recursive_resume(device_t PMF_FN_PROTO); -bool pmf_device_descendants_resume(device_t PMF_FN_PROTO); -bool pmf_device_subtree_resume(device_t PMF_FN_PROTO); +bool pmf_device_recursive_suspend(device_t, pmf_qual_t); +bool pmf_device_recursive_resume(device_t, pmf_qual_t); +bool pmf_device_descendants_resume(device_t, pmf_qual_t); +bool pmf_device_subtree_resume(device_t, pmf_qual_t); -bool pmf_device_descendants_release(device_t PMF_FN_PROTO); -bool pmf_device_subtree_release(device_t PMF_FN_PROTO); +bool pmf_device_descendants_release(device_t, pmf_qual_t); +bool pmf_device_subtree_release(device_t, pmf_qual_t); struct ifnet; void pmf_class_network_register(device_t, struct ifnet *);