Module Name: src
Committed By: dyoung
Date: Fri Jan 8 20:04:31 UTC 2010
Modified Files:
src/sys/dev/i2c: dbcool.c dbcool_var.h sdtemp.c
Log Message:
Expand PMF_FN_* macros.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/i2c/dbcool.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/i2c/dbcool_var.h
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/i2c/sdtemp.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/i2c/dbcool.c
diff -u src/sys/dev/i2c/dbcool.c:1.13 src/sys/dev/i2c/dbcool.c:1.14
--- src/sys/dev/i2c/dbcool.c:1.13 Mon Nov 2 21:37:44 2009
+++ src/sys/dev/i2c/dbcool.c Fri Jan 8 20:04:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dbcool.c,v 1.13 2009/11/02 21:37:44 christos Exp $ */
+/* $NetBSD: dbcool.c,v 1.14 2010/01/08 20:04:31 dyoung Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.13 2009/11/02 21:37:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.14 2010/01/08 20:04:31 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -648,7 +648,7 @@
}
/* On suspend, we save the state of the SHDN bit, then set it */
-bool dbcool_pmf_suspend(device_t dev PMF_FN_ARGS)
+bool dbcool_pmf_suspend(device_t dev, pmf_qual_t qual)
{
struct dbcool_softc *sc = device_private(dev);
uint8_t reg, bit, cfg;
@@ -672,7 +672,7 @@
}
/* On resume, we restore the previous state of the SHDN bit */
-bool dbcool_pmf_resume(device_t dev PMF_FN_ARGS)
+bool dbcool_pmf_resume(device_t dev, pmf_qual_t qual)
{
struct dbcool_softc *sc = device_private(dev);
uint8_t reg, bit, cfg;
Index: src/sys/dev/i2c/dbcool_var.h
diff -u src/sys/dev/i2c/dbcool_var.h:1.6 src/sys/dev/i2c/dbcool_var.h:1.7
--- src/sys/dev/i2c/dbcool_var.h:1.6 Mon Nov 2 21:37:44 2009
+++ src/sys/dev/i2c/dbcool_var.h Fri Jan 8 20:04:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: dbcool_var.h,v 1.6 2009/11/02 21:37:44 christos Exp $ */
+/* $NetBSD: dbcool_var.h,v 1.7 2010/01/08 20:04:31 dyoung Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbcool_var.h,v 1.6 2009/11/02 21:37:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool_var.h,v 1.7 2010/01/08 20:04:31 dyoung Exp $");
#include <dev/i2c/i2cvar.h>
@@ -147,7 +147,7 @@
void dbcool_writereg(struct dbcool_chipset *, uint8_t, uint8_t);
void dbcool_setup(device_t);
int dbcool_chip_ident(struct dbcool_chipset *);
-bool dbcool_pmf_suspend(device_t PMF_FN_PROTO);
-bool dbcool_pmf_resume(device_t PMF_FN_PROTO);
+bool dbcool_pmf_suspend(device_t, pmf_qual_t);
+bool dbcool_pmf_resume(device_t, pmf_qual_t);
#endif /* def DBCOOLVAR_H */
Index: src/sys/dev/i2c/sdtemp.c
diff -u src/sys/dev/i2c/sdtemp.c:1.8 src/sys/dev/i2c/sdtemp.c:1.9
--- src/sys/dev/i2c/sdtemp.c:1.8 Fri Jan 1 15:43:49 2010
+++ src/sys/dev/i2c/sdtemp.c Fri Jan 8 20:04:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sdtemp.c,v 1.8 2010/01/01 15:43:49 pgoyette Exp $ */
+/* $NetBSD: sdtemp.c,v 1.9 2010/01/08 20:04:31 dyoung Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.8 2010/01/01 15:43:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.9 2010/01/08 20:04:31 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,8 +73,8 @@
static int sdtemp_read_16(struct sdtemp_softc *, uint8_t, uint16_t *);
static int sdtemp_write_16(struct sdtemp_softc *, uint8_t, uint16_t);
static uint32_t sdtemp_decode_temp(struct sdtemp_softc *, uint16_t);
-static bool sdtemp_pmf_suspend(device_t PMF_FN_PROTO);
-static bool sdtemp_pmf_resume(device_t PMF_FN_PROTO);
+static bool sdtemp_pmf_suspend(device_t, pmf_qual_t);
+static bool sdtemp_pmf_resume(device_t, pmf_qual_t);
struct sdtemp_dev_entry {
const uint16_t sdtemp_mfg_id;
@@ -482,7 +482,7 @@
*/
static bool
-sdtemp_pmf_suspend(device_t dev PMF_FN_ARGS)
+sdtemp_pmf_suspend(device_t dev, pmf_qual_t qual)
{
struct sdtemp_softc *sc = device_private(dev);
int error;
@@ -499,7 +499,7 @@
}
static bool
-sdtemp_pmf_resume(device_t dev PMF_FN_ARGS)
+sdtemp_pmf_resume(device_t dev, pmf_qual_t qual)
{
struct sdtemp_softc *sc = device_private(dev);
int error;
