Module Name: src
Committed By: dyoung
Date: Fri Jan 8 20:00:03 UTC 2010
Modified Files:
src/sys/dev/isa: aps.c com_isa.c fd.c sbdsp.c ym.c
Log Message:
Expand PMF_FN_* macros.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/isa/aps.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/isa/com_isa.c src/sys/dev/isa/ym.c
cvs rdiff -u -r1.93 -r1.94 src/sys/dev/isa/fd.c
cvs rdiff -u -r1.132 -r1.133 src/sys/dev/isa/sbdsp.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/isa/aps.c
diff -u src/sys/dev/isa/aps.c:1.8 src/sys/dev/isa/aps.c:1.9
--- src/sys/dev/isa/aps.c:1.8 Fri Apr 4 09:41:40 2008
+++ src/sys/dev/isa/aps.c Fri Jan 8 20:00:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: aps.c,v 1.8 2008/04/04 09:41:40 xtraeme Exp $ */
+/* $NetBSD: aps.c,v 1.9 2010/01/08 20:00:03 dyoung Exp $ */
/* $OpenBSD: aps.c,v 1.15 2007/05/19 19:14:11 tedu Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aps.c,v 1.8 2008/04/04 09:41:40 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aps.c,v 1.9 2010/01/08 20:00:03 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -112,8 +112,8 @@
int, uint8_t);
static void aps_refresh_sensor_data(struct aps_softc *sc);
static void aps_refresh(void *);
-static bool aps_suspend(device_t PMF_FN_PROTO);
-static bool aps_resume(device_t PMF_FN_PROTO);
+static bool aps_suspend(device_t, pmf_qual_t);
+static bool aps_resume(device_t, pmf_qual_t);
CFATTACH_DECL_NEW(aps, sizeof(struct aps_softc),
aps_match, aps_attach, aps_detach, NULL);
@@ -401,7 +401,7 @@
}
static bool
-aps_suspend(device_t dv PMF_FN_ARGS)
+aps_suspend(device_t dv, pmf_qual_t qual)
{
struct aps_softc *sc = device_private(dv);
@@ -411,7 +411,7 @@
}
static bool
-aps_resume(device_t dv PMF_FN_ARGS)
+aps_resume(device_t dv, pmf_qual_t qual)
{
struct aps_softc *sc = device_private(dv);
Index: src/sys/dev/isa/com_isa.c
diff -u src/sys/dev/isa/com_isa.c:1.37 src/sys/dev/isa/com_isa.c:1.38
--- src/sys/dev/isa/com_isa.c:1.37 Mon Nov 23 02:13:46 2009
+++ src/sys/dev/isa/com_isa.c Fri Jan 8 20:00:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: com_isa.c,v 1.37 2009/11/23 02:13:46 rmind Exp $ */
+/* $NetBSD: com_isa.c,v 1.38 2010/01/08 20:00:03 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.37 2009/11/23 02:13:46 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.38 2010/01/08 20:00:03 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,8 +95,8 @@
int sc_irq;
};
-static bool com_isa_suspend(device_t PMF_FN_PROTO);
-static bool com_isa_resume(device_t PMF_FN_PROTO);
+static bool com_isa_suspend(device_t, pmf_qual_t);
+static bool com_isa_resume(device_t, pmf_qual_t);
int com_isa_probe(device_t, cfdata_t , void *);
void com_isa_attach(device_t, device_t, void *);
@@ -218,11 +218,11 @@
}
static bool
-com_isa_suspend(device_t self PMF_FN_ARGS)
+com_isa_suspend(device_t self, pmf_qual_t qual)
{
struct com_isa_softc *isc = device_private(self);
- if (!com_suspend(self PMF_FN_CALL))
+ if (!com_suspend(self, qual))
return false;
isa_intr_disestablish(isc->sc_ic, isc->sc_ih);
@@ -232,7 +232,7 @@
}
static bool
-com_isa_resume(device_t self PMF_FN_ARGS)
+com_isa_resume(device_t self, pmf_qual_t qual)
{
struct com_isa_softc *isc = device_private(self);
struct com_softc *sc = &isc->sc_com;
@@ -240,7 +240,7 @@
isc->sc_ih = isa_intr_establish(isc->sc_ic, isc->sc_irq, IST_EDGE,
IPL_SERIAL, comintr, sc);
- return com_resume(self PMF_FN_CALL);
+ return com_resume(self, qual);
}
static int
Index: src/sys/dev/isa/ym.c
diff -u src/sys/dev/isa/ym.c:1.37 src/sys/dev/isa/ym.c:1.38
--- src/sys/dev/isa/ym.c:1.37 Sat Jan 2 02:37:08 2010
+++ src/sys/dev/isa/ym.c Fri Jan 8 20:00:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ym.c,v 1.37 2010/01/02 02:37:08 christos Exp $ */
+/* $NetBSD: ym.c,v 1.38 2010/01/08 20:00:03 dyoung Exp $ */
/*-
* Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.37 2010/01/02 02:37:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.38 2010/01/08 20:00:03 dyoung Exp $");
#include "mpu_ym.h"
#include "opt_ym.h"
@@ -162,8 +162,8 @@
static void ym_set_mic_gain(struct ym_softc *, int);
static void ym_set_3d(struct ym_softc *, mixer_ctrl_t *,
struct ad1848_volume *, int);
-static bool ym_suspend(device_t PMF_FN_PROTO);
-static bool ym_resume(device_t PMF_FN_PROTO);
+static bool ym_suspend(device_t, pmf_qual_t);
+static bool ym_resume(device_t, pmf_qual_t);
const struct audio_hw_if ym_hw_if = {
@@ -1107,7 +1107,7 @@
* DMA state should also be restored. FIXME.
*/
static bool
-ym_suspend(device_t self PMF_FN_ARGS)
+ym_suspend(device_t self, pmf_qual_t qual)
{
struct ym_softc *sc = device_private(self);
int s;
@@ -1144,7 +1144,7 @@
}
static bool
-ym_resume(device_t self PMF_FN_ARGS)
+ym_resume(device_t self, pmf_qual_t qual)
{
struct ym_softc *sc = device_private(self);
int i, xmax;
Index: src/sys/dev/isa/fd.c
diff -u src/sys/dev/isa/fd.c:1.93 src/sys/dev/isa/fd.c:1.94
--- src/sys/dev/isa/fd.c:1.93 Fri Jun 5 21:52:31 2009
+++ src/sys/dev/isa/fd.c Fri Jan 8 20:00:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.93 2009/06/05 21:52:31 haad Exp $ */
+/* $NetBSD: fd.c,v 1.94 2010/01/08 20:00:03 dyoung Exp $ */
/*-
* Copyright (c) 1998, 2003, 2008 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.93 2009/06/05 21:52:31 haad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.94 2010/01/08 20:00:03 dyoung Exp $");
#include "rnd.h"
#include "opt_ddb.h"
@@ -208,8 +208,8 @@
static int fddetach(device_t, int);
static int fdcintr1(struct fdc_softc *);
static void fdcintrcb(void *);
-static bool fdcsuspend(device_t PMF_FN_PROTO);
-static bool fdcresume(device_t PMF_FN_PROTO);
+static bool fdcsuspend(device_t, pmf_qual_t);
+static bool fdcresume(device_t, pmf_qual_t);
extern struct cfdriver fd_cd;
@@ -287,7 +287,7 @@
}
static bool
-fdcresume(device_t self PMF_FN_ARGS)
+fdcresume(device_t self, pmf_qual_t qual)
{
struct fdc_softc *fdc = device_private(self);
@@ -298,7 +298,7 @@
}
static bool
-fdcsuspend(device_t self PMF_FN_ARGS)
+fdcsuspend(device_t self, pmf_qual_t qual)
{
struct fdc_softc *fdc = device_private(self);
int drive;
Index: src/sys/dev/isa/sbdsp.c
diff -u src/sys/dev/isa/sbdsp.c:1.132 src/sys/dev/isa/sbdsp.c:1.133
--- src/sys/dev/isa/sbdsp.c:1.132 Tue Sep 1 21:47:30 2009
+++ src/sys/dev/isa/sbdsp.c Fri Jan 8 20:00:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sbdsp.c,v 1.132 2009/09/01 21:47:30 jmcneill Exp $ */
+/* $NetBSD: sbdsp.c,v 1.133 2010/01/08 20:00:03 dyoung Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.132 2009/09/01 21:47:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.133 2010/01/08 20:00:03 dyoung Exp $");
#include "midi.h"
#include "mpu.h"
@@ -224,7 +224,7 @@
int sbdsp_midi_intr(void *);
-static bool sbdsp_resume(device_t PMF_FN_PROTO);
+static bool sbdsp_resume(device_t, pmf_qual_t);
#ifdef AUDIO_DEBUG
void sb_printsc(struct sbdsp_softc *);
@@ -440,7 +440,7 @@
}
static bool
-sbdsp_resume(device_t dv PMF_FN_ARGS)
+sbdsp_resume(device_t dv, pmf_qual_t qual)
{
struct sbdsp_softc *sc = device_private(dv);
