Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change arg two of all the match functions back to struct cfdata

Browse Source 
now that __BROKEN_INDIRECT_CONFIG has been removed.
This commit is contained in:
gwr 1997-03-19 16:24:38 +00:00
parent 33d80a37da
commit b5afc4b28d
8 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/arch/mvme68k/dev/clock_pcc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: clock_pcc.c,v 1.2 1996/09/12 05:10:46 thorpej Exp $ */
/* $NetBSD: clock_pcc.c,v 1.3 1997/03/19 16:24:38 gwr Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -55,10 +55,10 @@
#include <mvme68k/dev/pccreg.h>
#include <mvme68k/dev/pccvar.h>
int clock_pcc_match __P((struct device *, void *, void *));
int clock_pcc_match __P((struct device *, struct cfdata *, void *));
void clock_pcc_attach __P((struct device *, struct device *, void *));
int clock_pcc_profintr __P((void *));
int clock_pcc_statintr __P((void *));
int clock_pcc_profintr __P((void *));
int clock_pcc_statintr __P((void *));
void clock_pcc_initclocks __P((int, int));
void clock_pcc_shutdown __P((void *));
@ -69,11 +69,11 @@ struct cfattach clock_pcc_ca = {
};
int
clock_pcc_match(parent, match, aux)
clock_pcc_match(parent, cf, aux)
struct device *parent;
void *match, *aux;
struct cfdata *cf;
void *aux;
{
struct cfdata *cf = match;
struct pcc_attach_args *pa = aux;
static int clock_pcc_matched;

10
sys/arch/mvme68k/dev/if_le.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le.c,v 1.13 1997/03/17 03:17:38 thorpej Exp $ */
/* $NetBSD: if_le.c,v 1.14 1997/03/19 16:24:39 gwr Exp $ */
/*-
* Copyright (c) 1995 Charles M. Hannum. All rights reserved.
@ -72,7 +72,7 @@
#include <mvme68k/dev/if_lereg.h>
#include <mvme68k/dev/if_levar.h>
int le_pcc_match __P((struct device *, void *, void *));
int le_pcc_match __P((struct device *, struct cfdata *, void *));
void le_pcc_attach __P((struct device *, struct device *, void *));
struct cfattach le_pcc_ca = {
@ -109,11 +109,11 @@ le_pcc_rdcsr(sc, port)
}
int
le_pcc_match(parent, match, aux)
le_pcc_match(parent, cf, aux)
struct device *parent;
void *match, *aux;
struct cfdata *cf;
void *aux;
{
struct cfdata *cf = match;
struct pcc_attach_args *pa = aux;
if (strcmp(pa->pa_name, le_cd.cd_name))

12
sys/arch/mvme68k/dev/lpt.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lpt.c,v 1.1 1996/11/09 03:52:51 chuck Exp $ */
/* $NetBSD: lpt.c,v 1.2 1997/03/19 16:24:39 gwr Exp $ */
/*
* Copyright (c) 1996 Steve Woodford
@ -122,7 +122,7 @@ int lptintr __P((void *));
/*
* Autoconfig stuff
*/
static int lpt_pcc_match __P((struct device *, void *, void *));
static int lpt_pcc_match __P((struct device *, struct cfdata *, void *));
static void lpt_pcc_attach __P((struct device *, struct device *, void *));
struct cfattach lpt_pcc_ca = {
@ -148,11 +148,11 @@ static int pushbytes __P((struct lpt_softc *));
/*ARGSUSED*/
static int
lpt_pcc_match(pdp, match, auxp)
struct device *pdp;
void *match, *auxp;
lpt_pcc_match(pdp, cf, auxp)
struct device *pdp;
struct cfdata *cf;
void *auxp;
{
struct cfdata *cf = match;
struct pcc_attach_args *pa = auxp;
if (strcmp(pa->pa_name, lpt_cd.cd_name))

11
sys/arch/mvme68k/dev/pcc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcc.c,v 1.8 1996/10/13 03:30:16 christos Exp $ */
/* $NetBSD: pcc.c,v 1.9 1997/03/19 16:24:40 gwr Exp $ */
/*
* Copyright (c) 1996 Jason R. Thorpe
@ -66,8 +66,8 @@ struct pccsoftc {
};
void pccattach __P((struct device *, struct device *, void *));
int pccmatch __P((struct device *, void *, void *));
int pccprint __P((void *, const char *));
int pccmatch __P((struct device *, struct cfdata *, void *));
int pccprint __P((void *, const char *));
struct cfattach pcc_ca = {
sizeof(struct pccsoftc), pccmatch, pccattach
@ -100,9 +100,10 @@ struct pcc_device pcc_devices[] = {
};
int
pccmatch(parent, vcf, args)
pccmatch(parent, cf, args)
struct device *parent;
void *vcf, *args;
struct cfdata *cf;
void *args;
{
char *ma_name = args;

24
sys/arch/mvme68k/dev/vme.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vme.c,v 1.5 1996/12/09 17:42:17 thorpej Exp $ */
/* $NetBSD: vme.c,v 1.6 1997/03/19 16:24:41 gwr Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -48,12 +48,12 @@
#include <mvme68k/dev/vmevar.h>
int vmes_match __P((struct device *, void *, void *));
int vmel_match __P((struct device *, void *, void *));
int vmes_match __P((struct device *, struct cfdata *, void *));
int vmel_match __P((struct device *, struct cfdata *, void *));
void vme_attach __P((struct device *, struct device *, void *));
int vme_search __P((struct device *, void *, void *));
int vme_search __P((struct device *, struct cfdata *, void *));
int vme_print __P((void *, const char *));
int vmechip_print __P((void *, const char *));
@ -133,9 +133,10 @@ vmechip_print(aux, cp)
}
int
vmes_match(parent, vcf, aux)
vmes_match(parent, cf, aux)
struct device *parent;
void *vcf, *aux;
struct cfdata *cf;
void *aux;
{
struct vme_attach_args *va = aux;
@ -146,9 +147,10 @@ vmes_match(parent, vcf, aux)
}
int
vmel_match(parent, vcf, aux)
vmel_match(parent, cf, aux)
struct device *parent;
void *vcf, *aux;
struct cfdata *cf;
void *aux;
{
struct vme_attach_args *va = aux;
@ -171,11 +173,11 @@ vme_attach(parent, self, args)
}
int
vme_search(parent, match, aux)
vme_search(parent, cf, aux)
struct device *parent;
void *match, *aux;
struct cfdata *cf;
void *aux;
{
struct cfdata *cf = match;
struct vme_attach_args *va = aux;
char *name;
int unit, reject = 0;

10
sys/arch/mvme68k/dev/vme_pcc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vme_pcc.c,v 1.3 1996/10/13 03:30:24 christos Exp $ */
/* $NetBSD: vme_pcc.c,v 1.4 1997/03/19 16:24:42 gwr Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -57,7 +57,7 @@
#include <mvme68k/dev/vme_pccreg.h>
#include <mvme68k/dev/vmevar.h>
int vmechip_pcc_match __P((struct device *, void *, void *));
int vmechip_pcc_match __P((struct device *, struct cfdata *, void *));
void vmechip_pcc_attach __P((struct device *, struct device *, void *));
struct cfattach vmechip_pcc_ca = {
@ -79,11 +79,11 @@ struct vme_pcc *sys_vme_pcc;
extern int physmem;
int
vmechip_pcc_match(parent, match, aux)
vmechip_pcc_match(parent, cf, aux)
struct device *parent;
void *match, *aux;
struct cfdata *cf;
void *aux;
{
struct cfdata *cf = match;
struct pcc_attach_args *pa = aux;
/* Only one VME chip, please. */

10
sys/arch/mvme68k/dev/wdsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wdsc.c,v 1.8 1996/12/10 21:27:40 thorpej Exp $ */
/* $NetBSD: wdsc.c,v 1.9 1997/03/19 16:24:43 gwr Exp $ */
/*
* Copyright (c) 1996 Steve Woodford
@ -54,7 +54,7 @@
#include <mvme68k/dev/wdscreg.h>
void wdsc_pcc_attach __P((struct device *, struct device *, void *));
int wdsc_pcc_match __P((struct device *, void *, void *));
int wdsc_pcc_match __P((struct device *, struct cfdata *, void *));
void wdsc_enintr __P((struct sbic_softc *));
int wdsc_dmago __P((struct sbic_softc *, char *, int, int));
@ -96,11 +96,11 @@ int shift_nosync = 0;
* Match for SCSI devices on the onboard WD33C93 chip
*/
int
wdsc_pcc_match(pdp, match, auxp)
wdsc_pcc_match(pdp, cf, auxp)
struct device *pdp;
void *match, *auxp;
struct cfdata *cf;
void *auxp;
{
struct cfdata *cf = match;
struct pcc_attach_args *pa = auxp;
if (strcmp(pa->pa_name, wdsc_cd.cd_name))

10
sys/arch/mvme68k/dev/zs_pcc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs_pcc.c,v 1.3 1996/12/17 22:30:17 gwr Exp $ */
/* $NetBSD: zs_pcc.c,v 1.4 1997/03/19 16:24:43 gwr Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -97,7 +97,7 @@ zs_pcc_get_chan_addr(zsc_unit, channel)
****************************************************************/
/* Definition of the driver for autoconfig. */
static int zsc_pcc_match __P((struct device *, void *, void *));
static int zsc_pcc_match __P((struct device *, struct cfdata *, void *));
static void zsc_pcc_attach __P((struct device *, struct device *, void *));
struct cfattach zsc_pcc_ca = {
@ -109,11 +109,11 @@ struct cfattach zsc_pcc_ca = {
* Is the zs chip present?
*/
static int
zsc_pcc_match(parent, vcf, aux)
zsc_pcc_match(parent, cf, aux)
struct device *parent;
void *vcf, *aux;
struct cfdata *cf;
void *aux;
{
struct cfdata *cf = vcf;
struct pcc_attach_args *pa = aux;
int unit;