Update to match autoconfig code.

This commit is contained in:
mycroft 1994-11-03 23:08:27 +00:00
parent d23d1e83dc
commit 54cc63645d
26 changed files with 174 additions and 174 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: aha1542.c,v 1.34 1994/10/27 04:16:43 cgd Exp $ */
/* $NetBSD: aha1542.c,v 1.35 1994/11/03 23:08:27 mycroft Exp $ */
/*
* Copyright (c) 1994 Charles Hannum. All rights reserved.
@ -356,8 +356,8 @@ struct scsi_device aha_dev = {
0
};
int ahaprobe();
void ahaattach();
int ahaprobe __P((struct device *, void *, void *));
void ahaattach __P((struct device *, struct device *, void *));
struct cfdriver ahacd = {
NULL, "aha", ahaprobe, ahaattach, DV_DULL, sizeof(struct aha_softc)
@ -509,11 +509,11 @@ aha_cmd(aha, icnt, ocnt, wait, retval, opcode, args)
* autoconf.c
*/
int
ahaprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
ahaprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct aha_softc *aha = (void *)self;
struct aha_softc *aha = match;
struct isa_attach_args *ia = aux;
#ifdef NEWCONFIG

View File

@ -1,4 +1,4 @@
/* $NetBSD: aic6360.c,v 1.9 1994/10/27 04:16:48 cgd Exp $ */
/* $NetBSD: aic6360.c,v 1.10 1994/11/03 23:08:30 mycroft Exp $ */
/*
* Copyright (c) 1994 Charles Hannum.
@ -630,7 +630,7 @@ int aic_debug = 0; /* AIC_SHOWSTART|AIC_SHOWMISC|AIC_SHOWTRAC; /**/
#define AIC_START(str)
#endif
int aicprobe __P((struct device *, struct device *, void *));
int aicprobe __P((struct device *, void *, void *));
void aicattach __P((struct device *, struct device *, void *));
void aic_minphys __P((struct buf *));
u_int aic_adapter_info __P((struct aic_softc *));
@ -683,11 +683,11 @@ struct scsi_device aic_dev = {
* returns non-zero value if a controller is found.
*/
int
aicprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
aicprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct aic_softc *aic = (void *)self;
struct aic_softc *aic = match;
struct isa_attach_args *ia = aux;
int i, len, ic;

View File

@ -1,4 +1,4 @@
/* $NetBSD: bt742a.c,v 1.31 1994/10/27 04:16:55 cgd Exp $ */
/* $NetBSD: bt742a.c,v 1.32 1994/11/03 23:08:33 mycroft Exp $ */
/*
* Copyright (c) 1994 Charles Hannum. All rights reserved.
@ -405,8 +405,8 @@ struct scsi_device bt_dev = {
0
};
int btprobe();
void btattach();
int btprobe __P((struct device *, void *, void *));
void btattach __P((struct device *, struct device *, void *));
struct cfdriver btcd = {
NULL, "bt", btprobe, btattach, DV_DULL, sizeof(struct bt_softc)
@ -546,11 +546,11 @@ bt_cmd(bt, icnt, ocnt, wait, retval, opcode, args)
* autoconf.c
*/
int
btprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
btprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct bt_softc *bt = (void *)self;
struct bt_softc *bt = match;
register struct isa_attach_args *ia = aux;
#ifdef NEWCONFIG

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ed.c,v 1.58 1994/10/30 21:43:44 cgd Exp $ */
/* $NetBSD: if_ed.c,v 1.59 1994/11/03 23:14:43 mycroft Exp $ */
/*
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@ -107,8 +107,8 @@ struct ed_softc {
u_char next_packet; /* pointer to next unread RX packet */
};
int edprobe();
void edattach();
int edprobe __P((struct device *, void *, void *));
void edattach __P((struct device *, struct device *, void *));
int edintr __P((struct ed_softc *));
int ed_ioctl __P((struct ifnet *, u_long, caddr_t));
int ed_start __P((struct ifnet *));
@ -171,11 +171,11 @@ static u_short ed_790_intr_mask[] = {
* Determine if the device is present.
*/
int
edprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
edprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct ed_softc *sc = (void *)self;
struct ed_softc *sc = match;
struct cfdata *cf = sc->sc_dev.dv_cfdata;
struct isa_attach_args *ia = aux;

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_eg.c,v 1.5 1994/10/30 21:43:49 cgd Exp $ */
/* $NetBSD: if_eg.c,v 1.6 1994/11/03 23:14:50 mycroft Exp $ */
/*
* Copyright (c) 1993 Dean Huxley <dean@fsa.ca>
@ -111,8 +111,8 @@ struct eg_softc {
u_char *eg_outbuf; /* Outgoing packet buffer */
};
static int egprobe();
static void egattach();
int egprobe __P((struct device *, void *, void *));
void egattach __P((struct device *, struct device *, void *));
struct cfdriver egcd = {
NULL, "eg", egprobe, egattach, DV_IFNET, sizeof(struct eg_softc)
@ -282,11 +282,11 @@ egreadPCB(sc)
*/
int
egprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
egprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct eg_softc *sc = (void *)self;
struct eg_softc *sc = match;
struct isa_attach_args *ia = aux;
int i;

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_el.c,v 1.15 1994/10/30 21:43:51 cgd Exp $ */
/* $NetBSD: if_el.c,v 1.16 1994/11/03 23:14:53 mycroft Exp $ */
/*
* Copyright (c) 1994, Matthew E. Kimmel. Permission is hereby granted
@ -95,8 +95,8 @@ static inline void elread __P((struct el_softc *, caddr_t, int));
static struct mbuf *elget __P((caddr_t, int, struct ifnet *));
static inline void el_hardreset __P((struct el_softc *));
int elprobe();
void elattach();
int elprobe __P((struct device *, void *, void *));
void elattach __P((struct device *, struct device *, void *));
/* isa_driver structure for autoconf */
struct cfdriver elcd = {
@ -110,11 +110,11 @@ struct cfdriver elcd = {
* (XXX - cgd -- needs help)
*/
int
elprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
elprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct el_softc *sc = (void *)self;
struct el_softc *sc = match;
struct isa_attach_args *ia = aux;
u_short iobase = ia->ia_iobase;
u_char station_addr[ETHER_ADDR_LEN];

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ep.c,v 1.58 1994/10/30 21:43:53 cgd Exp $ */
/* $NetBSD: if_ep.c,v 1.59 1994/11/03 23:14:56 mycroft Exp $ */
/*
* Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
@ -94,8 +94,8 @@ struct ep_softc {
char bus32bit; /* 32bit access possible */
};
static int epprobe();
static void epattach();
static int epprobe __P((struct device *, void *, void *));
static void epattach __P((struct device *, struct device *, void *));
struct cfdriver epcd = {
NULL, "ep", epprobe, epattach, DV_IFNET, sizeof(struct ep_softc)
@ -152,11 +152,11 @@ epaddcard(iobase, irq, bus32bit)
* matching cards.
*/
int
epprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
epprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct ep_softc *sc = (void *)self;
struct ep_softc *sc = match;
struct isa_attach_args *ia = aux;
static int probed;
int slot, iobase, i;

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ie.c,v 1.16 1994/10/30 21:43:57 cgd Exp $ */
/* $NetBSD: if_ie.c,v 1.17 1994/11/03 23:14:59 mycroft Exp $ */
/*-
* Copyright (c) 1993, 1994 Charles Hannum.
@ -280,8 +280,8 @@ int in_ierint = 0;
int in_ietint = 0;
#endif
int ieprobe();
void ieattach();
int ieprobe __P((struct device *, void *, void *));
void ieattach __P((struct device *, struct device *, void *));
struct cfdriver iecd = {
NULL, "ie", ieprobe, ieattach, DV_IFNET, sizeof(struct ie_softc)
@ -345,11 +345,11 @@ ie_ack(sc, mask)
}
int
ieprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
ieprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct ie_softc *sc = (void *)self;
struct ie_softc *sc = match;
struct isa_attach_args *ia = aux;
if (sl_probe(sc, ia))

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le.c,v 1.14 1994/10/30 21:44:01 cgd Exp $ */
/* $NetBSD: if_le.c,v 1.15 1994/11/03 23:15:03 mycroft Exp $ */
/*
* LANCE Ethernet driver
@ -112,12 +112,12 @@ void xmit_print __P((struct le_softc *, int));
#endif
void lesetladrf __P((struct arpcom *, u_long *));
int leprobe();
int leprobe __P((struct device *, void *, void *));
int depca_probe __P((struct le_softc *, struct isa_attach_args *));
int ne2100_probe __P((struct le_softc *, struct isa_attach_args *));
int bicc_probe __P((struct le_softc *, struct isa_attach_args *));
int lance_probe __P((struct le_softc *));
void leattach();
void leattach __P((struct device *, struct device *, void *));
struct cfdriver lecd = {
NULL, "le", leprobe, leattach, DV_IFNET, sizeof(struct le_softc)
@ -145,11 +145,11 @@ lerdcsr(sc, port)
}
int
leprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
leprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct le_softc *sc = (void *)self;
struct le_softc *sc = match;
struct isa_attach_args *ia = aux;
if (bicc_probe(sc, ia))

View File

@ -1,4 +1,4 @@
/* $NetBSD: lms.c,v 1.15 1994/10/30 21:44:02 cgd Exp $ */
/* $NetBSD: lms.c,v 1.16 1994/11/03 23:17:39 mycroft Exp $ */
/*-
* Copyright (c) 1993, 1994 Charles Hannum.
@ -66,8 +66,8 @@ struct lms_softc { /* driver status information */
int sc_x, sc_y; /* accumulated motion in the X,Y axis */
};
int lmsprobe();
void lmsattach();
int lmsprobe __P((struct device *, void *, void *));
void lmsattach __P((struct device *, struct device *, void *));
int lmsintr __P((struct lms_softc *));
struct cfdriver lmscd = {
@ -77,9 +77,9 @@ struct cfdriver lmscd = {
#define LMSUNIT(dev) (minor(dev))
int
lmsprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
lmsprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct isa_attach_args *ia = aux;
u_short iobase = ia->ia_iobase;

View File

@ -1,4 +1,4 @@
/* $NetBSD: mms.c,v 1.14 1994/10/30 21:44:10 cgd Exp $ */
/* $NetBSD: mms.c,v 1.15 1994/11/03 23:17:41 mycroft Exp $ */
/*-
* Copyright (c) 1993, 1994 Charles Hannum.
@ -64,8 +64,8 @@ struct mms_softc { /* driver status information */
int sc_x, sc_y; /* accumulated motion in the X,Y axis */
};
int mmsprobe();
void mmsattach();
int mmsprobe __P((struct device *, void *, void *));
void mmsattach __P((struct device *, struct device *, void *));
int mmsintr __P((struct mms_softc *));
struct cfdriver mmscd = {
@ -75,9 +75,9 @@ struct cfdriver mmscd = {
#define MMSUNIT(dev) (minor(dev))
int
mmsprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
mmsprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct isa_attach_args *ia = aux;
u_short iobase = ia->ia_iobase;

View File

@ -1,4 +1,4 @@
/* $NetBSD: pms.c,v 1.15 1994/10/30 21:44:16 cgd Exp $ */
/* $NetBSD: pms.c,v 1.16 1994/11/03 23:17:42 mycroft Exp $ */
/*-
* Copyright (c) 1994 Charles Hannum.
@ -102,8 +102,8 @@ struct pms_softc { /* driver status information */
int sc_x, sc_y; /* accumulated motion in the X,Y axis */
};
int pmsprobe();
void pmsattach();
int pmsprobe __P((struct device *, void *, void *));
void pmsattach __P((struct device *, struct device *, void *));
int pmsintr __P((struct pms_softc *));
struct cfdriver pmscd = {\
@ -158,9 +158,9 @@ pms_pit_cmd(iobase, value)
}
int
pmsprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
pmsprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct isa_attach_args *ia = aux;
u_short iobase = ia->ia_iobase;

View File

@ -329,8 +329,8 @@ struct scsi_device sea_dev = {
0,
};
int seaprobe();
void seaattach();
int seaprobe __P((struct device *, void *, void *));
void seaattach __P((struct device *, struct device *, void *));
struct cfdriver seacd = {
NULL, "sea", seaprobe, seaattach, DV_DULL, sizeof(struct sea_softc)
@ -361,11 +361,11 @@ sea_queue_length(sea)
* Returns 1 if card recognized, 0 if errors.
*/
int
seaprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
seaprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct sea_softc *sea = (void *)self;
struct sea_softc *sea = match;
struct isa_attach_args *ia = aux;
int i;

View File

@ -1,4 +1,4 @@
/* $NetBSD: ultra14f.c,v 1.39 1994/10/27 04:18:19 cgd Exp $ */
/* $NetBSD: ultra14f.c,v 1.40 1994/11/03 23:08:38 mycroft Exp $ */
/*
* Copyright (c) 1994 Charles Hannum. All rights reserved.
@ -354,8 +354,8 @@ struct scsi_device uha_dev = {
0
};
int uhaprobe();
void uhaattach();
int uhaprobe __P((struct device *, void *, void *));
void uhaattach __P((struct device *, struct device *, void *));
struct cfdriver uhacd = {
NULL, "uha", uhaprobe, uhaattach, DV_DULL, sizeof(struct uha_softc)
@ -570,11 +570,11 @@ u24_poll(uha, wait)
* from autoconf.c
*/
int
uhaprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
uhaprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct uha_softc *uha = (void *)self;
struct uha_softc *uha = match;
struct isa_attach_args *ia = aux;
uha->sc_iobase = ia->ia_iobase;

View File

@ -1,4 +1,4 @@
/* $NetBSD: aic6360.c,v 1.9 1994/10/27 04:16:48 cgd Exp $ */
/* $NetBSD: aic6360.c,v 1.10 1994/11/03 23:08:30 mycroft Exp $ */
/*
* Copyright (c) 1994 Charles Hannum.
@ -630,7 +630,7 @@ int aic_debug = 0; /* AIC_SHOWSTART|AIC_SHOWMISC|AIC_SHOWTRAC; /**/
#define AIC_START(str)
#endif
int aicprobe __P((struct device *, struct device *, void *));
int aicprobe __P((struct device *, void *, void *));
void aicattach __P((struct device *, struct device *, void *));
void aic_minphys __P((struct buf *));
u_int aic_adapter_info __P((struct aic_softc *));
@ -683,11 +683,11 @@ struct scsi_device aic_dev = {
* returns non-zero value if a controller is found.
*/
int
aicprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
aicprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct aic_softc *aic = (void *)self;
struct aic_softc *aic = match;
struct isa_attach_args *ia = aux;
int i, len, ic;

View File

@ -1,4 +1,4 @@
/* $NetBSD: aha1542.c,v 1.34 1994/10/27 04:16:43 cgd Exp $ */
/* $NetBSD: aha1542.c,v 1.35 1994/11/03 23:08:27 mycroft Exp $ */
/*
* Copyright (c) 1994 Charles Hannum. All rights reserved.
@ -356,8 +356,8 @@ struct scsi_device aha_dev = {
0
};
int ahaprobe();
void ahaattach();
int ahaprobe __P((struct device *, void *, void *));
void ahaattach __P((struct device *, struct device *, void *));
struct cfdriver ahacd = {
NULL, "aha", ahaprobe, ahaattach, DV_DULL, sizeof(struct aha_softc)
@ -509,11 +509,11 @@ aha_cmd(aha, icnt, ocnt, wait, retval, opcode, args)
* autoconf.c
*/
int
ahaprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
ahaprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct aha_softc *aha = (void *)self;
struct aha_softc *aha = match;
struct isa_attach_args *ia = aux;
#ifdef NEWCONFIG

View File

@ -1,4 +1,4 @@
/* $NetBSD: aic6360.c,v 1.9 1994/10/27 04:16:48 cgd Exp $ */
/* $NetBSD: aic6360.c,v 1.10 1994/11/03 23:08:30 mycroft Exp $ */
/*
* Copyright (c) 1994 Charles Hannum.
@ -630,7 +630,7 @@ int aic_debug = 0; /* AIC_SHOWSTART|AIC_SHOWMISC|AIC_SHOWTRAC; /**/
#define AIC_START(str)
#endif
int aicprobe __P((struct device *, struct device *, void *));
int aicprobe __P((struct device *, void *, void *));
void aicattach __P((struct device *, struct device *, void *));
void aic_minphys __P((struct buf *));
u_int aic_adapter_info __P((struct aic_softc *));
@ -683,11 +683,11 @@ struct scsi_device aic_dev = {
* returns non-zero value if a controller is found.
*/
int
aicprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
aicprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct aic_softc *aic = (void *)self;
struct aic_softc *aic = match;
struct isa_attach_args *ia = aux;
int i, len, ic;

View File

@ -1,4 +1,4 @@
/* $NetBSD: bt742a.c,v 1.31 1994/10/27 04:16:55 cgd Exp $ */
/* $NetBSD: bt742a.c,v 1.32 1994/11/03 23:08:33 mycroft Exp $ */
/*
* Copyright (c) 1994 Charles Hannum. All rights reserved.
@ -405,8 +405,8 @@ struct scsi_device bt_dev = {
0
};
int btprobe();
void btattach();
int btprobe __P((struct device *, void *, void *));
void btattach __P((struct device *, struct device *, void *));
struct cfdriver btcd = {
NULL, "bt", btprobe, btattach, DV_DULL, sizeof(struct bt_softc)
@ -546,11 +546,11 @@ bt_cmd(bt, icnt, ocnt, wait, retval, opcode, args)
* autoconf.c
*/
int
btprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
btprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct bt_softc *bt = (void *)self;
struct bt_softc *bt = match;
register struct isa_attach_args *ia = aux;
#ifdef NEWCONFIG

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ed.c,v 1.58 1994/10/30 21:43:44 cgd Exp $ */
/* $NetBSD: if_ed.c,v 1.59 1994/11/03 23:14:43 mycroft Exp $ */
/*
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@ -107,8 +107,8 @@ struct ed_softc {
u_char next_packet; /* pointer to next unread RX packet */
};
int edprobe();
void edattach();
int edprobe __P((struct device *, void *, void *));
void edattach __P((struct device *, struct device *, void *));
int edintr __P((struct ed_softc *));
int ed_ioctl __P((struct ifnet *, u_long, caddr_t));
int ed_start __P((struct ifnet *));
@ -171,11 +171,11 @@ static u_short ed_790_intr_mask[] = {
* Determine if the device is present.
*/
int
edprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
edprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct ed_softc *sc = (void *)self;
struct ed_softc *sc = match;
struct cfdata *cf = sc->sc_dev.dv_cfdata;
struct isa_attach_args *ia = aux;

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_eg.c,v 1.5 1994/10/30 21:43:49 cgd Exp $ */
/* $NetBSD: if_eg.c,v 1.6 1994/11/03 23:14:50 mycroft Exp $ */
/*
* Copyright (c) 1993 Dean Huxley <dean@fsa.ca>
@ -111,8 +111,8 @@ struct eg_softc {
u_char *eg_outbuf; /* Outgoing packet buffer */
};
static int egprobe();
static void egattach();
int egprobe __P((struct device *, void *, void *));
void egattach __P((struct device *, struct device *, void *));
struct cfdriver egcd = {
NULL, "eg", egprobe, egattach, DV_IFNET, sizeof(struct eg_softc)
@ -282,11 +282,11 @@ egreadPCB(sc)
*/
int
egprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
egprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct eg_softc *sc = (void *)self;
struct eg_softc *sc = match;
struct isa_attach_args *ia = aux;
int i;

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_el.c,v 1.15 1994/10/30 21:43:51 cgd Exp $ */
/* $NetBSD: if_el.c,v 1.16 1994/11/03 23:14:53 mycroft Exp $ */
/*
* Copyright (c) 1994, Matthew E. Kimmel. Permission is hereby granted
@ -95,8 +95,8 @@ static inline void elread __P((struct el_softc *, caddr_t, int));
static struct mbuf *elget __P((caddr_t, int, struct ifnet *));
static inline void el_hardreset __P((struct el_softc *));
int elprobe();
void elattach();
int elprobe __P((struct device *, void *, void *));
void elattach __P((struct device *, struct device *, void *));
/* isa_driver structure for autoconf */
struct cfdriver elcd = {
@ -110,11 +110,11 @@ struct cfdriver elcd = {
* (XXX - cgd -- needs help)
*/
int
elprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
elprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct el_softc *sc = (void *)self;
struct el_softc *sc = match;
struct isa_attach_args *ia = aux;
u_short iobase = ia->ia_iobase;
u_char station_addr[ETHER_ADDR_LEN];

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ep.c,v 1.58 1994/10/30 21:43:53 cgd Exp $ */
/* $NetBSD: if_ep.c,v 1.59 1994/11/03 23:14:56 mycroft Exp $ */
/*
* Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
@ -94,8 +94,8 @@ struct ep_softc {
char bus32bit; /* 32bit access possible */
};
static int epprobe();
static void epattach();
static int epprobe __P((struct device *, void *, void *));
static void epattach __P((struct device *, struct device *, void *));
struct cfdriver epcd = {
NULL, "ep", epprobe, epattach, DV_IFNET, sizeof(struct ep_softc)
@ -152,11 +152,11 @@ epaddcard(iobase, irq, bus32bit)
* matching cards.
*/
int
epprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
epprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct ep_softc *sc = (void *)self;
struct ep_softc *sc = match;
struct isa_attach_args *ia = aux;
static int probed;
int slot, iobase, i;

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ie.c,v 1.16 1994/10/30 21:43:57 cgd Exp $ */
/* $NetBSD: if_ie.c,v 1.17 1994/11/03 23:14:59 mycroft Exp $ */
/*-
* Copyright (c) 1993, 1994 Charles Hannum.
@ -280,8 +280,8 @@ int in_ierint = 0;
int in_ietint = 0;
#endif
int ieprobe();
void ieattach();
int ieprobe __P((struct device *, void *, void *));
void ieattach __P((struct device *, struct device *, void *));
struct cfdriver iecd = {
NULL, "ie", ieprobe, ieattach, DV_IFNET, sizeof(struct ie_softc)
@ -345,11 +345,11 @@ ie_ack(sc, mask)
}
int
ieprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
ieprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct ie_softc *sc = (void *)self;
struct ie_softc *sc = match;
struct isa_attach_args *ia = aux;
if (sl_probe(sc, ia))

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le.c,v 1.14 1994/10/30 21:44:01 cgd Exp $ */
/* $NetBSD: if_le.c,v 1.15 1994/11/03 23:15:03 mycroft Exp $ */
/*
* LANCE Ethernet driver
@ -112,12 +112,12 @@ void xmit_print __P((struct le_softc *, int));
#endif
void lesetladrf __P((struct arpcom *, u_long *));
int leprobe();
int leprobe __P((struct device *, void *, void *));
int depca_probe __P((struct le_softc *, struct isa_attach_args *));
int ne2100_probe __P((struct le_softc *, struct isa_attach_args *));
int bicc_probe __P((struct le_softc *, struct isa_attach_args *));
int lance_probe __P((struct le_softc *));
void leattach();
void leattach __P((struct device *, struct device *, void *));
struct cfdriver lecd = {
NULL, "le", leprobe, leattach, DV_IFNET, sizeof(struct le_softc)
@ -145,11 +145,11 @@ lerdcsr(sc, port)
}
int
leprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
leprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct le_softc *sc = (void *)self;
struct le_softc *sc = match;
struct isa_attach_args *ia = aux;
if (bicc_probe(sc, ia))

View File

@ -329,8 +329,8 @@ struct scsi_device sea_dev = {
0,
};
int seaprobe();
void seaattach();
int seaprobe __P((struct device *, void *, void *));
void seaattach __P((struct device *, struct device *, void *));
struct cfdriver seacd = {
NULL, "sea", seaprobe, seaattach, DV_DULL, sizeof(struct sea_softc)
@ -361,11 +361,11 @@ sea_queue_length(sea)
* Returns 1 if card recognized, 0 if errors.
*/
int
seaprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
seaprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct sea_softc *sea = (void *)self;
struct sea_softc *sea = match;
struct isa_attach_args *ia = aux;
int i;

View File

@ -1,4 +1,4 @@
/* $NetBSD: ultra14f.c,v 1.39 1994/10/27 04:18:19 cgd Exp $ */
/* $NetBSD: ultra14f.c,v 1.40 1994/11/03 23:08:38 mycroft Exp $ */
/*
* Copyright (c) 1994 Charles Hannum. All rights reserved.
@ -354,8 +354,8 @@ struct scsi_device uha_dev = {
0
};
int uhaprobe();
void uhaattach();
int uhaprobe __P((struct device *, void *, void *));
void uhaattach __P((struct device *, struct device *, void *));
struct cfdriver uhacd = {
NULL, "uha", uhaprobe, uhaattach, DV_DULL, sizeof(struct uha_softc)
@ -570,11 +570,11 @@ u24_poll(uha, wait)
* from autoconf.c
*/
int
uhaprobe(parent, self, aux)
struct device *parent, *self;
void *aux;
uhaprobe(parent, match, aux)
struct device *parent;
void *match, *aux;
{
struct uha_softc *uha = (void *)self;
struct uha_softc *uha = match;
struct isa_attach_args *ia = aux;
uha->sc_iobase = ia->ia_iobase;