Module Name: src
Committed By: dyoung
Date: Fri Jan 8 20:05:16 UTC 2010
Modified Files:
src/sys/dev: audio.c
src/sys/dev/hpc: hpcfb.c
src/sys/dev/scsipi: sd.c
Log Message:
Expand PMF_FN_* macros.
To generate a diff of this commit:
cvs rdiff -u -r1.249 -r1.250 src/sys/dev/audio.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/hpc/hpcfb.c
cvs rdiff -u -r1.290 -r1.291 src/sys/dev/scsipi/sd.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/audio.c
diff -u src/sys/dev/audio.c:1.249 src/sys/dev/audio.c:1.250
--- src/sys/dev/audio.c:1.249 Sun Dec 6 22:42:48 2009
+++ src/sys/dev/audio.c Fri Jan 8 20:05:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.249 2009/12/06 22:42:48 dyoung Exp $ */
+/* $NetBSD: audio.c,v 1.250 2010/01/08 20:05:15 dyoung Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.249 2009/12/06 22:42:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.250 2010/01/08 20:05:15 dyoung Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -183,8 +183,8 @@
static void audio_activity(device_t, devactive_t);
#endif
-static bool audio_suspend(device_t dv PMF_FN_PROTO);
-static bool audio_resume(device_t dv PMF_FN_PROTO);
+static bool audio_suspend(device_t dv, pmf_qual_t);
+static bool audio_resume(device_t dv, pmf_qual_t);
static void audio_volume_down(device_t);
static void audio_volume_up(device_t);
static void audio_volume_toggle(device_t);
@@ -4070,7 +4070,7 @@
#endif
static bool
-audio_suspend(device_t dv PMF_FN_ARGS)
+audio_suspend(device_t dv, pmf_qual_t qual)
{
struct audio_softc *sc = device_private(dv);
const struct audio_hw_if *hwp = sc->hw_if;
@@ -4091,7 +4091,7 @@
}
static bool
-audio_resume(device_t dv PMF_FN_ARGS)
+audio_resume(device_t dv, pmf_qual_t qual)
{
struct audio_softc *sc = device_private(dv);
int s;
Index: src/sys/dev/hpc/hpcfb.c
diff -u src/sys/dev/hpc/hpcfb.c:1.51 src/sys/dev/hpc/hpcfb.c:1.52
--- src/sys/dev/hpc/hpcfb.c:1.51 Mon Nov 23 02:13:45 2009
+++ src/sys/dev/hpc/hpcfb.c Fri Jan 8 20:05:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcfb.c,v 1.51 2009/11/23 02:13:45 rmind Exp $ */
+/* $NetBSD: hpcfb.c,v 1.52 2010/01/08 20:05:16 dyoung Exp $ */
/*-
* Copyright (c) 1999
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.51 2009/11/23 02:13:45 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.52 2010/01/08 20:05:16 dyoung Exp $");
#ifdef _KERNEL_OPT
#include "opt_hpcfb.h"
@@ -198,8 +198,8 @@
struct hpcfb_devconfig *);
static void hpcfb_power(int, void *);
-static bool hpcfb_suspend(device_t PMF_FN_PROTO);
-static bool hpcfb_resume(device_t PMF_FN_PROTO);
+static bool hpcfb_suspend(device_t, pmf_qual_t);
+static bool hpcfb_resume(device_t, pmf_qual_t);
void hpcfb_cursor(void *, int, int, int);
@@ -671,7 +671,7 @@
}
static bool
-hpcfb_suspend(device_t self PMF_FN_ARGS)
+hpcfb_suspend(device_t self, pmf_qual_t qual)
{
struct hpcfb_softc *sc = device_private(self);
@@ -680,7 +680,7 @@
}
static bool
-hpcfb_resume(device_t self PMF_FN_ARGS)
+hpcfb_resume(device_t self, pmf_qual_t qual)
{
struct hpcfb_softc *sc = device_private(self);
Index: src/sys/dev/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.290 src/sys/dev/scsipi/sd.c:1.291
--- src/sys/dev/scsipi/sd.c:1.290 Wed Oct 21 21:12:05 2009
+++ src/sys/dev/scsipi/sd.c Fri Jan 8 20:05:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.290 2009/10/21 21:12:05 rmind Exp $ */
+/* $NetBSD: sd.c,v 1.291 2010/01/08 20:05:16 dyoung Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.290 2009/10/21 21:12:05 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.291 2010/01/08 20:05:16 dyoung Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@@ -100,7 +100,7 @@
static void sdstart(struct scsipi_periph *);
static void sdrestart(void *);
static void sddone(struct scsipi_xfer *, int);
-static bool sd_suspend(device_t PMF_FN_PROTO);
+static bool sd_suspend(device_t, pmf_qual_t);
static bool sd_shutdown(device_t, int);
static int sd_interpret_sense(struct scsipi_xfer *);
static int sdlastclose(device_t);
@@ -1338,7 +1338,7 @@
}
static bool
-sd_suspend(device_t dv PMF_FN_ARGS)
+sd_suspend(device_t dv, pmf_qual_t qual)
{
return sd_shutdown(dv, boothowto); /* XXX no need to poll */
}
