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

change LANCE copy & zero functions' names to start with amd7990_, and

Browse Source 
remove their 'integrate' (usually defined to be 'static') keywords.
when lance drivers are split up by attachment, more than one file will
reference the copy/zero functions (i.e. not just the file that pulls in
am7990.c... and eventually inclusion of am7990.c should go away entirely).
This commit is contained in:
cgd 1996-04-18 00:25:11 +00:00
parent 67d51cc7b5
commit d7d306aeb7
10 changed files with 97 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/arch/amiga/dev/if_le.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le.c,v 1.17 1996/03/17 01:17:35 thorpej Exp $ */
/* $NetBSD: if_le.c,v 1.18 1996/04/18 00:25:11 cgd Exp $ */
/*-
* Copyright (c) 1995 Charles M. Hannum. All rights reserved.
@ -140,11 +140,11 @@ le_zbus_attach(parent, self, aux)
sc->sc_r1 = (struct lereg1 *)(lestd[1] + (int)zap->va);
sc->sc_mem = (void *)(lestd[2] + (int)zap->va);
sc->sc_copytodesc = copytobuf_contig;
sc->sc_copyfromdesc = copyfrombuf_contig;
sc->sc_copytobuf = copytobuf_contig;
sc->sc_copyfrombuf = copyfrombuf_contig;
sc->sc_zerobuf = zerobuf_contig;
sc->sc_copytodesc = am7990_copytobuf_contig;
sc->sc_copyfromdesc = am7990_copyfrombuf_contig;
sc->sc_copytobuf = am7990_copytobuf_contig;
sc->sc_copyfrombuf = am7990_copyfrombuf_contig;
sc->sc_zerobuf = am7990_zerobuf_contig;
sc->sc_conf3 = LE_C3_BSWP;
sc->sc_addr = 0x8000;

12
sys/arch/hp300/dev/if_le.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le.c,v 1.27 1996/02/14 02:44:36 thorpej Exp $ */
/* $NetBSD: if_le.c,v 1.28 1996/04/18 00:25:15 cgd Exp $ */
/*-
* Copyright (c) 1995 Charles M. Hannum. All rights reserved.
@ -179,11 +179,11 @@ leattach(hd)
cp++;
}
sc->sc_copytodesc = copytobuf_contig;
sc->sc_copyfromdesc = copyfrombuf_contig;
sc->sc_copytobuf = copytobuf_contig;
sc->sc_copyfrombuf = copyfrombuf_contig;
sc->sc_zerobuf = zerobuf_contig;
sc->sc_copytodesc = am7990_copytobuf_contig;
sc->sc_copyfromdesc = am7990_copyfrombuf_contig;
sc->sc_copytobuf = am7990_copytobuf_contig;
sc->sc_copyfrombuf = am7990_copyfrombuf_contig;
sc->sc_zerobuf = am7990_zerobuf_contig;
sc->sc_arpcom.ac_if.if_name = ledriver.d_name;
leconfig(sc);

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

@ -1,4 +1,4 @@
/* $NetBSD: if_le.c,v 1.4 1996/03/17 01:35:00 thorpej Exp $ */
/* $NetBSD: if_le.c,v 1.5 1996/04/18 00:25:18 cgd Exp $ */
/*-
* Copyright (c) 1995 Charles M. Hannum. All rights reserved.
@ -141,11 +141,11 @@ leattach(parent, self, aux)
myetheraddr(sc->sc_arpcom.ac_enaddr);
sc->sc_copytodesc = copytobuf_contig;
sc->sc_copyfromdesc = copyfrombuf_contig;
sc->sc_copytobuf = copytobuf_contig;
sc->sc_copyfrombuf = copyfrombuf_contig;
sc->sc_zerobuf = zerobuf_contig;
sc->sc_copytodesc = am7990_copytobuf_contig;
sc->sc_copyfromdesc = am7990_copyfrombuf_contig;
sc->sc_copytobuf = am7990_copytobuf_contig;
sc->sc_copyfrombuf = am7990_copyfrombuf_contig;
sc->sc_zerobuf = am7990_zerobuf_contig;
sc->sc_arpcom.ac_if.if_name = le_cd.cd_name;
leconfig(sc);

32
sys/arch/pmax/tc/if_le.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le.c,v 1.10 1996/03/18 01:22:27 jonathan Exp $ */
/* $NetBSD: if_le.c,v 1.11 1996/04/18 00:25:20 cgd Exp $ */
/*-
* Copyright (c) 1995 Charles M. Hannum. All rights reserved.
@ -194,11 +194,11 @@ le_tc_attach(parent, self, aux)
sc->sc_mem = (void *)MACH_PHYS_TO_UNCACHED(le_iomem);
/* XXX */ cp = (u_char *)IOASIC_SYS_ETHER_ADDRESS(ioasic_base);
sc->sc_copytodesc = copytobuf_gap2;
sc->sc_copyfromdesc = copyfrombuf_gap2;
sc->sc_copytobuf = copytobuf_gap16;
sc->sc_copyfrombuf = copyfrombuf_gap16;
sc->sc_zerobuf = zerobuf_gap16;
sc->sc_copytodesc = am7990_copytobuf_gap2;
sc->sc_copyfromdesc = am7990_copyfrombuf_gap2;
sc->sc_copytobuf = am7990_copytobuf_gap16;
sc->sc_copyfrombuf = am7990_copyfrombuf_gap16;
sc->sc_zerobuf = am7990_zerobuf_gap16;
/*
* And enable Lance dma through the asic.
@ -224,11 +224,11 @@ le_tc_attach(parent, self, aux)
(ca->ca_addr + LE_OFFSET_RAM);
cp = (u_char *)(ca->ca_addr + LE_OFFSET_ROM + 2);
sc->sc_copytodesc = copytobuf_contig;
sc->sc_copyfromdesc = copyfrombuf_contig;
sc->sc_copytobuf = copytobuf_contig;
sc->sc_copyfrombuf = copyfrombuf_contig;
sc->sc_zerobuf = zerobuf_contig;
sc->sc_copytodesc = am7990_copytobuf_contig;
sc->sc_copyfromdesc = am7990_copyfrombuf_contig;
sc->sc_copytobuf = am7990_copytobuf_contig;
sc->sc_copyfrombuf = am7990_copyfrombuf_contig;
sc->sc_zerobuf = am7990_zerobuf_contig;
}
#ifdef pmax
else if (parent->dv_cfdata->cf_driver == &mainbus_cd) {
@ -238,11 +238,11 @@ le_tc_attach(parent, self, aux)
/*XXX*/ sc->sc_mem = (void *)MACH_PHYS_TO_UNCACHED(0x19000000);
/*XXX*/ cp = (u_char *)(MACH_PHYS_TO_UNCACHED(KN01_SYS_CLOCK) + 1);
sc->sc_copytodesc = copytobuf_gap2;
sc->sc_copyfromdesc = copyfrombuf_gap2;
sc->sc_copytobuf = copytobuf_gap2;
sc->sc_copyfrombuf = copyfrombuf_gap2;
sc->sc_zerobuf = zerobuf_gap2;
sc->sc_copytodesc = am7990_copytobuf_gap2;
sc->sc_copyfromdesc = am7990_copyfrombuf_gap2;
sc->sc_copytobuf = am7990_copytobuf_gap2;
sc->sc_copyfrombuf = am7990_copyfrombuf_gap2;
sc->sc_zerobuf = am7990_zerobuf_gap2;
}
#endif

