Module Name: src
Committed By: cegger
Date: Tue May 12 12:12:52 UTC 2009
Modified Files:
src/sys/dev/eisa: ahb.c bha_eisa.c cac_eisa.c dpt_eisa.c if_fea.c
mlx_eisa.c uha_eisa.c
Log Message:
struct cfdata * -> cfdata_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/eisa/ahb.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/eisa/bha_eisa.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/eisa/cac_eisa.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/eisa/dpt_eisa.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/eisa/if_fea.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/eisa/mlx_eisa.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/eisa/uha_eisa.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/eisa/ahb.c
diff -u src/sys/dev/eisa/ahb.c:1.54 src/sys/dev/eisa/ahb.c:1.55
--- src/sys/dev/eisa/ahb.c:1.54 Sat Apr 18 14:58:02 2009
+++ src/sys/dev/eisa/ahb.c Tue May 12 12:12:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ahb.c,v 1.54 2009/04/18 14:58:02 tsutsui Exp $ */
+/* $NetBSD: ahb.c,v 1.55 2009/05/12 12:12:52 cegger Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.54 2009/04/18 14:58:02 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.55 2009/05/12 12:12:52 cegger Exp $");
#include "opt_ddb.h"
@@ -137,7 +137,7 @@
static int ahb_init_ecb(struct ahb_softc *, struct ahb_ecb *);
-static int ahbmatch(struct device *, struct cfdata *, void *);
+static int ahbmatch(struct device *, cfdata_t, void *);
static void ahbattach(struct device *, struct device *, void *);
CFATTACH_DECL(ahb, sizeof(struct ahb_softc),
@@ -151,7 +151,7 @@
* the actual probe routine to check it out.
*/
static int
-ahbmatch(struct device *parent, struct cfdata *match,
+ahbmatch(struct device *parent, cfdata_t match,
void *aux)
{
struct eisa_attach_args *ea = aux;
Index: src/sys/dev/eisa/bha_eisa.c
diff -u src/sys/dev/eisa/bha_eisa.c:1.31 src/sys/dev/eisa/bha_eisa.c:1.32
--- src/sys/dev/eisa/bha_eisa.c:1.31 Mon Apr 28 20:23:48 2008
+++ src/sys/dev/eisa/bha_eisa.c Tue May 12 12:12:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bha_eisa.c,v 1.31 2008/04/28 20:23:48 martin Exp $ */
+/* $NetBSD: bha_eisa.c,v 1.32 2009/05/12 12:12:52 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha_eisa.c,v 1.31 2008/04/28 20:23:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha_eisa.c,v 1.32 2009/05/12 12:12:52 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,7 +55,7 @@
#define BHA_EISA_IOCONF 0x0c
static int bha_eisa_address(bus_space_tag_t, bus_space_handle_t, int *);
-static int bha_eisa_match(struct device *, struct cfdata *, void *);
+static int bha_eisa_match(struct device *, cfdata_t, void *);
static void bha_eisa_attach(struct device *, struct device *, void *);
CFATTACH_DECL(bha_eisa, sizeof(struct bha_softc),
@@ -99,7 +99,7 @@
* the actual probe routine to check it out.
*/
static int
-bha_eisa_match(struct device *parent, struct cfdata *match,
+bha_eisa_match(struct device *parent, cfdata_t match,
void *aux)
{
struct eisa_attach_args *ea = aux;
Index: src/sys/dev/eisa/cac_eisa.c
diff -u src/sys/dev/eisa/cac_eisa.c:1.19 src/sys/dev/eisa/cac_eisa.c:1.20
--- src/sys/dev/eisa/cac_eisa.c:1.19 Mon Apr 28 20:23:48 2008
+++ src/sys/dev/eisa/cac_eisa.c Tue May 12 12:12:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cac_eisa.c,v 1.19 2008/04/28 20:23:48 martin Exp $ */
+/* $NetBSD: cac_eisa.c,v 1.20 2009/05/12 12:12:52 cegger Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cac_eisa.c,v 1.19 2008/04/28 20:23:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cac_eisa.c,v 1.20 2009/05/12 12:12:52 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -81,7 +81,7 @@
#define CAC_EISA_IOCONF 0x38
static void cac_eisa_attach(struct device *, struct device *, void *);
-static int cac_eisa_match(struct device *, struct cfdata *, void *);
+static int cac_eisa_match(struct device *, cfdata_t, void *);
static struct cac_ccb *cac_eisa_l0_completed(struct cac_softc *);
static int cac_eisa_l0_fifo_full(struct cac_softc *);
@@ -113,7 +113,7 @@
};
static int
-cac_eisa_match(struct device *parent, struct cfdata *match,
+cac_eisa_match(struct device *parent, cfdata_t match,
void *aux)
{
struct eisa_attach_args *ea;
Index: src/sys/dev/eisa/dpt_eisa.c
diff -u src/sys/dev/eisa/dpt_eisa.c:1.18 src/sys/dev/eisa/dpt_eisa.c:1.19
--- src/sys/dev/eisa/dpt_eisa.c:1.18 Sun Apr 6 08:54:43 2008
+++ src/sys/dev/eisa/dpt_eisa.c Tue May 12 12:12:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dpt_eisa.c,v 1.18 2008/04/06 08:54:43 cegger Exp $ */
+/* $NetBSD: dpt_eisa.c,v 1.19 2009/05/12 12:12:52 cegger Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran <a...@netbsd.org>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt_eisa.c,v 1.18 2008/04/06 08:54:43 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt_eisa.c,v 1.19 2009/05/12 12:12:52 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,7 +59,7 @@
static void dpt_eisa_attach(struct device *, struct device *, void *);
static int dpt_eisa_irq(bus_space_tag_t, bus_space_handle_t, int *);
-static int dpt_eisa_match(struct device *, struct cfdata *, void *);
+static int dpt_eisa_match(struct device *, cfdata_t, void *);
CFATTACH_DECL(dpt_eisa, sizeof(struct dpt_softc),
dpt_eisa_match, dpt_eisa_attach, NULL, NULL);
@@ -103,7 +103,7 @@
}
static int
-dpt_eisa_match(struct device *parent, struct cfdata *match,
+dpt_eisa_match(struct device *parent, cfdata_t match,
void *aux)
{
struct eisa_attach_args *ea;
Index: src/sys/dev/eisa/if_fea.c
diff -u src/sys/dev/eisa/if_fea.c:1.39 src/sys/dev/eisa/if_fea.c:1.40
--- src/sys/dev/eisa/if_fea.c:1.39 Sat Apr 18 14:58:02 2009
+++ src/sys/dev/eisa/if_fea.c Tue May 12 12:12:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fea.c,v 1.39 2009/04/18 14:58:02 tsutsui Exp $ */
+/* $NetBSD: if_fea.c,v 1.40 2009/05/12 12:12:52 cegger Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <m...@3am-software.com>
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.39 2009/04/18 14:58:02 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.40 2009/05/12 12:12:52 cegger Exp $");
#include "opt_inet.h"
@@ -333,7 +333,7 @@
static int
pdq_eisa_probe(
struct device *parent,
- struct cfdata *cf,
+ cfdata_t cf,
void *aux)
{
struct isa_attach_args *ia = (struct isa_attach_args *) aux;
@@ -445,7 +445,7 @@
static int
pdq_eisa_match(
struct device *parent,
- struct cfdata *match,
+ cfdata_t match,
void *aux)
{
const struct eisa_attach_args * const ea = (struct eisa_attach_args *) aux;
Index: src/sys/dev/eisa/mlx_eisa.c
diff -u src/sys/dev/eisa/mlx_eisa.c:1.20 src/sys/dev/eisa/mlx_eisa.c:1.21
--- src/sys/dev/eisa/mlx_eisa.c:1.20 Mon Apr 28 20:23:48 2008
+++ src/sys/dev/eisa/mlx_eisa.c Tue May 12 12:12:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mlx_eisa.c,v 1.20 2008/04/28 20:23:48 martin Exp $ */
+/* $NetBSD: mlx_eisa.c,v 1.21 2009/05/12 12:12:52 cegger Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx_eisa.c,v 1.20 2008/04/28 20:23:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx_eisa.c,v 1.21 2009/05/12 12:12:52 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,7 +64,7 @@
#define MLX_EISA_CFG10 (0x0c95 - MLX_EISA_SLOT_OFFSET)
static void mlx_eisa_attach(struct device *, struct device *, void *);
-static int mlx_eisa_match(struct device *, struct cfdata *, void *);
+static int mlx_eisa_match(struct device *, cfdata_t, void *);
static int mlx_v1_submit(struct mlx_softc *, struct mlx_ccb *);
static int mlx_v1_findcomplete(struct mlx_softc *, u_int *, u_int *);
@@ -92,7 +92,7 @@
};
static int
-mlx_eisa_match(struct device *parent, struct cfdata *match,
+mlx_eisa_match(struct device *parent, cfdata_t match,
void *aux)
{
struct eisa_attach_args *ea;
Index: src/sys/dev/eisa/uha_eisa.c
diff -u src/sys/dev/eisa/uha_eisa.c:1.29 src/sys/dev/eisa/uha_eisa.c:1.30
--- src/sys/dev/eisa/uha_eisa.c:1.29 Mon Apr 28 20:23:48 2008
+++ src/sys/dev/eisa/uha_eisa.c Tue May 12 12:12:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uha_eisa.c,v 1.29 2008/04/28 20:23:48 martin Exp $ */
+/* $NetBSD: uha_eisa.c,v 1.30 2009/05/12 12:12:52 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.29 2008/04/28 20:23:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.30 2009/05/12 12:12:52 cegger Exp $");
#include "opt_ddb.h"
@@ -57,7 +57,7 @@
#define UHA_EISA_SLOT_OFFSET 0xc80
#define UHA_EISA_IOSIZE 0x020
-static int uha_eisa_match(struct device *, struct cfdata *, void *);
+static int uha_eisa_match(struct device *, cfdata_t, void *);
static void uha_eisa_attach(struct device *, struct device *, void *);
CFATTACH_DECL(uha_eisa, sizeof(struct uha_softc),
@@ -80,7 +80,7 @@
* the actual probe routine to check it out.
*/
static int
-uha_eisa_match(struct device *parent, struct cfdata *match,
+uha_eisa_match(struct device *parent, cfdata_t match,
void *aux)
{
struct eisa_attach_args *ea = aux;
