Module Name: src
Committed By: dyoung
Date: Fri Jan 8 19:51:11 UTC 2010
Modified Files:
src/sys/dev/wscons: wsdisplay.c wskbd.c
src/sys/dev/wsfb: genfbvar.h
Log Message:
Expand PMF_FN_* macros.
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/sys/dev/wscons/wsdisplay.c
cvs rdiff -u -r1.122 -r1.123 src/sys/dev/wscons/wskbd.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/wsfb/genfbvar.h
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/wscons/wsdisplay.c
diff -u src/sys/dev/wscons/wsdisplay.c:1.126 src/sys/dev/wscons/wsdisplay.c:1.127
--- src/sys/dev/wscons/wsdisplay.c:1.126 Thu Jan 22 20:40:20 2009
+++ src/sys/dev/wscons/wsdisplay.c Fri Jan 8 19:51:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.126 2009/01/22 20:40:20 drochner Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.127 2010/01/08 19:51:11 dyoung Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.126 2009/01/22 20:40:20 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.127 2010/01/08 19:51:11 dyoung Exp $");
#include "opt_wsdisplay_compat.h"
#include "opt_wsmsgattrs.h"
@@ -166,7 +166,7 @@
static void wsdisplay_emul_attach(device_t, device_t, void *);
static int wsdisplay_noemul_match(device_t, cfdata_t, void *);
static void wsdisplay_noemul_attach(device_t, device_t, void *);
-static bool wsdisplay_suspend(device_t PMF_FN_PROTO);
+static bool wsdisplay_suspend(device_t, pmf_qual_t);
CFATTACH_DECL_NEW(wsdisplay_emul, sizeof (struct wsdisplay_softc),
wsdisplay_emul_match, wsdisplay_emul_attach, NULL, NULL);
@@ -677,7 +677,7 @@
}
static bool
-wsdisplay_suspend(device_t dv PMF_FN_ARGS)
+wsdisplay_suspend(device_t dv, pmf_qual_t qual)
{
struct wsdisplay_softc *sc = device_private(dv);
#ifdef DIAGNOSTIC
Index: src/sys/dev/wscons/wskbd.c
diff -u src/sys/dev/wscons/wskbd.c:1.122 src/sys/dev/wscons/wskbd.c:1.123
--- src/sys/dev/wscons/wskbd.c:1.122 Thu Jan 15 04:22:11 2009
+++ src/sys/dev/wscons/wskbd.c Fri Jan 8 19:51:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbd.c,v 1.122 2009/01/15 04:22:11 yamt Exp $ */
+/* $NetBSD: wskbd.c,v 1.123 2010/01/08 19:51:11 dyoung Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.122 2009/01/15 04:22:11 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.123 2010/01/08 19:51:11 dyoung Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -347,7 +347,7 @@
};
#endif
-static bool wskbd_suspend(device_t dv PMF_FN_PROTO);
+static bool wskbd_suspend(device_t dv, pmf_qual_t);
static void wskbd_repeat(void *v);
static int wskbd_console_initted;
@@ -505,7 +505,7 @@
}
static bool
-wskbd_suspend(device_t dv PMF_FN_ARGS)
+wskbd_suspend(device_t dv, pmf_qual_t qual)
{
struct wskbd_softc *sc = device_private(dv);
Index: src/sys/dev/wsfb/genfbvar.h
diff -u src/sys/dev/wsfb/genfbvar.h:1.11 src/sys/dev/wsfb/genfbvar.h:1.12
--- src/sys/dev/wsfb/genfbvar.h:1.11 Mon Aug 24 11:03:44 2009
+++ src/sys/dev/wsfb/genfbvar.h Fri Jan 8 19:51:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: genfbvar.h,v 1.11 2009/08/24 11:03:44 jmcneill Exp $ */
+/* $NetBSD: genfbvar.h,v 1.12 2010/01/08 19:51:11 dyoung Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v 1.11 2009/08/24 11:03:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v 1.12 2010/01/08 19:51:11 dyoung Exp $");
#ifndef GENFBVAR_H
#define GENFBVAR_H
@@ -57,8 +57,8 @@
};
struct genfb_pmf_callback {
- bool (*gpc_suspend)(device_t PMF_FN_PROTO);
- bool (*gpc_resume)(device_t PMF_FN_PROTO);
+ bool (*gpc_suspend)(device_t, pmf_qual_t);
+ bool (*gpc_resume)(device_t, pmf_qual_t);
};
struct genfb_softc {
