Module Name: src
Committed By: cegger
Date: Tue May 12 13:15:24 UTC 2009
Modified Files:
src/sys/dev/mca: aha_mca.c ed_mca.c edc_mca.c if_elmc_mca.c if_tr_mca.c
if_tra_mca.c mca.c
Log Message:
struct cfdata * -> cfdata_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/mca/aha_mca.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/mca/ed_mca.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/mca/edc_mca.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/mca/if_elmc_mca.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/mca/if_tr_mca.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/mca/if_tra_mca.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/mca/mca.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/mca/aha_mca.c
diff -u src/sys/dev/mca/aha_mca.c:1.18 src/sys/dev/mca/aha_mca.c:1.19
--- src/sys/dev/mca/aha_mca.c:1.18 Tue Apr 8 20:41:00 2008
+++ src/sys/dev/mca/aha_mca.c Tue May 12 13:15:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aha_mca.c,v 1.18 2008/04/08 20:41:00 cegger Exp $ */
+/* $NetBSD: aha_mca.c,v 1.19 2009/05/12 13:15:24 cegger Exp $ */
/*
* Copyright (c) 2000-2002 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.18 2008/04/08 20:41:00 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.19 2009/05/12 13:15:24 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,14 +77,14 @@
#define AHA_ISA_IOSIZE 4
-int aha_mca_probe(struct device *, struct cfdata *, void *);
+int aha_mca_probe(struct device *, cfdata_t, void *);
void aha_mca_attach(struct device *, struct device *, void *);
CFATTACH_DECL(aha_mca, sizeof(struct aha_softc),
aha_mca_probe, aha_mca_attach, NULL, NULL);
int
-aha_mca_probe(struct device *parent, struct cfdata *match,
+aha_mca_probe(struct device *parent, cfdata_t match,
void *aux)
{
register struct mca_attach_args *ma = aux;
Index: src/sys/dev/mca/ed_mca.c
diff -u src/sys/dev/mca/ed_mca.c:1.45 src/sys/dev/mca/ed_mca.c:1.46
--- src/sys/dev/mca/ed_mca.c:1.45 Sat Mar 14 21:04:20 2009
+++ src/sys/dev/mca/ed_mca.c Tue May 12 13:15:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ed_mca.c,v 1.45 2009/03/14 21:04:20 dsl Exp $ */
+/* $NetBSD: ed_mca.c,v 1.46 2009/05/12 13:15:24 cegger Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.45 2009/03/14 21:04:20 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.46 2009/05/12 13:15:24 cegger Exp $");
#include "rnd.h"
@@ -78,7 +78,7 @@
#define EDLABELDEV(dev) (MAKEDISKDEV(major(dev), DISKUNIT(dev), RAW_PART))
-static int ed_mca_probe (struct device *, struct cfdata *, void *);
+static int ed_mca_probe (struct device *, cfdata_t, void *);
static void ed_mca_attach (struct device *, struct device *, void *);
CFATTACH_DECL(ed_mca, sizeof(struct ed_softc),
@@ -115,7 +115,7 @@
* Just check if it's possible to identify the disk.
*/
static int
-ed_mca_probe(struct device *parent, struct cfdata *cf,
+ed_mca_probe(struct device *parent, cfdata_t cf,
void *aux)
{
u_int16_t cmd_args[2];
Index: src/sys/dev/mca/edc_mca.c
diff -u src/sys/dev/mca/edc_mca.c:1.42 src/sys/dev/mca/edc_mca.c:1.43
--- src/sys/dev/mca/edc_mca.c:1.42 Tue Jan 13 13:35:53 2009
+++ src/sys/dev/mca/edc_mca.c Tue May 12 13:15:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: edc_mca.c,v 1.42 2009/01/13 13:35:53 yamt Exp $ */
+/* $NetBSD: edc_mca.c,v 1.43 2009/05/12 13:15:24 cegger Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.42 2009/01/13 13:35:53 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.43 2009/05/12 13:15:24 cegger Exp $");
#include "rnd.h"
@@ -116,7 +116,7 @@
u_int16_t status_block[EDC_MAX_CMD_RES_LEN];
};
-int edc_mca_probe(struct device *, struct cfdata *, void *);
+int edc_mca_probe(struct device *, cfdata_t, void *);
void edc_mca_attach(struct device *, struct device *, void *);
CFATTACH_DECL(edc_mca, sizeof(struct edc_mca_softc),
@@ -130,7 +130,7 @@
static void edcworker(void *);
int
-edc_mca_probe(struct device *parent, struct cfdata *match,
+edc_mca_probe(struct device *parent, cfdata_t match,
void *aux)
{
struct mca_attach_args *ma = aux;
Index: src/sys/dev/mca/if_elmc_mca.c
diff -u src/sys/dev/mca/if_elmc_mca.c:1.27 src/sys/dev/mca/if_elmc_mca.c:1.28
--- src/sys/dev/mca/if_elmc_mca.c:1.27 Sat Mar 14 21:04:21 2009
+++ src/sys/dev/mca/if_elmc_mca.c Tue May 12 13:15:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_elmc_mca.c,v 1.27 2009/03/14 21:04:21 dsl Exp $ */
+/* $NetBSD: if_elmc_mca.c,v 1.28 2009/05/12 13:15:24 cegger Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.27 2009/03/14 21:04:21 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.28 2009/05/12 13:15:24 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,7 +72,7 @@
void *sc_ih; /* interrupt handle */
};
-int elmc_mca_match(struct device *, struct cfdata *, void *);
+int elmc_mca_match(struct device *, cfdata_t, void *);
void elmc_mca_attach(struct device *, struct device *, void *);
static void elmc_mca_copyin(struct ie_softc *, void *, int, size_t);
@@ -85,7 +85,7 @@
static int elmc_mca_intrhook(struct ie_softc *, int);
int
-elmc_mca_match(struct device *parent, struct cfdata *cf,
+elmc_mca_match(struct device *parent, cfdata_t cf,
void *aux)
{
struct mca_attach_args *ma = aux;
Index: src/sys/dev/mca/if_tr_mca.c
diff -u src/sys/dev/mca/if_tr_mca.c:1.19 src/sys/dev/mca/if_tr_mca.c:1.20
--- src/sys/dev/mca/if_tr_mca.c:1.19 Sat Mar 14 15:36:18 2009
+++ src/sys/dev/mca/if_tr_mca.c Tue May 12 13:15:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_mca.c,v 1.19 2009/03/14 15:36:18 dsl Exp $ */
+/* $NetBSD: if_tr_mca.c,v 1.20 2009/05/12 13:15:24 cegger Exp $ */
/*_
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_mca.c,v 1.19 2009/03/14 15:36:18 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_mca.c,v 1.20 2009/05/12 13:15:24 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,7 +61,7 @@
#define TR_MBPS_4 0
#define TR_MBPS_16 1
-int tr_mca_probe(struct device *, struct cfdata *, void *);
+int tr_mca_probe(struct device *, cfdata_t, void *);
void tr_mca_attach(struct device *, struct device *, void *);
CFATTACH_DECL(tr_mca, sizeof(struct tr_softc),
@@ -91,7 +91,7 @@
}
int
-tr_mca_probe(struct device *parent, struct cfdata *match,
+tr_mca_probe(struct device *parent, cfdata_t match,
void *aux)
{
struct mca_attach_args *ma = aux;
Index: src/sys/dev/mca/if_tra_mca.c
diff -u src/sys/dev/mca/if_tra_mca.c:1.12 src/sys/dev/mca/if_tra_mca.c:1.13
--- src/sys/dev/mca/if_tra_mca.c:1.12 Sat Mar 14 15:36:18 2009
+++ src/sys/dev/mca/if_tra_mca.c Tue May 12 13:15:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tra_mca.c,v 1.12 2009/03/14 15:36:18 dsl Exp $ */
+/* $NetBSD: if_tra_mca.c,v 1.13 2009/05/12 13:15:24 cegger Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.12 2009/03/14 15:36:18 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.13 2009/05/12 13:15:24 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,7 +56,7 @@
#include <dev/mca/mcavar.h>
#include <dev/mca/mcadevs.h>
-int tiara_mca_match(struct device *, struct cfdata *, void *);
+int tiara_mca_match(struct device *, cfdata_t, void *);
void tiara_mca_attach(struct device *, struct device *, void *);
#define TIARA_NPORTS 0x20 /* 32 */
@@ -97,7 +97,7 @@
}
int
-tiara_mca_match(struct device *parent, struct cfdata *match,
+tiara_mca_match(struct device *parent, cfdata_t match,
void *aux)
{
struct mca_attach_args *ma = (struct mca_attach_args *) aux;
Index: src/sys/dev/mca/mca.c
diff -u src/sys/dev/mca/mca.c:1.28 src/sys/dev/mca/mca.c:1.29
--- src/sys/dev/mca/mca.c:1.28 Sat Mar 14 21:04:21 2009
+++ src/sys/dev/mca/mca.c Tue May 12 13:15:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mca.c,v 1.28 2009/03/14 21:04:21 dsl Exp $ */
+/* $NetBSD: mca.c,v 1.29 2009/05/12 13:15:24 cegger Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.28 2009/03/14 21:04:21 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.29 2009/05/12 13:15:24 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@
#include "locators.h"
-int mca_match(struct device *, struct cfdata *, void *);
+int mca_match(struct device *, cfdata_t, void *);
void mca_attach(struct device *, struct device *, void *);
CFATTACH_DECL(mca, sizeof(struct device),
@@ -59,7 +59,7 @@
int mca_print(void *, const char *);
int
-mca_match(struct device *parent, struct cfdata *cf, void *aux)
+mca_match(struct device *parent, cfdata_t cf, void *aux)
{
struct mcabus_attach_args *mba = aux;
