Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Expand PMF_FN_* macros.



details:   https://anonhg.NetBSD.org/src/rev/61b66f1a3eb8
branches:  trunk
changeset: 750629:61b66f1a3eb8
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Fri Jan 08 19:42:11 2010 +0000

description:
Expand PMF_FN_* macros.

diffstat:

 sys/arch/i386/pci/elan520.c                     |  16 ++++++++--------
 sys/arch/i386/pci/piixpcib.c                    |  12 ++++++------
 sys/arch/mips/atheros/dev/if_ath_arbus.c        |   6 +++---
 sys/arch/sparc/dev/fd.c                         |   8 ++++----
 sys/arch/sparc64/dev/fdc.c                      |   8 ++++----
 sys/arch/x86/pci/ichlpcib.c                     |  12 ++++++------
 sys/arch/x86/pci/pchb.c                         |  12 ++++++------
 sys/arch/x86/x86/cpu.c                          |  12 ++++++------
 sys/arch/x86/x86/x86_autoconf.c                 |   8 ++++----
 sys/arch/xen/x86/cpu.c                          |   8 ++++----
 sys/arch/zaurus/dev/zaudio.c                    |  12 ++++++------
 sys/arch/zaurus/dev/zkbd.c                      |   8 ++++----
 sys/arch/zaurus/dev/zlcd.c                      |  12 ++++++------
 sys/arch/zaurus/dev/zssp.c                      |   8 ++++----
 sys/arch/zaurus/dev/ztp.c                       |  12 ++++++------
 sys/dev/ata/ata.c                               |  12 ++++++------
 sys/dev/ata/wd.c                                |   8 ++++----
 sys/dev/cardbus/cardbus.c                       |   8 ++++----
 sys/dev/cardbus/ehci_cardbus.c                  |  12 ++++++------
 sys/dev/cardbus/if_ath_cardbus.c                |   8 ++++----
 sys/dev/cardbus/if_atw_cardbus.c                |  14 +++++++-------
 sys/dev/cardbus/if_rtw_cardbus.c                |  16 ++++++++--------
 sys/dev/cardbus/siisata_cardbus.c               |   6 +++---
 sys/dev/gpio/gpio.c                             |   8 ++++----
 sys/dev/wscons/wsdisplay.c                      |   8 ++++----
 sys/dev/wscons/wskbd.c                          |   8 ++++----
 sys/dev/wsfb/genfbvar.h                         |   8 ++++----
 sys/external/bsd/drm/dist/bsd-core/i915_drv.c   |   4 ++--
 sys/external/bsd/drm/dist/bsd-core/radeon_drv.c |   4 ++--
 29 files changed, 139 insertions(+), 139 deletions(-)

diffs (truncated from 1166 to 300 lines):

diff -r d3162aed27fd -r 61b66f1a3eb8 sys/arch/i386/pci/elan520.c
--- a/sys/arch/i386/pci/elan520.c       Fri Jan 08 19:20:21 2010 +0000
+++ b/sys/arch/i386/pci/elan520.c       Fri Jan 08 19:42:11 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: elan520.c,v 1.45 2010/01/08 00:09:44 dyoung Exp $      */
+/*     $NetBSD: elan520.c,v 1.46 2010/01/08 19:45:28 dyoung Exp $      */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.45 2010/01/08 00:09:44 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.46 2010/01/08 19:45:28 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -847,7 +847,7 @@
 }
 
 static bool
-elansc_suspend(device_t dev PMF_FN_ARGS)
+elansc_suspend(device_t dev, pmf_qual_t qual)
 {
        bool rc;
        struct elansc_softc *sc = device_private(dev);
@@ -861,7 +861,7 @@
 }
 
 static bool
-elansc_resume(device_t dev PMF_FN_ARGS)
+elansc_resume(device_t dev, pmf_qual_t qual)
 {
        struct elansc_softc *sc = device_private(dev);
 
@@ -947,7 +947,7 @@
 }
 
 static bool
-elanpex_resume(device_t self PMF_FN_ARGS)
+elanpex_resume(device_t self, pmf_qual_t qual)
 {
        struct elansc_softc *sc = device_private(device_parent(self));
 
@@ -956,7 +956,7 @@
 }
 
 static bool
-elanpex_suspend(device_t self PMF_FN_ARGS)
+elanpex_suspend(device_t self, pmf_qual_t qual)
 {
        struct elansc_softc *sc = device_private(device_parent(self));
 
@@ -966,7 +966,7 @@
 }
 
 static bool
-elanpar_resume(device_t self PMF_FN_ARGS)
+elanpar_resume(device_t self, pmf_qual_t qual)
 {
        struct elansc_softc *sc = device_private(device_parent(self));
 
@@ -975,7 +975,7 @@
 }
 
 static bool
