Module Name: src
Committed By: dyoung
Date: Fri Jan 8 19:43:26 UTC 2010
Modified Files:
src/sys/arch/x86/pci: ichlpcib.c pchb.c
src/sys/arch/x86/x86: cpu.c x86_autoconf.c
src/sys/arch/xen/x86: cpu.c
Log Message:
Expand PMF_FN_* macros.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x86/pci/ichlpcib.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/x86/pci/pchb.c
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/x86/x86/x86_autoconf.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/xen/x86/cpu.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/arch/x86/pci/ichlpcib.c
diff -u src/sys/arch/x86/pci/ichlpcib.c:1.22 src/sys/arch/x86/pci/ichlpcib.c:1.23
--- src/sys/arch/x86/pci/ichlpcib.c:1.22 Fri Jan 8 00:09:45 2010
+++ src/sys/arch/x86/pci/ichlpcib.c Fri Jan 8 19:43:26 2010
@@ -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;
Index: src/sys/arch/x86/pci/pchb.c
diff -u src/sys/arch/x86/pci/pchb.c:1.19 src/sys/arch/x86/pci/pchb.c:1.20
--- src/sys/arch/x86/pci/pchb.c:1.19 Sun Aug 23 15:37:51 2009
+++ src/sys/arch/x86/pci/pchb.c Fri Jan 8 19:43:26 2010
@@ -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)
{
struct pchb_softc *sc = device_private(dv);
pci_chipset_tag_t pc;
@@ -478,7 +478,7 @@
}
static bool
-pchb_resume(device_t dv PMF_FN_ARGS)
+pchb_resume(device_t dv, pmf_qual_t qual)
{
struct pchb_softc *sc = device_private(dv);
pci_chipset_tag_t pc;
Index: src/sys/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.65 src/sys/arch/x86/x86/cpu.c:1.66
--- src/sys/arch/x86/x86/cpu.c:1.65 Sat Nov 21 03:11:01 2009
+++ src/sys/arch/x86/x86/cpu.c Fri Jan 8 19:43:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.65 2009/11/21 03:11:01 rmind Exp $ */
+/* $NetBSD: cpu.c,v 1.66 2010/01/08 19:43:26 dyoung Exp $ */
/*-
* Copyright (c) 2000, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.65 2009/11/21 03:11:01 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.66 2010/01/08 19:43:26 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -120,8 +120,8 @@
int cpu_match(device_t, cfdata_t, void *);
void cpu_attach(device_t, device_t, void *);
-static bool cpu_suspend(device_t PMF_FN_PROTO);
-static bool cpu_resume(device_t PMF_FN_PROTO);
+static bool cpu_suspend(device_t, pmf_qual_t);
+static bool cpu_resume(device_t, pmf_qual_t);
struct cpu_softc {
device_t sc_dev; /* device tree glue */
@@ -997,7 +997,7 @@
/* XXX joerg restructure and restart CPUs individually */
static bool
-cpu_suspend(device_t dv PMF_FN_ARGS)
+cpu_suspend(device_t dv, pmf_qual_t qual)
{
struct cpu_softc *sc = device_private(dv);
struct cpu_info *ci = sc->sc_info;
@@ -1025,7 +1025,7 @@
}
static bool
-cpu_resume(device_t dv PMF_FN_ARGS)
+cpu_resume(device_t dv, pmf_qual_t qual)
{
struct cpu_softc *sc = device_private(dv);
struct cpu_info *ci = sc->sc_info;
Index: src/sys/arch/x86/x86/x86_autoconf.c
diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.47 src/sys/arch/x86/x86/x86_autoconf.c:1.48
--- src/sys/arch/x86/x86/x86_autoconf.c:1.47 Wed Nov 25 19:46:19 2009
+++ src/sys/arch/x86/x86/x86_autoconf.c Fri Jan 8 19:43:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_autoconf.c,v 1.47 2009/11/25 19:46:19 tron Exp $ */
+/* $NetBSD: x86_autoconf.c,v 1.48 2010/01/08 19:43:26 dyoung Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.47 2009/11/25 19:46:19 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.48 2010/01/08 19:43:26 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -94,13 +94,13 @@
}
static bool
-x86_genfb_suspend(device_t dev PMF_FN_ARGS)
+x86_genfb_suspend(device_t dev, pmf_qual_t qual)
{
return true;
}
static bool
-x86_genfb_resume(device_t dev PMF_FN_ARGS)
+x86_genfb_resume(device_t dev, pmf_qual_t qual)
{
#if NGENFB > 0
struct pci_genfb_softc *psc = device_private(dev);
Index: src/sys/arch/xen/x86/cpu.c
diff -u src/sys/arch/xen/x86/cpu.c:1.39 src/sys/arch/xen/x86/cpu.c:1.40
--- src/sys/arch/xen/x86/cpu.c:1.39 Fri Nov 27 03:23:15 2009
+++ src/sys/arch/xen/x86/cpu.c Fri Jan 8 19:43:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.39 2009/11/27 03:23:15 rmind Exp $ */
+/* $NetBSD: cpu.c,v 1.40 2010/01/08 19:43:26 dyoung Exp $ */
/* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp */
/*-
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.39 2009/11/27 03:23:15 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.40 2010/01/08 19:43:26 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -1024,7 +1024,7 @@
#if 0
/* XXX joerg restructure and restart CPUs individually */
static bool
-cpu_suspend(device_t dv PMF_FN_ARGS)
+cpu_suspend(device_t dv, pmf_qual_t qual)
{
struct cpu_softc *sc = device_private(dv);
struct cpu_info *ci = sc->sc_info;
@@ -1052,7 +1052,7 @@
}
static bool
-cpu_resume(device_t dv PMF_FN_ARGS)
+cpu_resume(device_t dv, pmf_qual_t qual)
{
struct cpu_softc *sc = device_private(dv);
struct cpu_info *ci = sc->sc_info;
