Module Name: src
Committed By: cegger
Date: Tue May 12 13:21:22 UTC 2009
Modified Files:
src/sys/dev/tc: bba.c if_fta.c px.c pxg.c tc.c xcfb.c zs_ioasic.c
Log Message:
struct cfdata * -> cfdata_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/tc/bba.c src/sys/dev/tc/px.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/tc/if_fta.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/tc/pxg.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/tc/tc.c src/sys/dev/tc/xcfb.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/tc/zs_ioasic.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/tc/bba.c
diff -u src/sys/dev/tc/bba.c:1.34 src/sys/dev/tc/bba.c:1.35
--- src/sys/dev/tc/bba.c:1.34 Mon Apr 28 20:23:58 2008
+++ src/sys/dev/tc/bba.c Tue May 12 13:21:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bba.c,v 1.34 2008/04/28 20:23:58 martin Exp $ */
+/* $NetBSD: bba.c,v 1.35 2009/05/12 13:21:22 cegger Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
/* maxine/alpha baseboard audio (bba) */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.34 2008/04/28 20:23:58 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.35 2009/05/12 13:21:22 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,7 +92,7 @@
struct bba_dma_state sc_rx_dma_state;
};
-static int bba_match(struct device *, struct cfdata *, void *);
+static int bba_match(struct device *, cfdata_t, void *);
static void bba_attach(struct device *, struct device *, void *);
CFATTACH_DECL(bba, sizeof(struct bba_softc),
@@ -190,7 +190,7 @@
static uint8_t bba_codec_dread(struct am7930_softc *, int);
static int
-bba_match(struct device *parent, struct cfdata *cf, void *aux)
+bba_match(struct device *parent, cfdata_t cf, void *aux)
{
struct ioasicdev_attach_args *ia;
Index: src/sys/dev/tc/px.c
diff -u src/sys/dev/tc/px.c:1.34 src/sys/dev/tc/px.c:1.35
--- src/sys/dev/tc/px.c:1.34 Wed Jul 9 13:19:33 2008
+++ src/sys/dev/tc/px.c Tue May 12 13:21:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: px.c,v 1.34 2008/07/09 13:19:33 joerg Exp $ */
+/* $NetBSD: px.c,v 1.35 2009/05/12 13:21:22 cegger Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.34 2008/07/09 13:19:33 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.35 2009/05/12 13:21:22 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -94,7 +94,7 @@
static void px_init(struct stic_info *, int);
static int px_ioctl(struct stic_info *, u_long, void *, int,
struct lwp *);
-static int px_match(struct device *, struct cfdata *, void *);
+static int px_match(struct device *, cfdata_t, void *);
static int px_intr(void *);
static uint32_t *px_pbuf_get(struct stic_info *);
Index: src/sys/dev/tc/if_fta.c
diff -u src/sys/dev/tc/if_fta.c:1.25 src/sys/dev/tc/if_fta.c:1.26
--- src/sys/dev/tc/if_fta.c:1.25 Sat Apr 5 16:44:41 2008
+++ src/sys/dev/tc/if_fta.c Tue May 12 13:21:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fta.c,v 1.25 2008/04/05 16:44:41 cegger Exp $ */
+/* $NetBSD: if_fta.c,v 1.26 2009/05/12 13:21:22 cegger Exp $ */
/*-
* Copyright (c) 1996 Matt Thomas <m...@3am-software.com>
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fta.c,v 1.25 2008/04/05 16:44:41 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fta.c,v 1.26 2009/05/12 13:21:22 cegger Exp $");
#include "opt_inet.h"
@@ -66,7 +66,7 @@
static int
pdq_tc_match(
struct device *parent,
- struct cfdata *match,
+ cfdata_t match,
void *aux)
{
struct tc_attach_args *ta = (struct tc_attach_args *) aux;
Index: src/sys/dev/tc/pxg.c
diff -u src/sys/dev/tc/pxg.c:1.30 src/sys/dev/tc/pxg.c:1.31
--- src/sys/dev/tc/pxg.c:1.30 Wed Jul 9 13:19:33 2008
+++ src/sys/dev/tc/pxg.c Tue May 12 13:21:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pxg.c,v 1.30 2008/07/09 13:19:33 joerg Exp $ */
+/* $NetBSD: pxg.c,v 1.31 2009/05/12 13:21:22 cegger Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxg.c,v 1.30 2008/07/09 13:19:33 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxg.c,v 1.31 2009/05/12 13:21:22 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -82,7 +82,7 @@
static void pxg_attach(struct device *, struct device *, void *);
static int pxg_intr(void *);
-static int pxg_match(struct device *, struct cfdata *, void *);
+static int pxg_match(struct device *, cfdata_t, void *);
static void pxg_init(struct stic_info *);
static int pxg_ioctl(struct stic_info *, u_long, void *, int, struct lwp *);
Index: src/sys/dev/tc/tc.c
diff -u src/sys/dev/tc/tc.c:1.48 src/sys/dev/tc/tc.c:1.49
--- src/sys/dev/tc/tc.c:1.48 Wed Jun 11 16:46:11 2008
+++ src/sys/dev/tc/tc.c Tue May 12 13:21:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tc.c,v 1.48 2008/06/11 16:46:11 tsutsui Exp $ */
+/* $NetBSD: tc.c,v 1.49 2009/05/12 13:21:22 cegger Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.48 2008/06/11 16:46:11 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.49 2009/05/12 13:21:22 cegger Exp $");
#include "opt_tcverbose.h"
@@ -45,7 +45,7 @@
#include "locators.h"
/* Definition of the driver for autoconfig. */
-static int tcmatch(struct device *, struct cfdata *, void *);
+static int tcmatch(struct device *, cfdata_t, void *);
CFATTACH_DECL(tc, sizeof(struct tc_softc),
tcmatch, tcattach, NULL, NULL);
@@ -56,7 +56,7 @@
static void tc_devinfo(const char *, char *, size_t);
static int
-tcmatch(struct device *parent, struct cfdata *cf, void *aux)
+tcmatch(struct device *parent, cfdata_t cf, void *aux)
{
struct tcbus_attach_args *tba = aux;
Index: src/sys/dev/tc/xcfb.c
diff -u src/sys/dev/tc/xcfb.c:1.48 src/sys/dev/tc/xcfb.c:1.49
--- src/sys/dev/tc/xcfb.c:1.48 Sat Dec 27 10:23:54 2008
+++ src/sys/dev/tc/xcfb.c Tue May 12 13:21:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xcfb.c,v 1.48 2008/12/27 10:23:54 he Exp $ */
+/* $NetBSD: xcfb.c,v 1.49 2009/05/12 13:21:22 cegger Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.48 2008/12/27 10:23:54 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.49 2009/05/12 13:21:22 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -94,7 +94,7 @@
int sc_csr; /* software copy of IMS332 CSR A */
};
-static int xcfbmatch(struct device *, struct cfdata *, void *);
+static int xcfbmatch(struct device *, cfdata_t, void *);
static void xcfbattach(struct device *, struct device *, void *);
CFATTACH_DECL_NEW(xcfb, sizeof(struct xcfb_softc),
Index: src/sys/dev/tc/zs_ioasic.c
diff -u src/sys/dev/tc/zs_ioasic.c:1.39 src/sys/dev/tc/zs_ioasic.c:1.40
--- src/sys/dev/tc/zs_ioasic.c:1.39 Sat Apr 18 14:58:04 2009
+++ src/sys/dev/tc/zs_ioasic.c Tue May 12 13:21:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_ioasic.c,v 1.39 2009/04/18 14:58:04 tsutsui Exp $ */
+/* $NetBSD: zs_ioasic.c,v 1.40 2009/05/12 13:21:22 cegger Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.39 2009/04/18 14:58:04 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.40 2009/05/12 13:21:22 cegger Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -182,7 +182,7 @@
static int zs_ioasic_match(device_t, cfdata_t, void *);
static void zs_ioasic_attach(device_t, device_t, void *);
static int zs_ioasic_print(void *, const char *name);
-static int zs_ioasic_submatch(device_t, struct cfdata *,
+static int zs_ioasic_submatch(device_t, cfdata_t,
const int *, void *);
CFATTACH_DECL_NEW(zsc_ioasic, sizeof(struct zsc_softc),
