Module Name: src
Committed By: cegger
Date: Tue May 12 10:07:55 UTC 2009
Modified Files:
src/sys/dev/isapnp: aha_isapnp.c aic_isapnp.c gus_isapnp.c
i82365_isapnp.c if_cs_isapnp.c if_tr_isapnp.c isic_isapnp.c
isic_isapnp_dynalink.c wss_isapnp.c ym_isapnp.c
Log Message:
struct cfdata * -> cfdata_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/isapnp/aha_isapnp.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/isapnp/aic_isapnp.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/isapnp/gus_isapnp.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/isapnp/i82365_isapnp.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/isapnp/if_cs_isapnp.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/isapnp/if_tr_isapnp.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/isapnp/isic_isapnp.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/isapnp/isic_isapnp_dynalink.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/isapnp/wss_isapnp.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/isapnp/ym_isapnp.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/isapnp/aha_isapnp.c
diff -u src/sys/dev/isapnp/aha_isapnp.c:1.15 src/sys/dev/isapnp/aha_isapnp.c:1.16
--- src/sys/dev/isapnp/aha_isapnp.c:1.15 Mon Apr 28 20:23:52 2008
+++ src/sys/dev/isapnp/aha_isapnp.c Tue May 12 10:07:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aha_isapnp.c,v 1.15 2008/04/28 20:23:52 martin Exp $ */
+/* $NetBSD: aha_isapnp.c,v 1.16 2009/05/12 10:07:55 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha_isapnp.c,v 1.15 2008/04/28 20:23:52 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha_isapnp.c,v 1.16 2009/05/12 10:07:55 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,14 +53,14 @@
#include <dev/ic/ahareg.h>
#include <dev/ic/ahavar.h>
-int aha_isapnp_probe(struct device *, struct cfdata *, void *);
+int aha_isapnp_probe(struct device *, cfdata_t, void *);
void aha_isapnp_attach(struct device *, struct device *, void *);
CFATTACH_DECL(aha_isapnp, sizeof(struct aha_softc),
aha_isapnp_probe, aha_isapnp_attach, NULL, NULL);
int
-aha_isapnp_probe(struct device *parent, struct cfdata *match,
+aha_isapnp_probe(struct device *parent, cfdata_t match,
void *aux)
{
int pri, variant;
Index: src/sys/dev/isapnp/aic_isapnp.c
diff -u src/sys/dev/isapnp/aic_isapnp.c:1.17 src/sys/dev/isapnp/aic_isapnp.c:1.18
--- src/sys/dev/isapnp/aic_isapnp.c:1.17 Mon Apr 28 20:23:52 2008
+++ src/sys/dev/isapnp/aic_isapnp.c Tue May 12 10:07:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aic_isapnp.c,v 1.17 2008/04/28 20:23:52 martin Exp $ */
+/* $NetBSD: aic_isapnp.c,v 1.18 2009/05/12 10:07:55 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic_isapnp.c,v 1.17 2008/04/28 20:23:52 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic_isapnp.c,v 1.18 2009/05/12 10:07:55 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,14 +57,14 @@
void *sc_ih; /* interrupt handler */
};
-int aic_isapnp_match(struct device *, struct cfdata *, void *);
+int aic_isapnp_match(struct device *, cfdata_t, void *);
void aic_isapnp_attach(struct device *, struct device *, void *);
CFATTACH_DECL(aic_isapnp, sizeof(struct aic_isapnp_softc),
aic_isapnp_match, aic_isapnp_attach, NULL, NULL);
int
-aic_isapnp_match(struct device *parent, struct cfdata *match,
+aic_isapnp_match(struct device *parent, cfdata_t match,
void *aux)
{
int pri, variant;
Index: src/sys/dev/isapnp/gus_isapnp.c
diff -u src/sys/dev/isapnp/gus_isapnp.c:1.33 src/sys/dev/isapnp/gus_isapnp.c:1.34
--- src/sys/dev/isapnp/gus_isapnp.c:1.33 Mon Apr 28 20:23:52 2008
+++ src/sys/dev/isapnp/gus_isapnp.c Tue May 12 10:07:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gus_isapnp.c,v 1.33 2008/04/28 20:23:52 martin Exp $ */
+/* $NetBSD: gus_isapnp.c,v 1.34 2009/05/12 10:07:55 cegger Exp $ */
/*
* Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.33 2008/04/28 20:23:52 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.34 2009/05/12 10:07:55 cegger Exp $");
#include "guspnp.h"
#if NGUSPNP > 0
@@ -66,7 +66,7 @@
#include <dev/ic/interwavereg.h>
-int gus_isapnp_match(struct device *, struct cfdata *, void *);
+int gus_isapnp_match(struct device *, cfdata_t, void *);
void gus_isapnp_attach(struct device *, struct device *, void *);
static int gus_isapnp_open(void *, int);
@@ -119,7 +119,7 @@
static int gus_0 = 1; /* XXX what's this */
int
-gus_isapnp_match(struct device *parent, struct cfdata *match,
+gus_isapnp_match(struct device *parent, cfdata_t match,
void *aux)
{
int pri, variant;
Index: src/sys/dev/isapnp/i82365_isapnp.c
diff -u src/sys/dev/isapnp/i82365_isapnp.c:1.26 src/sys/dev/isapnp/i82365_isapnp.c:1.27
--- src/sys/dev/isapnp/i82365_isapnp.c:1.26 Thu Jun 26 12:33:17 2008
+++ src/sys/dev/isapnp/i82365_isapnp.c Tue May 12 10:07:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365_isapnp.c,v 1.26 2008/06/26 12:33:17 drochner Exp $ */
+/* $NetBSD: i82365_isapnp.c,v 1.27 2009/05/12 10:07:55 cegger Exp $ */
/*
* Copyright (c) 1998 Bill Sommerfeld. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365_isapnp.c,v 1.26 2008/06/26 12:33:17 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365_isapnp.c,v 1.27 2009/05/12 10:07:55 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,7 +65,7 @@
#define DPRINTF(arg)
#endif
-int pcic_isapnp_match(struct device *, struct cfdata *, void *);
+int pcic_isapnp_match(struct device *, cfdata_t, void *);
void pcic_isapnp_attach(struct device *, struct device *, void *);
CFATTACH_DECL(pcic_isapnp, sizeof(struct pcic_isa_softc),
@@ -92,7 +92,7 @@
};
int
-pcic_isapnp_match(struct device *parent, struct cfdata *match,
+pcic_isapnp_match(struct device *parent, cfdata_t match,
void *aux)
{
int pri, variant;
Index: src/sys/dev/isapnp/if_cs_isapnp.c
diff -u src/sys/dev/isapnp/if_cs_isapnp.c:1.13 src/sys/dev/isapnp/if_cs_isapnp.c:1.14
--- src/sys/dev/isapnp/if_cs_isapnp.c:1.13 Sat Mar 14 21:04:20 2009
+++ src/sys/dev/isapnp/if_cs_isapnp.c Tue May 12 10:07:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_isapnp.c,v 1.13 2009/03/14 21:04:20 dsl Exp $ */
+/* $NetBSD: if_cs_isapnp.c,v 1.14 2009/05/12 10:07:55 cegger Exp $ */
/*-
* Copyright (c)2001 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_isapnp.c,v 1.13 2009/03/14 21:04:20 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_isapnp.c,v 1.14 2009/05/12 10:07:55 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,14 +57,14 @@
#define DEVNAME(sc) device_xname(&((sc)->sc_dev))
-int cs_isapnp_match(struct device *, struct cfdata *, void *);
+int cs_isapnp_match(struct device *, cfdata_t, void *);
void cs_isapnp_attach(struct device *, struct device *, void *);
CFATTACH_DECL(cs_isapnp, sizeof(struct cs_softc),
cs_isapnp_match, cs_isapnp_attach, NULL, NULL);
int
-cs_isapnp_match(struct device *parent, struct cfdata *match, void *aux)
+cs_isapnp_match(struct device *parent, cfdata_t match, void *aux)
{
int pri, variant;
Index: src/sys/dev/isapnp/if_tr_isapnp.c
diff -u src/sys/dev/isapnp/if_tr_isapnp.c:1.18 src/sys/dev/isapnp/if_tr_isapnp.c:1.19
--- src/sys/dev/isapnp/if_tr_isapnp.c:1.18 Mon Apr 28 20:23:53 2008
+++ src/sys/dev/isapnp/if_tr_isapnp.c Tue May 12 10:07:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_isapnp.c,v 1.18 2008/04/28 20:23:53 martin Exp $ */
+/* $NetBSD: if_tr_isapnp.c,v 1.19 2009/05/12 10:07:55 cegger Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_isapnp.c,v 1.18 2008/04/28 20:23:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_isapnp.c,v 1.19 2009/05/12 10:07:55 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,14 +61,14 @@
#include <dev/isapnp/isapnpvar.h>
#include <dev/isapnp/isapnpdevs.h>
-int tr_isapnp_match(struct device *, struct cfdata *, void *);
+int tr_isapnp_match(struct device *, cfdata_t, void *);
void tr_isapnp_attach(struct device *, struct device *, void *);
CFATTACH_DECL(tr_isapnp, sizeof(struct tr_softc),
tr_isapnp_match, tr_isapnp_attach, NULL, NULL);
int
-tr_isapnp_match(struct device *parent, struct cfdata *match,
+tr_isapnp_match(struct device *parent, cfdata_t match,
void *aux)
{
int pri, variant;
Index: src/sys/dev/isapnp/isic_isapnp.c
diff -u src/sys/dev/isapnp/isic_isapnp.c:1.29 src/sys/dev/isapnp/isic_isapnp.c:1.30
--- src/sys/dev/isapnp/isic_isapnp.c:1.29 Mon Apr 28 20:23:53 2008
+++ src/sys/dev/isapnp/isic_isapnp.c Tue May 12 10:07:55 2009
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.29 2008/04/28 20:23:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.30 2009/05/12 10:07:55 cegger Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -73,7 +73,7 @@
extern const struct isdn_layer1_isdnif_driver isic_std_driver;
-static int isic_isapnp_probe(struct device *, struct cfdata *, void *);
+static int isic_isapnp_probe(struct device *, cfdata_t, void *);
static void isic_isapnp_attach(struct device *, struct device *, void *);
CFATTACH_DECL(isic_isapnp, sizeof(struct isic_softc),
@@ -155,7 +155,7 @@
*/
static int
isic_isapnp_probe(struct device *parent,
- struct cfdata *cf, void *aux)
+ cfdata_t cf, void *aux)
{
struct isapnp_attach_args *ipa = aux;
const struct isic_isapnp_card_desc *desc = isic_isapnp_descriptions;
Index: src/sys/dev/isapnp/isic_isapnp_dynalink.c
diff -u src/sys/dev/isapnp/isic_isapnp_dynalink.c:1.11 src/sys/dev/isapnp/isic_isapnp_dynalink.c:1.12
--- src/sys/dev/isapnp/isic_isapnp_dynalink.c:1.11 Wed Mar 18 16:00:18 2009
+++ src/sys/dev/isapnp/isic_isapnp_dynalink.c Tue May 12 10:07:55 2009
@@ -33,7 +33,7 @@
* isdn4bsd layer1 driver for Dynalink IS64PH isdn TA
* ==================================================
*
- * $Id: isic_isapnp_dynalink.c,v 1.11 2009/03/18 16:00:18 cegger Exp $
+ * $Id: isic_isapnp_dynalink.c,v 1.12 2009/05/12 10:07:55 cegger Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_dynalink.c,v 1.11 2009/03/18 16:00:18 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_dynalink.c,v 1.12 2009/05/12 10:07:55 cegger Exp $");
#include "opt_isicpnp.h"
#ifdef ISICPNP_DYNALINK
@@ -351,7 +351,7 @@
}
int
-isapnp_match_dynalink(struct device *parent, struct cfdata *cf,
+isapnp_match_dynalink(struct device *parent, cfdata_t cf,
struct isa_attach_args *ia)
{
struct isic_softc dummysc, *sc = &dummysc;
Index: src/sys/dev/isapnp/wss_isapnp.c
diff -u src/sys/dev/isapnp/wss_isapnp.c:1.23 src/sys/dev/isapnp/wss_isapnp.c:1.24
--- src/sys/dev/isapnp/wss_isapnp.c:1.23 Mon Apr 28 20:23:53 2008
+++ src/sys/dev/isapnp/wss_isapnp.c Tue May 12 10:07:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_isapnp.c,v 1.23 2008/04/28 20:23:53 martin Exp $ */
+/* $NetBSD: wss_isapnp.c,v 1.24 2009/05/12 10:07:55 cegger Exp $ */
/*
* Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c,v 1.23 2008/04/28 20:23:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c,v 1.24 2009/05/12 10:07:55 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,7 +55,7 @@
#include <dev/isa/wssvar.h>
#include <dev/isa/sbreg.h>
-int wss_isapnp_match(struct device *, struct cfdata *, void *);
+int wss_isapnp_match(struct device *, cfdata_t, void *);
void wss_isapnp_attach(struct device *, struct device *, void *);
CFATTACH_DECL(wss_isapnp, sizeof(struct wss_softc),
@@ -69,7 +69,7 @@
* Probe for the WSS hardware.
*/
int
-wss_isapnp_match(struct device *parent, struct cfdata *match,
+wss_isapnp_match(struct device *parent, cfdata_t match,
void *aux)
{
int pri, variant;
Index: src/sys/dev/isapnp/ym_isapnp.c
diff -u src/sys/dev/isapnp/ym_isapnp.c:1.22 src/sys/dev/isapnp/ym_isapnp.c:1.23
--- src/sys/dev/isapnp/ym_isapnp.c:1.22 Tue Apr 8 20:09:27 2008
+++ src/sys/dev/isapnp/ym_isapnp.c Tue May 12 10:07:55 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ym_isapnp.c,v 1.22 2008/04/08 20:09:27 cegger Exp $ */
+/* $NetBSD: ym_isapnp.c,v 1.23 2009/05/12 10:07:55 cegger Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym_isapnp.c,v 1.22 2008/04/08 20:09:27 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym_isapnp.c,v 1.23 2009/05/12 10:07:55 cegger Exp $");
#include "mpu_ym.h"
@@ -71,7 +71,7 @@
#include <dev/isa/wssreg.h>
#include <dev/isa/ymvar.h>
-int ym_isapnp_match(struct device *, struct cfdata *, void *);
+int ym_isapnp_match(struct device *, cfdata_t, void *);
void ym_isapnp_attach(struct device *, struct device *, void *);
CFATTACH_DECL(ym_isapnp, sizeof(struct ym_softc),
@@ -85,7 +85,7 @@
* Probe for the Yamaha hardware.
*/
int
-ym_isapnp_match(struct device *parent, struct cfdata *match,
+ym_isapnp_match(struct device *parent, cfdata_t match,
void *aux)
{
int pri, variant;
