CVS commit: src/sys/dev/sbus

[David Young]

Module Name:    src
Committed By:   dyoung
Date:           Fri Jan  8 20:01:21 UTC 2010

Modified Files:
        src/sys/dev/sbus: dbri.c p9100.c

Log Message:
Expand PMF_FN_* macros.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/sbus/dbri.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/sbus/p9100.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/sbus/dbri.c
diff -u src/sys/dev/sbus/dbri.c:1.27 src/sys/dev/sbus/dbri.c:1.28
--- src/sys/dev/sbus/dbri.c:1.27	Sat Jan  2 04:12:07 2010
+++ src/sys/dev/sbus/dbri.c	Fri Jan  8 20:01:21 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: dbri.c,v 1.27 2010/01/02 04:12:07 tsutsui Exp $	*/
+/*	$NetBSD: dbri.c,v 1.28 2010/01/08 20:01:21 dyoung Exp $	*/
 
 /*
  * Copyright (C) 1997 Rudolf Koenig (rfkoe...@immd4.informatik.uni-erlangen.de)
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.27 2010/01/02 04:12:07 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.28 2010/01/08 20:01:21 dyoung Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -162,8 +162,8 @@
 static paddr_t	dbri_mappage(void *, void *, off_t, int);
 static void	dbri_set_power(struct dbri_softc *, int);
 static void	dbri_bring_up(struct dbri_softc *);
-static bool	dbri_suspend(device_t PMF_FN_PROTO);
-static bool	dbri_resume(device_t PMF_FN_PROTO);
+static bool	dbri_suspend(device_t, pmf_qual_t);
+static bool	dbri_resume(device_t, pmf_qual_t);
 
 /* stupid support routines */
 static uint32_t	reverse_bytes(uint32_t, int);
@@ -2173,7 +2173,7 @@
 }
 
 static bool
-dbri_suspend(device_t self PMF_FN_ARGS)
+dbri_suspend(device_t self, pmf_qual_t qual)
 {
 	struct dbri_softc *sc = device_private(self);
 
@@ -2182,7 +2182,7 @@
 }
 
 static bool
-dbri_resume(device_t self PMF_FN_ARGS)
+dbri_resume(device_t self, pmf_qual_t qual)
 {
 	struct dbri_softc *sc = device_private(self);
 

Index: src/sys/dev/sbus/p9100.c
diff -u src/sys/dev/sbus/p9100.c:1.50 src/sys/dev/sbus/p9100.c:1.51
--- src/sys/dev/sbus/p9100.c:1.50	Sat Sep 19 11:58:06 2009
+++ src/sys/dev/sbus/p9100.c	Fri Jan  8 20:01:21 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: p9100.c,v 1.50 2009/09/19 11:58:06 tsutsui Exp $ */
+/*	$NetBSD: p9100.c,v 1.51 2010/01/08 20:01:21 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.50 2009/09/19 11:58:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.51 2010/01/08 20:01:21 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -236,8 +236,8 @@
 #endif
 
 /* power management stuff */
-static bool p9100_suspend(device_t PMF_FN_PROTO);
-static bool p9100_resume(device_t PMF_FN_PROTO);
+static bool p9100_suspend(device_t, pmf_qual_t);
+static bool p9100_resume(device_t, pmf_qual_t);
 
 #if NTCTRL > 0
 static void p9100_set_extvga(void *, int);
@@ -925,7 +925,7 @@
 }
 
 static bool
-p9100_suspend(device_t dev PMF_FN_ARGS)
+p9100_suspend(device_t dev, pmf_qual_t qual)
 {
 	struct p9100_softc *sc = device_private(dev);
 
@@ -946,7 +946,7 @@
 }
 
 static bool
-p9100_resume(device_t dev PMF_FN_ARGS)
+p9100_resume(device_t dev, pmf_qual_t qual)
 {
 	struct p9100_softc *sc = device_private(dev);