summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/dp8390.c89
-rw-r--r--sys/dev/ic/ne2000.c58
-rw-r--r--sys/dev/isa/if_ec.c55
-rw-r--r--sys/dev/isa/if_ne_isa.c10
-rw-r--r--sys/dev/isa/if_ne_isapnp.c13
-rw-r--r--sys/dev/isa/if_we.c62
-rw-r--r--sys/dev/pci/if_ne_pci.c13
7 files changed, 83 insertions, 217 deletions
diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c
index 23397fe9680..6ef17d7bd5e 100644
--- a/sys/dev/ic/dp8390.c
+++ b/sys/dev/ic/dp8390.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dp8390.c,v 1.36 2006/10/10 00:09:07 brad Exp $ */
+/* $OpenBSD: dp8390.c,v 1.37 2006/10/20 16:54:01 brad Exp $ */
/* $NetBSD: dp8390.c,v 1.13 1998/07/05 06:49:11 jonathan Exp $ */
/*
@@ -82,8 +82,7 @@ dp8390_media_init(struct dp8390_softc *sc)
* Do bus-independent setup.
*/
int
-dp8390_config(sc)
- struct dp8390_softc *sc;
+dp8390_config(struct dp8390_softc *sc)
{
struct ifnet *ifp = &sc->sc_arpcom.ac_if;
int rv;
@@ -147,8 +146,7 @@ out:
* Media change callback.
*/
int
-dp8390_mediachange(ifp)
- struct ifnet *ifp;
+dp8390_mediachange(struct ifnet *ifp)
{
struct dp8390_softc *sc = ifp->if_softc;
@@ -162,9 +160,7 @@ dp8390_mediachange(ifp)
* Media status callback.
*/
void
-dp8390_mediastatus(ifp, ifmr)
- struct ifnet *ifp;
- struct ifmediareq *ifmr;
+dp8390_mediastatus(struct ifnet *ifp, struct ifmediareq *ifmr)
{
struct dp8390_softc *sc = ifp->if_softc;
@@ -182,8 +178,7 @@ dp8390_mediastatus(ifp, ifmr)
* Reset interface.
*/
void
-dp8390_reset(sc)
- struct dp8390_softc *sc;
+dp8390_reset(struct dp8390_softc *sc)
{
int s;
@@ -197,8 +192,7 @@ dp8390_reset(sc)
* Take interface offline.
*/
void
-dp8390_stop(sc)
- struct dp8390_softc *sc;
+dp8390_stop(struct dp8390_softc *sc)
{
bus_space_tag_t regt = sc->sc_regt;
bus_space_handle_t regh = sc->sc_regh;
@@ -229,8 +223,7 @@ dp8390_stop(sc)
*/
void
-dp8390_watchdog(ifp)
- struct ifnet *ifp;
+dp8390_watchdog(struct ifnet *ifp)
{
struct dp8390_softc *sc = ifp->if_softc;
@@ -244,8 +237,7 @@ dp8390_watchdog(ifp)
* Initialize device.
*/
void
-dp8390_init(sc)
- struct dp8390_softc *sc;
+dp8390_init(struct dp8390_softc *sc)
{
bus_space_tag_t regt = sc->sc_regt;
bus_space_handle_t regh = sc->sc_regh;
@@ -381,8 +373,7 @@ dp8390_init(sc)
* This routine actually starts the transmission on the interface.
*/
static __inline__ void
-dp8390_xmit(sc)
- struct dp8390_softc *sc;
+dp8390_xmit(struct dp8390_softc *sc)
{
bus_space_tag_t regt = sc->sc_regt;
bus_space_handle_t regh = sc->sc_regh;
@@ -437,8 +428,7 @@ dp8390_xmit(sc)
* (i.e. that the output part of the interface is idle)
*/
void
-dp8390_start(ifp)
- struct ifnet *ifp;
+dp8390_start(struct ifnet *ifp)
{
struct dp8390_softc *sc = ifp->if_softc;
struct mbuf *m0;
@@ -497,8 +487,7 @@ outloop:
* Ethernet interface receiver interrupt.
*/
void
-dp8390_rint(sc)
- struct dp8390_softc *sc;
+dp8390_rint(struct dp8390_softc *sc)
{
bus_space_tag_t regt = sc->sc_regt;
bus_space_handle_t regh = sc->sc_regh;
@@ -616,8 +605,7 @@ loop:
/* Ethernet interface interrupt processor. */
int
-dp8390_intr(arg)
- void *arg;
+dp8390_intr(void *arg)
{
struct dp8390_softc *sc = (struct dp8390_softc *)arg;
bus_space_tag_t regt = sc->sc_regt;
@@ -815,10 +803,7 @@ dp8390_intr(arg)
* Process an ioctl request. This code needs some work - it looks pretty ugly.
*/
int
-dp8390_ioctl(ifp, cmd, data)
- struct ifnet *ifp;
- u_long cmd;
- caddr_t data;
+dp8390_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
{
struct dp8390_softc *sc = ifp->if_softc;
struct ifaddr *ifa = (struct ifaddr *) data;
@@ -928,10 +913,7 @@ dp8390_ioctl(ifp, cmd, data)
* ether_input(). If there is a BPF listener, give a copy to BPF, too.
*/
void
-dp8390_read(sc, buf, len)
- struct dp8390_softc *sc;
- int buf;
- u_short len;
+dp8390_read(struct dp8390_softc *sc, int buf, u_short len)
{
struct ifnet *ifp = &sc->sc_arpcom.ac_if;
struct mbuf *m;
@@ -967,11 +949,9 @@ dp8390_read(sc, buf, len)
* need to listen to.
*/
void
-dp8390_getmcaf(ec, af)
- struct arpcom *ec;
- u_int8_t *af;
+dp8390_getmcaf(struct arpcom *ac, u_int8_t *af)
{
- struct ifnet *ifp = &ec->ac_if;
+ struct ifnet *ifp = &ac->ac_if;
struct ether_multi *enm;
u_int32_t crc;
int i;
@@ -993,7 +973,7 @@ dp8390_getmcaf(ec, af)
}
for (i = 0; i < 8; i++)
af[i] = 0;
- ETHER_FIRST_MULTI(step, ec, enm);
+ ETHER_FIRST_MULTI(step, ac, enm);
while (enm != NULL) {
if (bcmp(enm->enm_addrlo, enm->enm_addrhi,
sizeof(enm->enm_addrlo)) != 0) {
@@ -1030,10 +1010,7 @@ dp8390_getmcaf(ec, af)
* amount = amount of data to copy
*/
struct mbuf *
-dp8390_get(sc, src, total_len)
- struct dp8390_softc *sc;
- int src;
- u_short total_len;
+dp8390_get(struct dp8390_softc *sc, int src, u_short total_len)
{
struct ifnet *ifp = &sc->sc_arpcom.ac_if;
struct mbuf *m, *m0, *newm;
@@ -1099,8 +1076,7 @@ bad:
* Zero NIC buffer memory and verify that it is clear.
*/
static int
-dp8390_test_mem(sc)
- struct dp8390_softc *sc;
+dp8390_test_mem(struct dp8390_softc *sc)
{
bus_space_tag_t buft = sc->sc_buft;
bus_space_handle_t bufh = sc->sc_bufh;
@@ -1123,10 +1099,7 @@ dp8390_test_mem(sc)
* Read a packet header from the ring, given the source offset.
*/
static __inline__ void
-dp8390_read_hdr(sc, src, hdrp)
- struct dp8390_softc *sc;
- int src;
- struct dp8390_ring *hdrp;
+dp8390_read_hdr(struct dp8390_softc *sc, int src, struct dp8390_ring *hdrp)
{
bus_space_tag_t buft = sc->sc_buft;
bus_space_handle_t bufh = sc->sc_bufh;
@@ -1147,11 +1120,7 @@ dp8390_read_hdr(sc, src, hdrp)
* Takes into account ring-wrap.
*/
static __inline__ int
-dp8390_ring_copy(sc, src, dst, amount)
- struct dp8390_softc *sc;
- int src;
- caddr_t dst;
- u_short amount;
+dp8390_ring_copy(struct dp8390_softc *sc, int src, caddr_t dst, u_short amount)
{
bus_space_tag_t buft = sc->sc_buft;
bus_space_handle_t bufh = sc->sc_bufh;
@@ -1180,10 +1149,7 @@ dp8390_ring_copy(sc, src, dst, amount)
* packet fits in one mbuf.
*/
static __inline__ int
-dp8390_write_mbuf(sc, m, buf)
- struct dp8390_softc *sc;
- struct mbuf *m;
- int buf;
+dp8390_write_mbuf(struct dp8390_softc *sc, struct mbuf *m, int buf)
{
bus_space_tag_t buft = sc->sc_buft;
bus_space_handle_t bufh = sc->sc_bufh;
@@ -1207,8 +1173,7 @@ dp8390_write_mbuf(sc, m, buf)
* Enable power on the interface.
*/
int
-dp8390_enable(sc)
- struct dp8390_softc *sc;
+dp8390_enable(struct dp8390_softc *sc)
{
if (sc->sc_enabled == 0 && sc->sc_enable != NULL) {
@@ -1227,10 +1192,8 @@ dp8390_enable(sc)
* Disable power on the interface.
*/
void
-dp8390_disable(sc)
- struct dp8390_softc *sc;
+dp8390_disable(struct dp8390_softc *sc)
{
-
if (sc->sc_enabled != 0 && sc->sc_disable != NULL) {
(*sc->sc_disable)(sc);
sc->sc_enabled = 0;
@@ -1238,9 +1201,7 @@ dp8390_disable(sc)
}
int
-dp8390_detach(sc, flags)
- struct dp8390_softc *sc;
- int flags;
+dp8390_detach(struct dp8390_softc *sc, int flags)
{
struct ifnet *ifp = &sc->sc_arpcom.ac_if;
diff --git a/sys/dev/ic/ne2000.c b/sys/dev/ic/ne2000.c
index fd5a27195ea..b3749265533 100644
--- a/sys/dev/ic/ne2000.c
+++ b/sys/dev/ic/ne2000.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ne2000.c,v 1.18 2006/10/10 00:09:07 brad Exp $ */
+/* $OpenBSD: ne2000.c,v 1.19 2006/10/20 16:54:01 brad Exp $ */
/* $NetBSD: ne2000.c,v 1.12 1998/06/10 01:15:50 thorpej Exp $ */
/*-
@@ -107,9 +107,7 @@ struct cfdriver ne_cd = {
};
int
-ne2000_attach(nsc, myea)
- struct ne2000_softc *nsc;
- u_int8_t *myea;
+ne2000_attach(struct ne2000_softc *nsc, u_int8_t *myea)
{
struct dp8390_softc *dsc = &nsc->sc_dp8390;
bus_space_tag_t nict = dsc->sc_regt;
@@ -306,8 +304,7 @@ ne2000_attach(nsc, myea)
* Detect an NE-2000 or compatible. Returns a model code.
*/
int
-ne2000_detect(nsc)
- struct ne2000_softc *nsc;
+ne2000_detect(struct ne2000_softc *nsc)
{
struct dp8390_softc *dsc = &nsc->sc_dp8390;
bus_space_tag_t nict = dsc->sc_regt;
@@ -476,10 +473,7 @@ ne2000_detect(nsc)
* I/O.
*/
int
-ne2000_write_mbuf(sc, m, buf)
- struct dp8390_softc *sc;
- struct mbuf *m;
- int buf;
+ne2000_write_mbuf(struct dp8390_softc *sc, struct mbuf *m, int buf)
{
struct ne2000_softc *nsc = (struct ne2000_softc *)sc;
bus_space_tag_t nict = sc->sc_regt;
@@ -651,11 +645,8 @@ ne2000_write_mbuf(sc, m, buf)
* ring-wrap.
*/
int
-ne2000_ring_copy(sc, src, dst, amount)
- struct dp8390_softc *sc;
- int src;
- caddr_t dst;
- u_short amount;
+ne2000_ring_copy(struct dp8390_softc *sc, int src, caddr_t dst,
+ u_short amount)
{
struct ne2000_softc *nsc = (struct ne2000_softc *)sc;
bus_space_tag_t nict = sc->sc_regt;
@@ -685,10 +676,7 @@ ne2000_ring_copy(sc, src, dst, amount)
}
void
-ne2000_read_hdr(sc, buf, hdr)
- struct dp8390_softc *sc;
- int buf;
- struct dp8390_ring *hdr;
+ne2000_read_hdr(struct dp8390_softc *sc, int buf, struct dp8390_ring *hdr)
{
struct ne2000_softc *nsc = (struct ne2000_softc *)sc;
@@ -701,10 +689,8 @@ ne2000_read_hdr(sc, buf, hdr)
}
int
-ne2000_test_mem(sc)
- struct dp8390_softc *sc;
+ne2000_test_mem(struct dp8390_softc *sc)
{
-
/* Noop. */
return (0);
}
@@ -715,15 +701,9 @@ ne2000_test_mem(sc)
* rounded up to a word - ok as long as mbufs are word sized.
*/
void
-ne2000_readmem(nict, nich, asict, asich, src, dst, amount, useword)
- bus_space_tag_t nict;
- bus_space_handle_t nich;
- bus_space_tag_t asict;
- bus_space_handle_t asich;
- int src;
- u_int8_t *dst;
- size_t amount;
- int useword;
+ne2000_readmem(bus_space_tag_t nict, bus_space_handle_t nich,
+ bus_space_tag_t asict, bus_space_handle_t asich, int src,
+ u_int8_t *dst, size_t amount, int useword)
{
/* Select page 0 registers. */
@@ -767,15 +747,9 @@ ne2000_readmem(nict, nich, asict, asich, src, dst, amount, useword)
* used in the probe routine to test the memory. 'len' must be even.
*/
void
-ne2000_writemem(nict, nich, asict, asich, src, dst, len, useword)
- bus_space_tag_t nict;
- bus_space_handle_t nich;
- bus_space_tag_t asict;
- bus_space_handle_t asich;
- u_int8_t *src;
- int dst;
- size_t len;
- int useword;
+ne2000_writemem(bus_space_tag_t nict, bus_space_handle_t nich,
+ bus_space_tag_t asict, bus_space_handle_t asich, u_int8_t *src,
+ int dst, size_t len, int useword)
{
int maxwait = 100; /* about 120us */
@@ -830,9 +804,7 @@ ne2000_writemem(nict, nich, asict, asich, src, dst, len, useword)
}
int
-ne2000_detach(sc, flags)
- struct ne2000_softc *sc;
- int flags;
+ne2000_detach(struct ne2000_softc *sc, int flags)
{
return (dp8390_detach(&sc->sc_dp8390, flags));
}
diff --git a/sys/dev/isa/if_ec.c b/sys/dev/isa/if_ec.c
index 9ce72a8722a..4ff37cf6260 100644
--- a/sys/dev/isa/if_ec.c
+++ b/sys/dev/isa/if_ec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ec.c,v 1.8 2006/10/01 20:51:36 brad Exp $ */
+/* $OpenBSD: if_ec.c,v 1.9 2006/10/20 16:54:01 brad Exp $ */
/* $NetBSD: if_ec.c,v 1.9 1998/07/05 06:49:12 jonathan Exp $ */
/*-
@@ -150,9 +150,7 @@ struct cfdriver ec_cd = {
};
int
-ec_probe(parent, match, aux)
- struct device *parent;
- void *match, *aux;
+ec_probe(struct device *parent, void *match, void *aux)
{
struct isa_attach_args *ia = aux;
bus_space_tag_t nict, asict, memt;
@@ -257,9 +255,7 @@ ec_probe(parent, match, aux)
}
void
-ec_attach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
+ec_attach(struct device *parent, struct device *self, void *aux)
{
struct ec_softc *esc = (struct ec_softc *)self;
struct dp8390_softc *sc = &esc->sc_dp8390;
@@ -519,10 +515,8 @@ ec_attach(parent, self, aux)
}
int
-ec_fake_test_mem(sc)
- struct dp8390_softc *sc;
+ec_fake_test_mem(struct dp8390_softc *sc)
{
-
/*
* We have to do this after we initialize the GA, but we
* have to do that after calling dp8390_config(), which
@@ -533,8 +527,7 @@ ec_fake_test_mem(sc)
}
int
-ec_test_mem(sc)
- struct dp8390_softc *sc;
+ec_test_mem(struct dp8390_softc *sc)
{
struct ec_softc *esc = (struct ec_softc *)sc;
bus_space_tag_t memt = sc->sc_buft;
@@ -573,11 +566,7 @@ ec_test_mem(sc)
* up to a word - ok as long as mbufs are word-sized.
*/
__inline void
-ec_readmem(esc, from, to, len)
- struct ec_softc *esc;
- int from;
- u_int8_t *to;
- int len;
+ec_readmem(struct ec_softc *esc, int from, u_int8_t *to, int len)
{
bus_space_tag_t memt = esc->sc_dp8390.sc_buft;
bus_space_handle_t memh = esc->sc_dp8390.sc_bufh;
@@ -593,10 +582,7 @@ ec_readmem(esc, from, to, len)
}
int
-ec_write_mbuf(sc, m, buf)
- struct dp8390_softc *sc;
- struct mbuf *m;
- int buf;
+ec_write_mbuf(struct dp8390_softc *sc, struct mbuf *m, int buf)
{
struct ec_softc *esc = (struct ec_softc *)sc;
bus_space_tag_t asict = esc->sc_asict;
@@ -702,11 +688,8 @@ ec_write_mbuf(sc, m, buf)
}
int
-ec_ring_copy(sc, src, dst, amount)
- struct dp8390_softc *sc;
- int src;
- caddr_t dst;
- u_short amount;
+ec_ring_copy(struct dp8390_softc *sc, int src, caddr_t dst,
+ u_short amount)
{
struct ec_softc *esc = (struct ec_softc *)sc;
u_short tmp_amount;
@@ -729,10 +712,8 @@ ec_ring_copy(sc, src, dst, amount)
}
void
-ec_read_hdr(sc, packet_ptr, packet_hdrp)
- struct dp8390_softc *sc;
- int packet_ptr;
- struct dp8390_ring *packet_hdrp;
+ec_read_hdr(struct dp8390_softc *sc, int packet_ptr,
+ struct dp8390_ring *packet_hdrp)
{
struct ec_softc *esc = (struct ec_softc *)sc;
@@ -753,8 +734,7 @@ ec_media_init(struct dp8390_softc *sc)
}
int
-ec_mediachange(sc)
- struct dp8390_softc *sc;
+ec_mediachange(struct dp8390_softc *sc)
{
struct ec_softc *esc = (struct ec_softc *)sc;
struct ifmedia *ifm = &sc->sc_media;
@@ -763,9 +743,7 @@ ec_mediachange(sc)
}
void
-ec_mediastatus(sc, ifmr)
- struct dp8390_softc *sc;
- struct ifmediareq *ifmr;
+ec_mediastatus(struct dp8390_softc *sc, struct ifmediareq *ifmr)
{
struct ifmedia *ifm = &sc->sc_media;
@@ -776,8 +754,7 @@ ec_mediastatus(sc, ifmr)
}
void
-ec_init_card(sc)
- struct dp8390_softc *sc;
+ec_init_card(struct dp8390_softc *sc)
{
struct ec_softc *esc = (struct ec_softc *)sc;
struct ifmedia *ifm = &sc->sc_media;
@@ -786,9 +763,7 @@ ec_init_card(sc)
}
int
-ec_set_media(esc, media)
- struct ec_softc *esc;
- int media;
+ec_set_media(struct ec_softc *esc, int media)
{
u_int8_t new;
diff --git a/sys/dev/isa/if_ne_isa.c b/sys/dev/isa/if_ne_isa.c
index 7a087cccff5..25de93b76eb 100644
--- a/sys/dev/isa/if_ne_isa.c
+++ b/sys/dev/isa/if_ne_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ne_isa.c,v 1.10 2005/11/21 18:16:40 millert Exp $ */
+/* $OpenBSD: if_ne_isa.c,v 1.11 2006/10/20 16:54:01 brad Exp $ */
/* $NetBSD: if_ne_isa.c,v 1.6 1998/07/05 06:49:13 jonathan Exp $ */
/*-
@@ -102,9 +102,7 @@ struct cfattach ne_isa_ca = {
};
int
-ne_isa_match(parent, match, aux)
- struct device *parent;
- void *match, *aux;
+ne_isa_match(struct device *parent, void *match, void *aux)
{
struct ne_isa_softc *isc = match;
struct ne2000_softc *nsc = &isc->sc_ne2000;
@@ -152,9 +150,7 @@ ne_isa_match(parent, match, aux)
}
void
-ne_isa_attach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
+ne_isa_attach(struct device *parent, struct device *self, void *aux)
{
struct ne_isa_softc *isc = (struct ne_isa_softc *)self;
struct ne2000_softc *nsc = &isc->sc_ne2000;
diff --git a/sys/dev/isa/if_ne_isapnp.c b/sys/dev/isa/if_ne_isapnp.c
index b9b727224b7..40a6083cbf1 100644
--- a/sys/dev/isa/if_ne_isapnp.c
+++ b/sys/dev/isa/if_ne_isapnp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ne_isapnp.c,v 1.9 2005/11/21 18:16:40 millert Exp $ */
+/* $OpenBSD: if_ne_isapnp.c,v 1.10 2006/10/20 16:54:01 brad Exp $ */
/* $NetBSD: if_ne_isapnp.c,v 1.7 1998/07/23 19:30:45 christos Exp $ */
/*-
@@ -108,18 +108,13 @@ struct cfattach ne_isapnp_ca = {
};
static int
-ne_isapnp_match(parent, match, aux)
- struct device *parent;
- void *match, *aux;
+ne_isapnp_match(struct device *parent, void *match, void *aux)
{
- return 1;
+ return (1);
}
static void
-ne_isapnp_attach(
- struct device *parent,
- struct device *self,
- void *aux)
+ne_isapnp_attach(struct device *parent, struct device *self, void *aux)
{
struct ne_isapnp_softc * const isc = (struct ne_isapnp_softc *)self;
struct ne2000_softc * const nsc = &isc->sc_ne2000;
diff --git a/sys/dev/isa/if_we.c b/sys/dev/isa/if_we.c
index 0fefb38814a..37fbe057787 100644
--- a/sys/dev/isa/if_we.c
+++ b/sys/dev/isa/if_we.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_we.c,v 1.15 2006/10/01 20:51:36 brad Exp $ */
+/* $OpenBSD: if_we.c,v 1.16 2006/10/20 16:54:01 brad Exp $ */
/* $NetBSD: if_we.c,v 1.11 1998/07/05 06:49:14 jonathan Exp $ */
/*-
@@ -205,9 +205,7 @@ do { \
} while (0)
int
-we_probe(parent, match, aux)
- struct device *parent;
- void *match, *aux;
+we_probe(struct device *parent, void *match, void *aux)
{
struct isa_attach_args *ia = aux;
struct cfdata *cf = match;
@@ -350,9 +348,7 @@ we_probe(parent, match, aux)
}
void
-we_attach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
+we_attach(struct device *parent, struct device *self, void *aux)
{
struct we_softc *wsc = (struct we_softc *)self;
struct dp8390_softc *sc = &wsc->sc_dp8390;
@@ -572,8 +568,7 @@ we_attach(parent, self, aux)
}
int
-we_test_mem(sc)
- struct dp8390_softc *sc;
+we_test_mem(struct dp8390_softc *sc)
{
struct we_softc *wsc = (struct we_softc *)sc;
bus_space_tag_t memt = sc->sc_buft;
@@ -613,11 +608,7 @@ we_test_mem(sc)
* up to a word - ok as long as mbufs are word-sized.
*/
__inline void
-we_readmem(wsc, from, to, len)
- struct we_softc *wsc;
- int from;
- u_int8_t *to;
- int len;
+we_readmem(struct we_softc *wsc, int from, u_int8_t *to, int len)
{
bus_space_tag_t memt = wsc->sc_dp8390.sc_buft;
bus_space_handle_t memh = wsc->sc_dp8390.sc_bufh;
@@ -634,10 +625,7 @@ we_readmem(wsc, from, to, len)
}
int
-we_write_mbuf(sc, m, buf)
- struct dp8390_softc *sc;
- struct mbuf *m;
- int buf;
+we_write_mbuf(struct dp8390_softc *sc, struct mbuf *m, int buf)
{
struct we_softc *wsc = (struct we_softc *)sc;
bus_space_tag_t memt = wsc->sc_dp8390.sc_buft;
@@ -731,11 +719,7 @@ we_write_mbuf(sc, m, buf)
}
int
-we_ring_copy(sc, src, dst, amount)
- struct dp8390_softc *sc;
- int src;
- caddr_t dst;
- u_short amount;
+we_ring_copy(struct dp8390_softc *sc, int src, caddr_t dst, u_short amount)
{
struct we_softc *wsc = (struct we_softc *)sc;
u_short tmp_amount;
@@ -758,10 +742,8 @@ we_ring_copy(sc, src, dst, amount)
}
void
-we_read_hdr(sc, packet_ptr, packet_hdrp)
- struct dp8390_softc *sc;
- int packet_ptr;
- struct dp8390_ring *packet_hdrp;
+we_read_hdr(struct dp8390_softc *sc, int packet_ptr,
+ struct dp8390_ring *packet_hdrp)
{
struct we_softc *wsc = (struct we_softc *)sc;
@@ -773,8 +755,7 @@ we_read_hdr(sc, packet_ptr, packet_hdrp)
}
void
-we_recv_int(sc)
- struct dp8390_softc *sc;
+we_recv_int(struct dp8390_softc *sc)
{
struct we_softc *wsc = (struct we_softc *)sc;
@@ -816,8 +797,7 @@ we_media_init(struct dp8390_softc *sc)
}
int
-we_mediachange(sc)
- struct dp8390_softc *sc;
+we_mediachange(struct dp8390_softc *sc)
{
/*
@@ -830,9 +810,7 @@ we_mediachange(sc)
}
void
-we_mediastatus(sc, ifmr)
- struct dp8390_softc *sc;
- struct ifmediareq *ifmr;
+we_mediastatus(struct dp8390_softc *sc, struct ifmediareq *ifmr)
{
struct ifmedia *ifm = &sc->sc_media;
@@ -843,8 +821,7 @@ we_mediastatus(sc, ifmr)
}
void
-we_init_card(sc)
- struct dp8390_softc *sc;
+we_init_card(struct dp8390_softc *sc)
{
struct we_softc *wsc = (struct we_softc *)sc;
struct ifmedia *ifm = &sc->sc_media;
@@ -853,9 +830,7 @@ we_init_card(sc)
}
void
-we_set_media(wsc, media)
- struct we_softc *wsc;
- int media;
+we_set_media(struct we_softc *wsc, int media)
{
struct dp8390_softc *sc = &wsc->sc_dp8390;
bus_space_tag_t asict = wsc->sc_asict;
@@ -887,12 +862,9 @@ we_set_media(wsc, media)
}
const char *
-we_params(asict, asich, typep, memsizep, is16bitp, is790p)
- bus_space_tag_t asict;
- bus_space_handle_t asich;
- u_int8_t *typep;
- bus_size_t *memsizep;
- int *is16bitp, *is790p;
+we_params(bus_space_tag_t asict, bus_space_handle_t asich,
+ u_int8_t *typep, bus_size_t *memsizep, int *is16bitp,
+ int *is790p)
{
const char *typestr;
bus_size_t memsize;
diff --git a/sys/dev/pci/if_ne_pci.c b/sys/dev/pci/if_ne_pci.c
index 28aeaaf90e7..b2ce0451a16 100644
--- a/sys/dev/pci/if_ne_pci.c
+++ b/sys/dev/pci/if_ne_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ne_pci.c,v 1.14 2005/10/22 23:26:08 brad Exp $ */
+/* $OpenBSD: if_ne_pci.c,v 1.15 2006/10/20 16:54:01 brad Exp $ */
/* $NetBSD: if_ne_pci.c,v 1.8 1998/07/05 00:51:24 jonathan Exp $ */
/*-
@@ -148,8 +148,7 @@ const struct ne_pci_product {
const struct ne_pci_product *ne_pci_lookup(struct pci_attach_args *);
const struct ne_pci_product *
-ne_pci_lookup(pa)
- struct pci_attach_args *pa;
+ne_pci_lookup(struct pci_attach_args *pa)
{
const struct ne_pci_product *npp;
@@ -170,9 +169,7 @@ ne_pci_lookup(pa)
#define PCI_CBIO 0x10 /* Configuration Base IO Address */
int
-ne_pci_match(parent, match, aux)
- struct device *parent;
- void *match, *aux;
+ne_pci_match(struct device *parent, void *match, void *aux)
{
struct pci_attach_args *pa = aux;
@@ -183,9 +180,7 @@ ne_pci_match(parent, match, aux)
}
void
-ne_pci_attach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
+ne_pci_attach(struct device *parent, struct device *self, void *aux)
{
struct ne_pci_softc *psc = (struct ne_pci_softc *)self;
struct ne2000_softc *nsc = &psc->sc_ne2000;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 08:14:27 +0000