Module Name: src
Committed By: cegger
Date: Tue May 12 13:18:05 UTC 2009
Modified Files:
src/sys/dev/pcmcia: aic_pcmcia.c bt3c.c btbc.c if_an_pcmcia.c
if_awi_pcmcia.c if_cnw.c if_cs_pcmcia.c if_ray.c if_sm_pcmcia.c
if_tr_pcmcia.c if_wi_pcmcia.c isic_pcmcia.c mhzc.c pcmcia.c
pcmcom.c slhci_pcmcia.c xirc.c
Log Message:
struct cfdata * -> cfdata_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pcmcia/aic_pcmcia.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pcmcia/bt3c.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pcmcia/btbc.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/pcmcia/if_an_pcmcia.c \
src/sys/dev/pcmcia/isic_pcmcia.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/pcmcia/if_awi_pcmcia.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pcmcia/if_cnw.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pcmcia/if_cs_pcmcia.c
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/pcmcia/if_ray.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/pcmcia/if_sm_pcmcia.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pcmcia/if_tr_pcmcia.c
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/pcmcia/if_wi_pcmcia.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/pcmcia/mhzc.c
cvs rdiff -u -r1.91 -r1.92 src/sys/dev/pcmcia/pcmcia.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pcmcia/pcmcom.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pcmcia/slhci_pcmcia.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pcmcia/xirc.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/pcmcia/aic_pcmcia.c
diff -u src/sys/dev/pcmcia/aic_pcmcia.c:1.38 src/sys/dev/pcmcia/aic_pcmcia.c:1.39
--- src/sys/dev/pcmcia/aic_pcmcia.c:1.38 Sat Mar 14 15:36:20 2009
+++ src/sys/dev/pcmcia/aic_pcmcia.c Tue May 12 13:18:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aic_pcmcia.c,v 1.38 2009/03/14 15:36:20 dsl Exp $ */
+/* $NetBSD: aic_pcmcia.c,v 1.39 2009/05/12 13:18:04 cegger Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.38 2009/03/14 15:36:20 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.39 2009/05/12 13:18:04 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,7 +62,7 @@
#define AIC_PCMCIA_ATTACHED 3
};
-int aic_pcmcia_match(struct device *, struct cfdata *, void *);
+int aic_pcmcia_match(struct device *, cfdata_t, void *);
int aic_pcmcia_validate_config(struct pcmcia_config_entry *);
void aic_pcmcia_attach(struct device *, struct device *, void *);
int aic_pcmcia_detach(struct device *, int);
@@ -85,7 +85,7 @@
sizeof(aic_pcmcia_products) / sizeof(aic_pcmcia_products[0]);
int
-aic_pcmcia_match(struct device *parent, struct cfdata *match,
+aic_pcmcia_match(struct device *parent, cfdata_t match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
Index: src/sys/dev/pcmcia/bt3c.c
diff -u src/sys/dev/pcmcia/bt3c.c:1.18 src/sys/dev/pcmcia/bt3c.c:1.19
--- src/sys/dev/pcmcia/bt3c.c:1.18 Sun Apr 6 18:55:33 2008
+++ src/sys/dev/pcmcia/bt3c.c Tue May 12 13:18:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bt3c.c,v 1.18 2008/04/06 18:55:33 plunky Exp $ */
+/* $NetBSD: bt3c.c,v 1.19 2009/05/12 13:18:04 cegger Exp $ */
/*-
* Copyright (c) 2005 Iain D. Hibbert,
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bt3c.c,v 1.18 2008/04/06 18:55:33 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bt3c.c,v 1.19 2009/05/12 13:18:04 cegger Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -132,7 +132,7 @@
#define BT3C_XMIT (1 << 1) /* transmit active */
#define BT3C_ENABLED (1 << 2) /* enabled */
-static int bt3c_match(device_t, struct cfdata *, void *);
+static int bt3c_match(device_t, cfdata_t, void *);
static void bt3c_attach(device_t, device_t, void *);
static int bt3c_detach(device_t, int);
static bool bt3c_suspend(device_t PMF_FN_PROTO);
@@ -584,7 +584,7 @@
int32_t addr, data;
int err, sum, len;
firmware_handle_t fh;
- struct cfdata *cf = device_cfdata(sc->sc_dev);
+ cfdata_t cf = device_cfdata(sc->sc_dev);
size_t size;
err = firmware_open(cf->cf_name,
@@ -924,7 +924,7 @@
*/
static int
-bt3c_match(device_t parent, struct cfdata *match, void *aux)
+bt3c_match(device_t parent, cfdata_t match, void *aux)
{
struct pcmcia_attach_args *pa = aux;
Index: src/sys/dev/pcmcia/btbc.c
diff -u src/sys/dev/pcmcia/btbc.c:1.12 src/sys/dev/pcmcia/btbc.c:1.13
--- src/sys/dev/pcmcia/btbc.c:1.12 Sun Apr 6 18:55:33 2008
+++ src/sys/dev/pcmcia/btbc.c Tue May 12 13:18:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: btbc.c,v 1.12 2008/04/06 18:55:33 plunky Exp $ */
+/* $NetBSD: btbc.c,v 1.13 2009/05/12 13:18:04 cegger Exp $ */
/*
* Copyright (c) 2007 KIYOHARA Takashi
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btbc.c,v 1.12 2008/04/06 18:55:33 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btbc.c,v 1.13 2009/05/12 13:18:04 cegger Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -101,7 +101,7 @@
uint8_t sc_ctrlreg; /* value for control register */
};
-static int btbc_match(device_t, struct cfdata *, void *);
+static int btbc_match(device_t, cfdata_t, void *);
static void btbc_attach(device_t, device_t, void *);
static int btbc_detach(device_t, int);
static bool btbc_suspend(device_t PMF_FN_PROTO);
@@ -139,7 +139,7 @@
/* ARGSUSED */
static int
-btbc_match(device_t parent, struct cfdata *match, void *aux)
+btbc_match(device_t parent, cfdata_t match, void *aux)
{
struct pcmcia_attach_args *pa = aux;
Index: src/sys/dev/pcmcia/if_an_pcmcia.c
diff -u src/sys/dev/pcmcia/if_an_pcmcia.c:1.37 src/sys/dev/pcmcia/if_an_pcmcia.c:1.38
--- src/sys/dev/pcmcia/if_an_pcmcia.c:1.37 Sat Mar 14 15:36:20 2009
+++ src/sys/dev/pcmcia/if_an_pcmcia.c Tue May 12 13:18:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_an_pcmcia.c,v 1.37 2009/03/14 15:36:20 dsl Exp $ */
+/* $NetBSD: if_an_pcmcia.c,v 1.38 2009/05/12 13:18:04 cegger Exp $ */
/*-
* Copyright (c) 2000, 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.37 2009/03/14 15:36:20 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.38 2009/05/12 13:18:04 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,7 +62,7 @@
#include <dev/pcmcia/pcmciavar.h>
#include <dev/pcmcia/pcmciadevs.h>
-static int an_pcmcia_match(struct device *, struct cfdata *, void *);
+static int an_pcmcia_match(struct device *, cfdata_t, void *);
static int an_pcmcia_validate_config(struct pcmcia_config_entry *);
static void an_pcmcia_attach(struct device *, struct device *, void *);
static int an_pcmcia_detach(struct device *, int);
@@ -97,7 +97,7 @@
sizeof(an_pcmcia_products) / sizeof(an_pcmcia_products[0]);
static int
-an_pcmcia_match(struct device *parent, struct cfdata *match,
+an_pcmcia_match(struct device *parent, cfdata_t match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
Index: src/sys/dev/pcmcia/isic_pcmcia.c
diff -u src/sys/dev/pcmcia/isic_pcmcia.c:1.37 src/sys/dev/pcmcia/isic_pcmcia.c:1.38
--- src/sys/dev/pcmcia/isic_pcmcia.c:1.37 Sat Mar 14 15:36:20 2009
+++ src/sys/dev/pcmcia/isic_pcmcia.c Tue May 12 13:18:04 2009
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia.c,v 1.37 2009/03/14 15:36:20 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia.c,v 1.38 2009/05/12 13:18:04 cegger Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -76,7 +76,7 @@
extern const struct isdn_layer1_isdnif_driver isic_std_driver;
-static int isic_pcmcia_match(struct device *, struct cfdata *, void *);
+static int isic_pcmcia_match(struct device *, cfdata_t, void *);
static void isic_pcmcia_attach(struct device *, struct device *, void *);
static const struct isic_pcmcia_card_entry * find_matching_card(struct pcmcia_attach_args *pa);
static int isic_pcmcia_isdn_attach(struct isic_softc *sc, const char*);
@@ -172,7 +172,7 @@
*/
static int
isic_pcmcia_match(struct device *parent,
- struct cfdata *match, void *aux)
+ cfdata_t match, void *aux)
{
struct pcmcia_attach_args *pa = aux;
Index: src/sys/dev/pcmcia/if_awi_pcmcia.c
diff -u src/sys/dev/pcmcia/if_awi_pcmcia.c:1.41 src/sys/dev/pcmcia/if_awi_pcmcia.c:1.42
--- src/sys/dev/pcmcia/if_awi_pcmcia.c:1.41 Sat Mar 14 15:36:20 2009
+++ src/sys/dev/pcmcia/if_awi_pcmcia.c Tue May 12 13:18:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_awi_pcmcia.c,v 1.41 2009/03/14 15:36:20 dsl Exp $ */
+/* $NetBSD: if_awi_pcmcia.c,v 1.42 2009/05/12 13:18:04 cegger Exp $ */
/*-
* Copyright (c) 1999, 2004 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_awi_pcmcia.c,v 1.41 2009/03/14 15:36:20 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_awi_pcmcia.c,v 1.42 2009/05/12 13:18:04 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,7 +71,7 @@
#include <dev/pcmcia/pcmciavar.h>
#include <dev/pcmcia/pcmciadevs.h>
-static int awi_pcmcia_match(struct device *, struct cfdata *, void *);
+static int awi_pcmcia_match(struct device *, cfdata_t, void *);
static int awi_pcmcia_validate_config(struct pcmcia_config_entry *);
static void awi_pcmcia_attach(struct device *, struct device *, void *);
static int awi_pcmcia_detach(struct device *, int);
@@ -150,7 +150,7 @@
}
static int
-awi_pcmcia_match(struct device *parent, struct cfdata *match,
+awi_pcmcia_match(struct device *parent, cfdata_t match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
Index: src/sys/dev/pcmcia/if_cnw.c
diff -u src/sys/dev/pcmcia/if_cnw.c:1.49 src/sys/dev/pcmcia/if_cnw.c:1.50
--- src/sys/dev/pcmcia/if_cnw.c:1.49 Wed Apr 15 20:44:25 2009
+++ src/sys/dev/pcmcia/if_cnw.c Tue May 12 13:18:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cnw.c,v 1.49 2009/04/15 20:44:25 elad Exp $ */
+/* $NetBSD: if_cnw.c,v 1.50 2009/05/12 13:18:04 cegger Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.49 2009/04/15 20:44:25 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.50 2009/05/12 13:18:04 cegger Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -178,7 +178,7 @@
*/
#define MEMORY_MAPPED
-int cnw_match(struct device *, struct cfdata *, void *);
+int cnw_match(struct device *, cfdata_t, void *);
void cnw_attach(struct device *, struct device *, void *);
int cnw_detach(struct device *, int);
@@ -461,7 +461,7 @@
* Match the hardware we handle.
*/
int
-cnw_match(struct device *parent, struct cfdata *match,
+cnw_match(struct device *parent, cfdata_t match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
Index: src/sys/dev/pcmcia/if_cs_pcmcia.c
diff -u src/sys/dev/pcmcia/if_cs_pcmcia.c:1.16 src/sys/dev/pcmcia/if_cs_pcmcia.c:1.17
--- src/sys/dev/pcmcia/if_cs_pcmcia.c:1.16 Sat Apr 5 21:31:23 2008
+++ src/sys/dev/pcmcia/if_cs_pcmcia.c Tue May 12 13:18:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_pcmcia.c,v 1.16 2008/04/05 21:31:23 cegger Exp $ */
+/* $NetBSD: if_cs_pcmcia.c,v 1.17 2009/05/12 13:18:04 cegger Exp $ */
/*-
* Copyright (c)2001 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_pcmcia.c,v 1.16 2008/04/05 21:31:23 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_pcmcia.c,v 1.17 2009/05/12 13:18:04 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,7 +56,7 @@
struct cs_pcmcia_softc;
-static int cs_pcmcia_match(struct device *, struct cfdata *, void *);
+static int cs_pcmcia_match(struct device *, cfdata_t, void *);
static int cs_pcmcia_validate_config(struct pcmcia_config_entry *);
static void cs_pcmcia_attach(struct device *, struct device *, void *);
static int cs_pcmcia_detach(struct device *, int);
@@ -76,7 +76,7 @@
cs_pcmcia_match, cs_pcmcia_attach, cs_pcmcia_detach, cs_activate);
static int
-cs_pcmcia_match(struct device *parent, struct cfdata *match,
+cs_pcmcia_match(struct device *parent, cfdata_t match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
Index: src/sys/dev/pcmcia/if_ray.c
diff -u src/sys/dev/pcmcia/if_ray.c:1.73 src/sys/dev/pcmcia/if_ray.c:1.74
--- src/sys/dev/pcmcia/if_ray.c:1.73 Sat Mar 14 21:04:22 2009
+++ src/sys/dev/pcmcia/if_ray.c Tue May 12 13:18:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ray.c,v 1.73 2009/03/14 21:04:22 dsl Exp $ */
+/* $NetBSD: if_ray.c,v 1.74 2009/05/12 13:18:04 cegger Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.73 2009/03/14 21:04:22 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.74 2009/05/12 13:18:04 cegger Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -303,7 +303,7 @@
static void ray_intr_start(struct ray_softc *);
static int ray_ioctl(struct ifnet *, u_long, void *);
static int ray_issue_cmd(struct ray_softc *, bus_size_t, u_int);
-static int ray_match(struct device *, struct cfdata *, void *);
+static int ray_match(struct device *, cfdata_t, void *);
static int ray_media_change(struct ifnet *);
static void ray_media_status(struct ifnet *, struct ifmediareq *);
static ray_cmd_func_t ray_rccs_intr(struct ray_softc *, bus_size_t);
@@ -469,7 +469,7 @@
*/
static int
-ray_match(struct device *parent, struct cfdata *match,
+ray_match(struct device *parent, cfdata_t match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
Index: src/sys/dev/pcmcia/if_sm_pcmcia.c
diff -u src/sys/dev/pcmcia/if_sm_pcmcia.c:1.52 src/sys/dev/pcmcia/if_sm_pcmcia.c:1.53
--- src/sys/dev/pcmcia/if_sm_pcmcia.c:1.52 Sat Mar 14 15:36:20 2009
+++ src/sys/dev/pcmcia/if_sm_pcmcia.c Tue May 12 13:18:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sm_pcmcia.c,v 1.52 2009/03/14 15:36:20 dsl Exp $ */
+/* $NetBSD: if_sm_pcmcia.c,v 1.53 2009/05/12 13:18:04 cegger Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sm_pcmcia.c,v 1.52 2009/03/14 15:36:20 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sm_pcmcia.c,v 1.53 2009/05/12 13:18:04 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,7 +61,7 @@
#include <dev/pcmcia/pcmciavar.h>
#include <dev/pcmcia/pcmciadevs.h>
-int sm_pcmcia_match(struct device *, struct cfdata *, void *);
+int sm_pcmcia_match(struct device *, cfdata_t, void *);
int sm_pcmcia_validate_config(struct pcmcia_config_entry *);
void sm_pcmcia_attach(struct device *, struct device *, void *);
int sm_pcmcia_detach(struct device *, int);
@@ -105,7 +105,7 @@
sizeof(sm_pcmcia_products) / sizeof(sm_pcmcia_products[0]);
int
-sm_pcmcia_match(struct device *parent, struct cfdata *match,
+sm_pcmcia_match(struct device *parent, cfdata_t match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
Index: src/sys/dev/pcmcia/if_tr_pcmcia.c
diff -u src/sys/dev/pcmcia/if_tr_pcmcia.c:1.21 src/sys/dev/pcmcia/if_tr_pcmcia.c:1.22
--- src/sys/dev/pcmcia/if_tr_pcmcia.c:1.21 Sat Mar 14 15:36:20 2009
+++ src/sys/dev/pcmcia/if_tr_pcmcia.c Tue May 12 13:18:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_pcmcia.c,v 1.21 2009/03/14 15:36:20 dsl Exp $ */
+/* $NetBSD: if_tr_pcmcia.c,v 1.22 2009/05/12 13:18:04 cegger Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_pcmcia.c,v 1.21 2009/03/14 15:36:20 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_pcmcia.c,v 1.22 2009/05/12 13:18:04 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,7 +93,7 @@
struct pcmcia_function *sc_pf;
};
-static int tr_pcmcia_match(struct device *, struct cfdata *, void *);
+static int tr_pcmcia_match(struct device *, cfdata_t, void *);
static void tr_pcmcia_attach(struct device *, struct device *, void *);
static int tr_pcmcia_detach(struct device *, int);
static int tr_pcmcia_enable(struct tr_softc *);
@@ -106,7 +106,7 @@
tr_pcmcia_match, tr_pcmcia_attach, tr_pcmcia_detach, tr_activate);
static int
-tr_pcmcia_match(struct device *parent, struct cfdata *match,
+tr_pcmcia_match(struct device *parent, cfdata_t match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
Index: src/sys/dev/pcmcia/if_wi_pcmcia.c
diff -u src/sys/dev/pcmcia/if_wi_pcmcia.c:1.82 src/sys/dev/pcmcia/if_wi_pcmcia.c:1.83
--- src/sys/dev/pcmcia/if_wi_pcmcia.c:1.82 Sat Mar 14 21:04:22 2009
+++ src/sys/dev/pcmcia/if_wi_pcmcia.c Tue May 12 13:18:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wi_pcmcia.c,v 1.82 2009/03/14 21:04:22 dsl Exp $ */
+/* $NetBSD: if_wi_pcmcia.c,v 1.83 2009/05/12 13:18:04 cegger Exp $ */
/*-
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.82 2009/03/14 21:04:22 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.83 2009/05/12 13:18:04 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,7 +74,7 @@
#include <dev/microcode/wi/spectrum24t_cf.h>
#endif
-static int wi_pcmcia_match(struct device *, struct cfdata *, void *);
+static int wi_pcmcia_match(struct device *, cfdata_t, void *);
static int wi_pcmcia_validate_config(struct pcmcia_config_entry *);
static void wi_pcmcia_attach(struct device *, struct device *, void *);
static int wi_pcmcia_detach(struct device *, int);
@@ -251,7 +251,7 @@
sizeof(wi_pcmcia_products) / sizeof(wi_pcmcia_products[0]);
static int
-wi_pcmcia_match(struct device *parent, struct cfdata *match,
+wi_pcmcia_match(struct device *parent, cfdata_t match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
Index: src/sys/dev/pcmcia/mhzc.c
diff -u src/sys/dev/pcmcia/mhzc.c:1.44 src/sys/dev/pcmcia/mhzc.c:1.45
--- src/sys/dev/pcmcia/mhzc.c:1.44 Sat Mar 14 15:36:20 2009
+++ src/sys/dev/pcmcia/mhzc.c Tue May 12 13:18:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mhzc.c,v 1.44 2009/03/14 15:36:20 dsl Exp $ */
+/* $NetBSD: mhzc.c,v 1.45 2009/05/12 13:18:04 cegger Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.44 2009/03/14 15:36:20 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.45 2009/05/12 13:18:04 cegger Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -127,7 +127,7 @@
#define MHZC_MODEM_ALLOCED 0x10
#define MHZC_ETHERNET_ALLOCED 0x20
-int mhzc_match(struct device *, struct cfdata *, void *);
+int mhzc_match(struct device *, cfdata_t, void *);
void mhzc_attach(struct device *, struct device *, void *);
int mhzc_detach(struct device *, int);
int mhzc_activate(struct device *, enum devact);
@@ -165,7 +165,7 @@
int mhzc_intr(void *);
int
-mhzc_match(struct device *parent, struct cfdata *match,
+mhzc_match(struct device *parent, cfdata_t match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -689,7 +689,7 @@
/****** Here begins the sm attachment code. ******/
#if NSM_MHZC > 0
-int sm_mhzc_match(struct device *, struct cfdata *, void *);
+int sm_mhzc_match(struct device *, cfdata_t, void *);
void sm_mhzc_attach(struct device *, struct device *, void *);
/* No mhzc-specific goo in the softc; it's all in the parent. */
@@ -700,7 +700,7 @@
void sm_mhzc_disable(struct smc91cxx_softc *);
int
-sm_mhzc_match(struct device *parent, struct cfdata *match,
+sm_mhzc_match(struct device *parent, cfdata_t match,
void *aux)
{
extern struct cfdriver sm_cd;
Index: src/sys/dev/pcmcia/pcmcia.c
diff -u src/sys/dev/pcmcia/pcmcia.c:1.91 src/sys/dev/pcmcia/pcmcia.c:1.92
--- src/sys/dev/pcmcia/pcmcia.c:1.91 Thu Apr 2 00:09:34 2009
+++ src/sys/dev/pcmcia/pcmcia.c Tue May 12 13:18:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcia.c,v 1.91 2009/04/02 00:09:34 dyoung Exp $ */
+/* $NetBSD: pcmcia.c,v 1.92 2009/05/12 13:18:04 cegger Exp $ */
/*
* Copyright (c) 2004 Charles M. Hannum. All rights reserved.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.91 2009/04/02 00:09:34 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.92 2009/05/12 13:18:04 cegger Exp $");
#include "opt_pcmciaverbose.h"
@@ -80,7 +80,7 @@
int pcmcia_verbose = 0;
#endif
-int pcmcia_match(struct device *, struct cfdata *, void *);
+int pcmcia_match(struct device *, cfdata_t, void *);
void pcmcia_attach(struct device *, struct device *, void *);
int pcmcia_detach(device_t, int);
int pcmcia_rescan(struct device *, const char *, const int *);
@@ -110,7 +110,7 @@
}
int
-pcmcia_match(struct device *parent, struct cfdata *match, void *aux)
+pcmcia_match(struct device *parent, cfdata_t match, void *aux)
{
struct pcmciabus_attach_args *paa = aux;
Index: src/sys/dev/pcmcia/pcmcom.c
diff -u src/sys/dev/pcmcia/pcmcom.c:1.35 src/sys/dev/pcmcia/pcmcom.c:1.36
--- src/sys/dev/pcmcia/pcmcom.c:1.35 Sat Mar 14 15:36:20 2009
+++ src/sys/dev/pcmcia/pcmcom.c Tue May 12 13:18:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcom.c,v 1.35 2009/03/14 15:36:20 dsl Exp $ */
+/* $NetBSD: pcmcom.c,v 1.36 2009/05/12 13:18:04 cegger Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.35 2009/03/14 15:36:20 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.36 2009/05/12 13:18:04 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,7 +88,7 @@
int pca_slave; /* slave # */
};
-int pcmcom_match(struct device *, struct cfdata *, void *);
+int pcmcom_match(struct device *, cfdata_t, void *);
int pcmcom_validate_config(struct pcmcia_config_entry *);
void pcmcom_attach(struct device *, struct device *, void *);
int pcmcom_detach(struct device *, int);
@@ -116,7 +116,7 @@
int pcmcom_intr(void *);
int
-pcmcom_match(struct device *parent, struct cfdata *cf,
+pcmcom_match(struct device *parent, cfdata_t cf,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
Index: src/sys/dev/pcmcia/slhci_pcmcia.c
diff -u src/sys/dev/pcmcia/slhci_pcmcia.c:1.4 src/sys/dev/pcmcia/slhci_pcmcia.c:1.5
--- src/sys/dev/pcmcia/slhci_pcmcia.c:1.4 Fri Mar 28 17:14:46 2008
+++ src/sys/dev/pcmcia/slhci_pcmcia.c Tue May 12 13:18:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: slhci_pcmcia.c,v 1.4 2008/03/28 17:14:46 drochner Exp $ */
+/* $NetBSD: slhci_pcmcia.c,v 1.5 2009/05/12 13:18:04 cegger Exp $ */
/*
* Not (c) 2007 Matthew Orgass
* This file is public domain, meaning anyone can make any use of part or all
@@ -11,7 +11,7 @@
/* Glue for RATOC USB HOST CF+ Card (SL811HS chip) */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: slhci_pcmcia.c,v 1.4 2008/03/28 17:14:46 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slhci_pcmcia.c,v 1.5 2009/05/12 13:18:04 cegger Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -42,7 +42,7 @@
};
-int slhci_pcmcia_probe(struct device *, struct cfdata *, void *);
+int slhci_pcmcia_probe(struct device *, cfdata_t, void *);
void slhci_pcmcia_attach(struct device *, struct device *, void *);
int slhci_pcmcia_detach(struct device *, int);
int slhci_pcmcia_validate_config(struct pcmcia_config_entry *);
@@ -63,7 +63,7 @@
sizeof(slhci_pcmcia_products) / sizeof(slhci_pcmcia_products[0]);
int
-slhci_pcmcia_probe(struct device *parent, struct cfdata *match, void *aux)
+slhci_pcmcia_probe(struct device *parent, cfdata_t match, void *aux)
{
struct pcmcia_attach_args *pa = aux;
Index: src/sys/dev/pcmcia/xirc.c
diff -u src/sys/dev/pcmcia/xirc.c:1.27 src/sys/dev/pcmcia/xirc.c:1.28
--- src/sys/dev/pcmcia/xirc.c:1.27 Sat Mar 14 21:04:22 2009
+++ src/sys/dev/pcmcia/xirc.c Tue May 12 13:18:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xirc.c,v 1.27 2009/03/14 21:04:22 dsl Exp $ */
+/* $NetBSD: xirc.c,v 1.28 2009/05/12 13:18:04 cegger Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.27 2009/03/14 21:04:22 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.28 2009/05/12 13:18:04 cegger Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -121,7 +121,7 @@
#define XIRC_ETHERNET_ALLOCED 0x20
};
-int xirc_match(struct device *, struct cfdata *, void *);
+int xirc_match(struct device *, cfdata_t, void *);
void xirc_attach(struct device *, struct device *, void *);
int xirc_detach(struct device *, int);
int xirc_activate(struct device *, enum devact);
@@ -145,7 +145,7 @@
int xirc_intr(void *);
int
-xirc_match(struct device *parent, struct cfdata *match,
+xirc_match(struct device *parent, cfdata_t match,
void *aux)
{
struct pcmcia_attach_args *pa = aux;
@@ -622,7 +622,7 @@
/****** Here begins the xi attachment code. ******/
#if NXI_XIRC > 0
-int xi_xirc_match(struct device *, struct cfdata *, void *);
+int xi_xirc_match(struct device *, cfdata_t, void *);
void xi_xirc_attach(struct device *, struct device *, void *);
/* No xirc-specific goo in the softc; it's all in the parent. */
@@ -634,7 +634,7 @@
int xi_xirc_lan_nid_ciscallback(struct pcmcia_tuple *, void *);
int
-xi_xirc_match(struct device *parent, struct cfdata *match,
+xi_xirc_match(struct device *parent, cfdata_t match,
void *aux)
{
extern struct cfdriver xi_cd;