12
sys/arch/sparc/dev/if_le.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le.c,v 1.28 1996/04/10 20:46:08 pk Exp $ */
/* $NetBSD: if_le.c,v 1.29 1996/04/18 00:25:22 cgd Exp $ */
/*-
* Copyright (c) 1996
@ -191,11 +191,11 @@ leattach(parent, self, aux)
myetheraddr(sc->sc_arpcom.ac_enaddr);
sc->sc_copytodesc = copytobuf_contig;
sc->sc_copyfromdesc = copyfrombuf_contig;
sc->sc_copytobuf = copytobuf_contig;
sc->sc_copyfrombuf = copyfrombuf_contig;
sc->sc_zerobuf = zerobuf_contig;
sc->sc_copytodesc = am7990_copytobuf_contig;
sc->sc_copyfromdesc = am7990_copyfrombuf_contig;
sc->sc_copytobuf = am7990_copytobuf_contig;
sc->sc_copyfrombuf = am7990_copyfrombuf_contig;
sc->sc_zerobuf = am7990_zerobuf_contig;
sc->sc_arpcom.ac_if.if_name = le_cd.cd_name;
leconfig(sc);

12
sys/arch/sun3/dev/if_le.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le.c,v 1.26 1996/03/26 14:42:18 gwr Exp $ */
/* $NetBSD: if_le.c,v 1.27 1996/04/18 00:25:25 cgd Exp $ */
/*-
* Copyright (c) 1995 Charles M. Hannum. All rights reserved.
@ -157,11 +157,11 @@ le_attach(parent, self, aux)
idprom_etheraddr(sc->sc_arpcom.ac_enaddr);
sc->sc_copytodesc = copytobuf_contig;
sc->sc_copyfromdesc = copyfrombuf_contig;
sc->sc_copytobuf = copytobuf_contig;
sc->sc_copyfrombuf = copyfrombuf_contig;
sc->sc_zerobuf = zerobuf_contig;
sc->sc_copytodesc = am7990_copytobuf_contig;
sc->sc_copyfromdesc = am7990_copyfrombuf_contig;
sc->sc_copytobuf = am7990_copytobuf_contig;
sc->sc_copyfrombuf = am7990_copyfrombuf_contig;
sc->sc_zerobuf = am7990_zerobuf_contig;
sc->sc_arpcom.ac_if.if_name = le_cd.cd_name;
leconfig(sc);

38
sys/dev/ic/am7990.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: am7990.c,v 1.16 1996/04/09 15:21:59 pk Exp $ */
/* $NetBSD: am7990.c,v 1.17 1996/04/18 00:25:30 cgd Exp $ */
/*-
* Copyright (c) 1995 Charles M. Hannum. All rights reserved.
@ -1014,8 +1014,8 @@ allmulti:
* Buffers may have any alignment.
*/
integrate void
copytobuf_contig(sc, from, boff, len)
void
am7990_copytobuf_contig(sc, from, boff, len)
struct le_softc *sc;
void *from;
int boff, len;
@ -1028,8 +1028,8 @@ copytobuf_contig(sc, from, boff, len)
bcopy(from, buf + boff, len);
}
integrate void
copyfrombuf_contig(sc, to, boff, len)
void
am7990_copyfrombuf_contig(sc, to, boff, len)
struct le_softc *sc;
void *to;
int boff, len;
@ -1042,8 +1042,8 @@ copyfrombuf_contig(sc, to, boff, len)
bcopy(buf + boff, to, len);
}
integrate void
zerobuf_contig(sc, boff, len)
void
am7990_zerobuf_contig(sc, boff, len)
struct le_softc *sc;
int boff, len;
{
@ -1064,8 +1064,8 @@ zerobuf_contig(sc, boff, len)
* doing an extra byte.
*/
integrate void
copytobuf_gap2(sc, fromv, boff, len)
void
am7990_copytobuf_gap2(sc, fromv, boff, len)
struct le_softc *sc;
void *fromv;
int boff;
@ -1093,8 +1093,8 @@ copytobuf_gap2(sc, fromv, boff, len)
*bptr = (u_int16_t)*from;
}
integrate void
copyfrombuf_gap2(sc, tov, boff, len)
void
am7990_copyfrombuf_gap2(sc, tov, boff, len)
struct le_softc *sc;
void *tov;
int boff, len;
@ -1123,8 +1123,8 @@ copyfrombuf_gap2(sc, tov, boff, len)
*to = *bptr & 0xff;
}
integrate void
zerobuf_gap2(sc, boff, len)
void
am7990_zerobuf_gap2(sc, boff, len)
struct le_softc *sc;
int boff, len;
{
@ -1153,8 +1153,8 @@ zerobuf_gap2(sc, boff, len)
* Buffers must be 32-byte aligned.
*/
integrate void
copytobuf_gap16(sc, fromv, boff, len)
void
am7990_copytobuf_gap16(sc, fromv, boff, len)
struct le_softc *sc;
void *fromv;
int boff;
@ -1178,8 +1178,8 @@ copytobuf_gap16(sc, fromv, boff, len)
}
}
integrate void
copyfrombuf_gap16(sc, tov, boff, len)
void
am7990_copyfrombuf_gap16(sc, tov, boff, len)
struct le_softc *sc;
void *tov;
int boff, len;
@ -1202,8 +1202,8 @@ copyfrombuf_gap16(sc, tov, boff, len)
}
}
integrate void
zerobuf_gap16(sc, boff, len)
void
am7990_zerobuf_gap16(sc, boff, len)
struct le_softc *sc;
int boff, len;
{

20
sys/dev/ic/am7990var.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: am7990var.h,v 1.4 1996/03/14 19:05:09 christos Exp $ */
/* $NetBSD: am7990var.h,v 1.5 1996/04/18 00:25:33 cgd Exp $ */
/*
* Copyright (c) 1995 Charles M. Hannum. All rights reserved.
@ -62,17 +62,17 @@ integrate void leread __P((struct le_softc *, int, int));
* for drivers that have not yet been optimized.
*/
#ifdef LE_NEED_BUF_CONTIG
integrate void copytobuf_contig __P((struct le_softc *, void *, int, int));
integrate void copyfrombuf_contig __P((struct le_softc *, void *, int, int));
integrate void zerobuf_contig __P((struct le_softc *, int, int));
void am7990_copytobuf_contig __P((struct le_softc *, void *, int, int));
void am7990_copyfrombuf_contig __P((struct le_softc *, void *, int, int));
void am7990_zerobuf_contig __P((struct le_softc *, int, int));
#endif /* LE_NEED_BUF_CONTIG */
#ifdef LE_NEED_BUF_GAP2
integrate void copytobuf_gap2 __P((struct le_softc *, void *, int, int));
integrate void copyfrombuf_gap2 __P((struct le_softc *, void *, int, int));
integrate void zerobuf_gap2 __P((struct le_softc *, int, int));
void am7990_copytobuf_gap2 __P((struct le_softc *, void *, int, int));
void am7990_copyfrombuf_gap2 __P((struct le_softc *, void *, int, int));
void am7990_zerobuf_gap2 __P((struct le_softc *, int, int));
#endif /* LE_NEED_BUF_GAP2 */
#ifdef LE_NEED_BUF_GAP16
integrate void copytobuf_gap16 __P((struct le_softc *, void *, int, int));
integrate void copyfrombuf_gap16 __P((struct le_softc *, void *, int, int));
integrate void zerobuf_gap16 __P((struct le_softc *, int, int));
void am7990_copytobuf_gap16 __P((struct le_softc *, void *, int, int));
void am7990_copyfrombuf_gap16 __P((struct le_softc *, void *, int, int));
void am7990_zerobuf_gap16 __P((struct le_softc *, int, int));
#endif /* LE_NEED_BUF_GAP16 */

12
sys/dev/isa/if_le.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le.c,v 1.41 1996/04/11 22:29:34 cgd Exp $ */
/* $NetBSD: if_le.c,v 1.42 1996/04/18 00:25:35 cgd Exp $ */
/*-
* Copyright (c) 1995 Charles M. Hannum. All rights reserved.
@ -388,11 +388,11 @@ leattach(parent, self, aux)
sc->sc_memsize = 16384;
}
sc->sc_copytodesc = copytobuf_contig;
sc->sc_copyfromdesc = copyfrombuf_contig;
sc->sc_copytobuf = copytobuf_contig;
sc->sc_copyfrombuf = copyfrombuf_contig;
sc->sc_zerobuf = zerobuf_contig;
sc->sc_copytodesc = am7990_copytobuf_contig;
sc->sc_copyfromdesc = am7990_copyfrombuf_contig;
sc->sc_copytobuf = am7990_copytobuf_contig;
sc->sc_copyfrombuf = am7990_copyfrombuf_contig;
sc->sc_zerobuf = am7990_zerobuf_contig;
sc->sc_arpcom.ac_if.if_name = le_cd.cd_name;
leconfig(sc);

32
sys/dev/tc/if_le.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le.c,v 1.6 1996/04/08 20:09:56 jonathan Exp $ */
/* $NetBSD: if_le.c,v 1.7 1996/04/18 00:25:37 cgd Exp $ */
/*-
* Copyright (c) 1995 Charles M. Hannum. All rights reserved.
@ -221,11 +221,11 @@ le_tc_attach(parent, self, aux)
sc->sc_mem = (void *)TC_PHYS_TO_UNCACHED(le_iomem);
cp = ioasic_lance_ether_address();
sc->sc_copytodesc = copytobuf_gap2;
sc->sc_copyfromdesc = copyfrombuf_gap2;
sc->sc_copytobuf = copytobuf_gap16;
sc->sc_copyfrombuf = copyfrombuf_gap16;
sc->sc_zerobuf = zerobuf_gap16;
sc->sc_copytodesc = am7990_copytobuf_gap2;
sc->sc_copyfromdesc = am7990_copyfrombuf_gap2;
sc->sc_copytobuf = am7990_copytobuf_gap16;
sc->sc_copyfrombuf = am7990_copyfrombuf_gap16;
sc->sc_zerobuf = am7990_zerobuf_gap16;
ioasic_lance_dma_setup(le_iomem); /* XXX more thought */
ie_fn = ioasic_intr_establish;
@ -244,11 +244,11 @@ le_tc_attach(parent, self, aux)
sc->sc_mem = (void *)(d->ta_addr + LE_OFFSET_RAM);
cp = (u_char *)(d->ta_addr + LE_OFFSET_ROM + 2);
sc->sc_copytodesc = copytobuf_contig;
sc->sc_copyfromdesc = copyfrombuf_contig;
sc->sc_copytobuf = copytobuf_contig;
sc->sc_copyfrombuf = copyfrombuf_contig;
sc->sc_zerobuf = zerobuf_contig;
sc->sc_copytodesc = am7990_copytobuf_contig;
sc->sc_copyfromdesc = am7990_copyfrombuf_contig;
sc->sc_copytobuf = am7990_copytobuf_contig;
sc->sc_copyfrombuf = am7990_copyfrombuf_contig;
sc->sc_zerobuf = am7990_zerobuf_contig;
sc->sc_cookie = d->ta_cookie;
/*
@ -270,11 +270,11 @@ le_tc_attach(parent, self, aux)
/*XXX*/ sc->sc_mem = (void *)TC_PHYS_TO_UNCACHED(0x19000000);
/*XXX*/ cp = (u_char *)(TC_PHYS_TO_UNCACHED(KN01_SYS_CLOCK) + 1);
sc->sc_copytodesc = copytobuf_gap2;
sc->sc_copyfromdesc = copyfrombuf_gap2;
sc->sc_copytobuf = copytobuf_gap2;
sc->sc_copyfrombuf = copyfrombuf_gap2;
sc->sc_zerobuf = zerobuf_gap2;
sc->sc_copytodesc = am7990_copytobuf_gap2;
sc->sc_copyfromdesc = am7990_copyfrombuf_gap2;
sc->sc_copytobuf = am7990_copytobuf_gap2;
sc->sc_copyfrombuf = am7990_copyfrombuf_gap2;
sc->sc_zerobuf = am7990_zerobuf_gap2;
sc->sc_cookie = (void *)ca->ca_slotpri; /*XXX more thought */
ie_fn = (ie_fn_t) kn01_intr_establish;