CVS commit: src/sys/dev/pcmcia

[David Young]

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

Modified Files:
        src/sys/dev/pcmcia: bt3c.c btbc.c

Log Message:
Expand PMF_FN_* macros.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/pcmcia/bt3c.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pcmcia/btbc.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/pcmcia/bt3c.c
diff -u src/sys/dev/pcmcia/bt3c.c:1.19 src/sys/dev/pcmcia/bt3c.c:1.20
--- src/sys/dev/pcmcia/bt3c.c:1.19	Tue May 12 13:18:04 2009
+++ src/sys/dev/pcmcia/bt3c.c	Fri Jan  8 20:01:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bt3c.c,v 1.19 2009/05/12 13:18:04 cegger Exp $ */
+/* $NetBSD: bt3c.c,v 1.20 2010/01/08 20:01:00 dyoung Exp $ */
 
 /*-
  * Copyright (c) 2005 Iain D. Hibbert,
@@ -69,7 +69,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bt3c.c,v 1.19 2009/05/12 13:18:04 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bt3c.c,v 1.20 2010/01/08 20:01:00 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -135,8 +135,8 @@
 static int bt3c_match(device_t, cfdata_t, void *);
 static void bt3c_attach(device_t, device_t, void *);
 static int bt3c_detach(device_t, int);
-static bool bt3c_suspend(device_t PMF_FN_PROTO);
-static bool bt3c_resume(device_t PMF_FN_PROTO);
+static bool bt3c_suspend(device_t, pmf_qual_t);
+static bool bt3c_resume(device_t, pmf_qual_t);
 
 CFATTACH_DECL_NEW(bt3c, sizeof(struct bt3c_softc),
     bt3c_match, bt3c_attach, bt3c_detach, NULL);
@@ -1019,7 +1019,7 @@
 }
 
 static bool
-bt3c_suspend(device_t self PMF_FN_ARGS)
+bt3c_suspend(device_t self, pmf_qual_t qual)
 {
 	struct bt3c_softc *sc = device_private(self);
 
@@ -1032,7 +1032,7 @@
 }
 
 static bool
-bt3c_resume(device_t self PMF_FN_ARGS)
+bt3c_resume(device_t self, pmf_qual_t qual)
 {
 	struct bt3c_softc *sc = device_private(self);
 

Index: src/sys/dev/pcmcia/btbc.c
diff -u src/sys/dev/pcmcia/btbc.c:1.13 src/sys/dev/pcmcia/btbc.c:1.14
--- src/sys/dev/pcmcia/btbc.c:1.13	Tue May 12 13:18:04 2009
+++ src/sys/dev/pcmcia/btbc.c	Fri Jan  8 20:01:00 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: btbc.c,v 1.13 2009/05/12 13:18:04 cegger Exp $	*/
+/*	$NetBSD: btbc.c,v 1.14 2010/01/08 20:01:00 dyoung Exp $	*/
 /*
  * Copyright (c) 2007 KIYOHARA Takashi
  * All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btbc.c,v 1.13 2009/05/12 13:18:04 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btbc.c,v 1.14 2010/01/08 20:01:00 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/callout.h>
@@ -104,8 +104,8 @@
 static int btbc_match(device_t, cfdata_t, void *);
 static void btbc_attach(device_t, device_t, void *);
 static int btbc_detach(device_t, int);
-static bool btbc_suspend(device_t PMF_FN_PROTO);
-static bool btbc_resume(device_t PMF_FN_PROTO);
+static bool btbc_suspend(device_t, pmf_qual_t);
+static bool btbc_resume(device_t, pmf_qual_t);
 
 static void btbc_activity_led_timeout(void *);
 static void btbc_enable_activity_led(struct btbc_softc *);
@@ -224,7 +224,7 @@
 }
 
 static bool
-btbc_suspend(device_t self PMF_FN_ARGS)
+btbc_suspend(device_t self, pmf_qual_t qual)
 {
 	struct btbc_softc *sc = device_private(self);
 
@@ -238,7 +238,7 @@
 
 
 static bool
-btbc_resume(device_t self PMF_FN_ARGS)
+btbc_resume(device_t self, pmf_qual_t qual)
 {
 	struct btbc_softc *sc = device_private(self);