Module Name: src
Committed By: cegger
Date: Tue May 12 12:16:55 UTC 2009
Modified Files:
src/sys/dev/ieee1394: firewire.c if_fwip.c sbp.c
Log Message:
struct cfdata * -> cfdata_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ieee1394/firewire.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/ieee1394/if_fwip.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/ieee1394/sbp.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/ieee1394/firewire.c
diff -u src/sys/dev/ieee1394/firewire.c:1.24 src/sys/dev/ieee1394/firewire.c:1.25
--- src/sys/dev/ieee1394/firewire.c:1.24 Wed Mar 18 16:00:18 2009
+++ src/sys/dev/ieee1394/firewire.c Tue May 12 12:16:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: firewire.c,v 1.24 2009/03/18 16:00:18 cegger Exp $ */
+/* $NetBSD: firewire.c,v 1.25 2009/05/12 12:16:55 cegger Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.24 2009/03/18 16:00:18 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.25 2009/05/12 12:16:55 cegger Exp $");
#if defined(__FreeBSD__)
#include <sys/param.h>
@@ -196,7 +196,7 @@
#endif
static device_t firewire_add_child (device_t, int, const char *, int);
#elif defined(__NetBSD__)
-int firewirematch (device_t, struct cfdata *, void *);
+int firewirematch (device_t, cfdata_t, void *);
void firewireattach (device_t, device_t, void *);
int firewiredetach (device_t, int);
int firewire_print (void *, const char *);
@@ -452,7 +452,7 @@
}
#elif defined(__NetBSD__)
int
-firewirematch(device_t parent, struct cfdata *cf, void *aux)
+firewirematch(device_t parent, cfdata_t cf, void *aux)
{
struct fwbus_attach_args *faa = (struct fwbus_attach_args *)aux;
Index: src/sys/dev/ieee1394/if_fwip.c
diff -u src/sys/dev/ieee1394/if_fwip.c:1.18 src/sys/dev/ieee1394/if_fwip.c:1.19
--- src/sys/dev/ieee1394/if_fwip.c:1.18 Wed Mar 18 16:00:18 2009
+++ src/sys/dev/ieee1394/if_fwip.c Tue May 12 12:16:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fwip.c,v 1.18 2009/03/18 16:00:18 cegger Exp $ */
+/* $NetBSD: if_fwip.c,v 1.19 2009/05/12 12:16:55 cegger Exp $ */
/*-
* Copyright (c) 2004
* Doug Rabson
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fwip.c,v 1.18 2009/03/18 16:00:18 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fwip.c,v 1.19 2009/05/12 12:16:55 cegger Exp $");
#ifdef HAVE_KERNEL_OPTION_HEADERS
#include "opt_device_polling.h"
@@ -114,7 +114,7 @@
#define TX_MAX_QUEUE (FWMAXQUEUE - 1)
#if defined(__NetBSD__)
-int fwipmatch (device_t, struct cfdata *, void *);
+int fwipmatch (device_t, cfdata_t, void *);
void fwipattach (device_t, device_t, void *);
int fwipdetach (device_t, int);
int fwipactivate (device_t, enum devact);
@@ -243,7 +243,7 @@
}
#elif defined(__NetBSD__)
int
-fwipmatch(device_t parent, struct cfdata *cf, void *aux)
+fwipmatch(device_t parent, cfdata_t cf, void *aux)
{
struct fw_attach_args *fwa = aux;
Index: src/sys/dev/ieee1394/sbp.c
diff -u src/sys/dev/ieee1394/sbp.c:1.27 src/sys/dev/ieee1394/sbp.c:1.28
--- src/sys/dev/ieee1394/sbp.c:1.27 Sat Apr 18 14:58:02 2009
+++ src/sys/dev/ieee1394/sbp.c Tue May 12 12:16:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sbp.c,v 1.27 2009/04/18 14:58:02 tsutsui Exp $ */
+/* $NetBSD: sbp.c,v 1.28 2009/05/12 12:16:55 cegger Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbp.c,v 1.27 2009/04/18 14:58:02 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbp.c,v 1.28 2009/05/12 12:16:55 cegger Exp $");
#if defined(__FreeBSD__)
#include <sys/param.h>
@@ -438,7 +438,7 @@
#define SBP_UNLOCK(sbp) fw_mtx_unlock(&(sbp)->mtx)
#if defined(__NetBSD__)
-int sbpmatch (device_t, struct cfdata *, void *);
+int sbpmatch (device_t, cfdata_t, void *);
void sbpattach (device_t parent, device_t self, void *aux);
int sbpdetach (device_t self, int flags);
#endif
@@ -579,7 +579,7 @@
}
#elif defined(__NetBSD__)
int
-sbpmatch(device_t parent, struct cfdata *cf, void *aux)
+sbpmatch(device_t parent, cfdata_t cf, void *aux)
{
struct fw_attach_args *fwa = aux;