-elanpar_suspend(device_t self PMF_FN_ARGS)
+elanpar_suspend(device_t self, pmf_qual_t qual)
 {
        struct elansc_softc *sc = device_private(device_parent(self));
 
diff -r d3162aed27fd -r 61b66f1a3eb8 sys/arch/i386/pci/piixpcib.c
--- a/sys/arch/i386/pci/piixpcib.c      Fri Jan 08 19:20:21 2010 +0000
+++ b/sys/arch/i386/pci/piixpcib.c      Fri Jan 08 19:42:11 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpcib.c,v 1.16 2008/07/20 16:52:33 martin Exp $ */
+/* $NetBSD: piixpcib.c,v 1.17 2010/01/08 19:45:28 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2004, 2006 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: piixpcib.c,v 1.16 2008/07/20 16:52:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixpcib.c,v 1.17 2010/01/08 19:45:28 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -79,8 +79,8 @@
 static int piixpcibmatch(device_t, cfdata_t, void *);
 static void piixpcibattach(device_t, device_t, void *);
 
-static bool piixpcib_suspend(device_t PMF_FN_PROTO);
-static bool piixpcib_resume(device_t PMF_FN_PROTO);
+static bool piixpcib_suspend(device_t, pmf_qual_t);
+static bool piixpcib_resume(device_t, pmf_qual_t);
 
 static void speedstep_configure(struct piixpcib_softc *,
                                struct pci_attach_args *);
@@ -144,7 +144,7 @@
 }
 
 static bool
-piixpcib_suspend(device_t dv PMF_FN_ARGS)
+piixpcib_suspend(device_t dv, pmf_qual_t qual)
 {
        struct piixpcib_softc *sc = device_private(dv);
 
@@ -160,7 +160,7 @@
 }
 
 static bool
-piixpcib_resume(device_t dv PMF_FN_ARGS)
+piixpcib_resume(device_t dv, pmf_qual_t qual)
 {
        struct piixpcib_softc *sc = device_private(dv);
 
diff -r d3162aed27fd -r 61b66f1a3eb8 sys/arch/mips/atheros/dev/if_ath_arbus.c
--- a/sys/arch/mips/atheros/dev/if_ath_arbus.c  Fri Jan 08 19:20:21 2010 +0000
+++ b/sys/arch/mips/atheros/dev/if_ath_arbus.c  Fri Jan 08 19:42:11 2010 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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);
diff -r d3162aed27fd -r 61b66f1a3eb8 sys/arch/sparc/dev/fd.c
--- a/sys/arch/sparc/dev/fd.c   Fri Jan 08 19:20:21 2010 +0000
+++ b/sys/arch/sparc/dev/fd.c   Fri Jan 08 19:42:11 2010 +0000
@@ -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);
diff -r d3162aed27fd -r 61b66f1a3eb8 sys/arch/sparc64/dev/fdc.c
--- a/sys/arch/sparc64/dev/fdc.c        Fri Jan 08 19:20:21 2010 +0000
+++ b/sys/arch/sparc64/dev/fdc.c        Fri Jan 08 19:42:11 2010 +0000
@@ -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);
diff -r d3162aed27fd -r 61b66f1a3eb8 sys/arch/x86/pci/ichlpcib.c
--- a/sys/arch/x86/pci/ichlpcib.c       Fri Jan 08 19:20:21 2010 +0000
+++ b/sys/arch/x86/pci/ichlpcib.c       Fri Jan 08 19:42:11 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ichlpcib.c,v 1.22 2010/01/08 00:09:45 dyoung Exp $     */
+/*     $NetBSD: ichlpcib.c,v 1.23 2010/01/08 19:43:26 dyoung Exp $     */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.22 2010/01/08 00:09:45 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.23 2010/01/08 19:43:26 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -123,8 +123,8 @@
 static int lpcibdetach(device_t, int);
 static void lpcibchilddet(device_t, device_t);
 static int lpcibrescan(device_t, const char *, const int *);
-static bool lpcib_suspend(device_t PMF_FN_PROTO);
-static bool lpcib_resume(device_t PMF_FN_PROTO);
+static bool lpcib_suspend(device_t, pmf_qual_t);
+static bool lpcib_resume(device_t, pmf_qual_t);
 static bool lpcib_shutdown(device_t, int);
 
 static void pmtimer_configure(device_t);
@@ -414,7 +414,7 @@
 }
 
 static bool
-lpcib_suspend(device_t dv PMF_FN_ARGS)
+lpcib_suspend(device_t dv, pmf_qual_t qual)
 {
        struct lpcib_softc *sc = device_private(dv);
        pci_chipset_tag_t pc = sc->sc_pcib.sc_pc;
@@ -443,7 +443,7 @@
 }
 
 static bool
-lpcib_resume(device_t dv PMF_FN_ARGS)
+lpcib_resume(device_t dv, pmf_qual_t qual)
 {
        struct lpcib_softc *sc = device_private(dv);
        pci_chipset_tag_t pc = sc->sc_pcib.sc_pc;
diff -r d3162aed27fd -r 61b66f1a3eb8 sys/arch/x86/pci/pchb.c
--- a/sys/arch/x86/pci/pchb.c   Fri Jan 08 19:20:21 2010 +0000
+++ b/sys/arch/x86/pci/pchb.c   Fri Jan 08 19:42:11 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pchb.c,v 1.19 2009/08/23 15:37:51 jmcneill Exp $ */
+/*     $NetBSD: pchb.c,v 1.20 2010/01/08 19:43:26 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1996, 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.19 2009/08/23 15:37:51 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.20 2010/01/08 19:43:26 dyoung Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -75,8 +75,8 @@
 void   pchbattach(device_t, device_t, void *);
 int    pchbdetach(device_t, int);
 
-static bool    pchb_resume(device_t PMF_FN_ARGS);
-static bool    pchb_suspend(device_t PMF_FN_ARGS);
+static bool    pchb_resume(device_t, pmf_qual_t);
+static bool    pchb_suspend(device_t, pmf_qual_t);
 
 CFATTACH_DECL3_NEW(pchb, sizeof(struct pchb_softc),
     pchbmatch, pchbattach, pchbdetach, NULL, NULL, NULL, DVF_DETACH_SHUTDOWN);
@@ -461,7 +461,7 @@
 }
 
 static bool
-pchb_suspend(device_t dv PMF_FN_ARGS)
+pchb_suspend(device_t dv, pmf_qual_t qual)



Home | Main Index | Thread Index | Old Index