Module Name: src
Committed By: dyoung
Date: Fri Jan 8 19:42:11 UTC 2010
Modified Files:
src/sys/arch/zaurus/dev: zaudio.c zkbd.c zlcd.c zssp.c ztp.c
Log Message:
Expand PMF_FN_* macros.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/zaurus/dev/zaudio.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/zaurus/dev/zkbd.c \
src/sys/arch/zaurus/dev/zlcd.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/zaurus/dev/zssp.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/zaurus/dev/ztp.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/zaurus/dev/zaudio.c
diff -u src/sys/arch/zaurus/dev/zaudio.c:1.10 src/sys/arch/zaurus/dev/zaudio.c:1.11
--- src/sys/arch/zaurus/dev/zaudio.c:1.10 Sat Apr 18 05:20:21 2009
+++ src/sys/arch/zaurus/dev/zaudio.c Fri Jan 8 19:42:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: zaudio.c,v 1.10 2009/04/18 05:20:21 nonaka Exp $ */
+/* $NetBSD: zaudio.c,v 1.11 2010/01/08 19:42:11 dyoung Exp $ */
/* $OpenBSD: zaurus_audio.c,v 1.8 2005/08/18 13:23:02 robert Exp $ */
/*
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1.10 2009/04/18 05:20:21 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1.11 2010/01/08 19:42:11 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,8 +84,8 @@
static int zaudio_match(device_t, cfdata_t, void *);
static void zaudio_attach(device_t, device_t, void *);
-static bool zaudio_suspend(device_t dv PMF_FN_ARGS);
-static bool zaudio_resume(device_t dv PMF_FN_ARGS);
+static bool zaudio_suspend(device_t dv, pmf_qual_t);
+static bool zaudio_resume(device_t dv, pmf_qual_t);
#define ZAUDIO_OP_SPKR 0
#define ZAUDIO_OP_HP 1
@@ -369,7 +369,7 @@
}
static bool
-zaudio_suspend(device_t dv PMF_FN_ARGS)
+zaudio_suspend(device_t dv, pmf_qual_t qual)
{
struct zaudio_softc *sc = device_private(dv);
@@ -380,7 +380,7 @@
}
static bool
-zaudio_resume(device_t dv PMF_FN_ARGS)
+zaudio_resume(device_t dv, pmf_qual_t qual)
{
struct zaudio_softc *sc = device_private(dv);
Index: src/sys/arch/zaurus/dev/zkbd.c
diff -u src/sys/arch/zaurus/dev/zkbd.c:1.9 src/sys/arch/zaurus/dev/zkbd.c:1.10
--- src/sys/arch/zaurus/dev/zkbd.c:1.9 Thu Jan 29 16:00:33 2009
+++ src/sys/arch/zaurus/dev/zkbd.c Fri Jan 8 19:42:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: zkbd.c,v 1.9 2009/01/29 16:00:33 nonaka Exp $ */
+/* $NetBSD: zkbd.c,v 1.10 2010/01/08 19:42:11 dyoung Exp $ */
/* $OpenBSD: zaurus_kbd.c,v 1.28 2005/12/21 20:36:03 deraadt Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.9 2009/01/29 16:00:33 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zkbd.c,v 1.10 2010/01/08 19:42:11 dyoung Exp $");
#include "opt_wsdisplay_compat.h"
#include "lcd.h"
@@ -131,7 +131,7 @@
static int zkbd_on(void *v);
static int zkbd_sync(void *v);
static int zkbd_hinge(void *v);
-static bool zkbd_resume(device_t dv PMF_FN_ARGS);
+static bool zkbd_resume(device_t dv, pmf_qual_t);
int zkbd_modstate;
@@ -594,7 +594,7 @@
}
static bool
-zkbd_resume(device_t dv PMF_FN_ARGS)
+zkbd_resume(device_t dv, pmf_qual_t qual)
{
struct zkbd_softc *sc = device_private(dv);
Index: src/sys/arch/zaurus/dev/zlcd.c
diff -u src/sys/arch/zaurus/dev/zlcd.c:1.9 src/sys/arch/zaurus/dev/zlcd.c:1.10
--- src/sys/arch/zaurus/dev/zlcd.c:1.9 Thu Jan 29 16:00:33 2009
+++ src/sys/arch/zaurus/dev/zlcd.c Fri Jan 8 19:42:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: zlcd.c,v 1.9 2009/01/29 16:00:33 nonaka Exp $ */
+/* $NetBSD: zlcd.c,v 1.10 2010/01/08 19:42:11 dyoung Exp $ */
/* $OpenBSD: zaurus_lcd.c,v 1.20 2006/06/02 20:50:14 miod Exp $ */
/* NetBSD: lubbock_lcd.c,v 1.1 2003/08/09 19:38:53 bsh Exp */
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zlcd.c,v 1.9 2009/01/29 16:00:33 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zlcd.c,v 1.10 2010/01/08 19:42:11 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -154,8 +154,8 @@
CFATTACH_DECL_NEW(zlcd, sizeof(struct pxa2x0_lcd_softc),
lcd_match, lcd_attach, NULL, NULL);
-static bool lcd_suspend(device_t dv PMF_FN_ARGS);
-static bool lcd_resume(device_t dv PMF_FN_ARGS);
+static bool lcd_suspend(device_t dv, pmf_qual_t);
+static bool lcd_resume(device_t dv, pmf_qual_t);
void lcd_cnattach(void);
int lcd_max_brightness(void);
@@ -208,7 +208,7 @@
* power management
*/
static bool
-lcd_suspend(device_t dv PMF_FN_ARGS)
+lcd_suspend(device_t dv, pmf_qual_t qual)
{
struct pxa2x0_lcd_softc *sc = device_private(dv);
@@ -219,7 +219,7 @@
}
static bool
-lcd_resume(device_t dv PMF_FN_ARGS)
+lcd_resume(device_t dv, pmf_qual_t qual)
{
struct pxa2x0_lcd_softc *sc = device_private(dv);
Index: src/sys/arch/zaurus/dev/zssp.c
diff -u src/sys/arch/zaurus/dev/zssp.c:1.7 src/sys/arch/zaurus/dev/zssp.c:1.8
--- src/sys/arch/zaurus/dev/zssp.c:1.7 Wed Mar 11 09:10:39 2009
+++ src/sys/arch/zaurus/dev/zssp.c Fri Jan 8 19:42:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: zssp.c,v 1.7 2009/03/11 09:10:39 nonaka Exp $ */
+/* $NetBSD: zssp.c,v 1.8 2010/01/08 19:42:11 dyoung Exp $ */
/* $OpenBSD: zaurus_ssp.c,v 1.6 2005/04/08 21:58:49 uwe Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zssp.c,v 1.7 2009/03/11 09:10:39 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zssp.c,v 1.8 2010/01/08 19:42:11 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,7 +54,7 @@
zssp_match, zssp_attach, NULL, NULL);
static void zssp_init(void);
-static bool zssp_resume(device_t dv PMF_FN_ARGS);
+static bool zssp_resume(device_t dv, pmf_qual_t);
static struct zssp_softc *zssp_sc;
@@ -116,7 +116,7 @@
}
static bool
-zssp_resume(device_t dv PMF_FN_ARGS)
+zssp_resume(device_t dv, pmf_qual_t qual)
{
int s;
Index: src/sys/arch/zaurus/dev/ztp.c
diff -u src/sys/arch/zaurus/dev/ztp.c:1.8 src/sys/arch/zaurus/dev/ztp.c:1.9
--- src/sys/arch/zaurus/dev/ztp.c:1.8 Sat Dec 12 07:49:31 2009
+++ src/sys/arch/zaurus/dev/ztp.c Fri Jan 8 19:42:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ztp.c,v 1.8 2009/12/12 07:49:31 nonaka Exp $ */
+/* $NetBSD: ztp.c,v 1.9 2010/01/08 19:42:11 dyoung Exp $ */
/* $OpenBSD: zts.c,v 1.9 2005/04/24 18:55:49 uwe Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ztp.c,v 1.8 2009/12/12 07:49:31 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ztp.c,v 1.9 2010/01/08 19:42:11 dyoung Exp $");
#include "lcd.h"
@@ -116,8 +116,8 @@
static int ztp_enable(void *);
static void ztp_disable(void *);
-static bool ztp_suspend(device_t dv PMF_FN_ARGS);
-static bool ztp_resume(device_t dv PMF_FN_ARGS);
+static bool ztp_suspend(device_t dv, pmf_qual_t);
+static bool ztp_resume(device_t dv, pmf_qual_t);
static void ztp_poll(void *);
static int ztp_irq(void *);
static int ztp_ioctl(void *, u_long, void *, int, struct lwp *);
@@ -237,7 +237,7 @@
}
static bool
-ztp_suspend(device_t dv PMF_FN_ARGS)
+ztp_suspend(device_t dv, pmf_qual_t qual)
{
struct ztp_softc *sc = device_private(dv);
@@ -258,7 +258,7 @@
}
static bool
-ztp_resume(device_t dv PMF_FN_ARGS)
+ztp_resume(device_t dv, pmf_qual_t qual)
{
struct ztp_softc *sc = device_private(dv);
