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

Use sc_hwreset() hook to reset ledma (if applicable).

This commit is contained in:
pk 1997-04-04 20:29:23 +00:00
parent 470e2a9983
commit d1603d004b
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: if_le.c,v 1.46 1997/03/23 22:54:27 pk Exp $ */
/* $NetBSD: if_le.c,v 1.47 1997/04/04 20:29:27 pk Exp $ */
/*-
* Copyright (c) 1997 Jason R. Thorpe. All rights reserved.
@ -123,6 +123,7 @@ struct cfattach le_ca = {
hide void lewrcsr __P((struct am7990_softc *, u_int16_t, u_int16_t));
hide u_int16_t lerdcsr __P((struct am7990_softc *, u_int16_t));
hide void lehwreset __P((struct am7990_softc *));
hide void lehwinit __P((struct am7990_softc *));
hide void lenocarrier __P((struct am7990_softc *));
@ -234,6 +235,24 @@ lemediastatus(sc, ifmr)
}
#endif /* SUN4M */
hide void
lehwreset(sc)
struct am7990_softc *sc;
{
#if defined(SUN4M)
struct le_softc *lesc = (struct le_softc *)sc;
/*
* Reset DMA channel.
*/
if (CPU_ISSUN4M && lesc->sc_dma) {
DMA_RESET(lesc->sc_dma);
lesc->sc_dma->sc_regs->en_bar = lesc->sc_laddr & 0xff000000;
DMA_ENINTR(lesc->sc_dma);
}
#endif
}
hide void
lehwinit(sc)
struct am7990_softc *sc;
@ -391,8 +410,7 @@ leattach(parent, self, aux)
if (dmachild) {
lesc->sc_dma = (struct dma_softc *)parent;
lesc->sc_dma->sc_le = lesc;
DMA_RESET(lesc->sc_dma);
lesc->sc_dma->sc_regs->en_bar = laddr & 0xff000000;
lesc->sc_laddr = laddr;
}
#endif
}
@ -438,6 +456,7 @@ leattach(parent, self, aux)
sc->sc_wrcsr = lewrcsr;
sc->sc_hwinit = lehwinit;
sc->sc_nocarrier = lenocarrier;
sc->sc_hwreset = lehwreset;
#if defined(SUN4M)
if (CPU_ISSUN4M) {
@ -460,7 +479,5 @@ leattach(parent, self, aux)
intr_establish(pri, &lesc->sc_ih);
/* now initialize DMA */
if (lesc->sc_dma) {
DMA_ENINTR(lesc->sc_dma);
}
lehwreset(sc);
}

3
sys/arch/sparc/dev/if_levar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_levar.h,v 1.6 1997/03/15 18:10:39 is Exp $ */
/* $NetBSD: if_levar.h,v 1.7 1997/04/04 20:29:23 pk Exp $ */
/*-
* Copyright (c) 1995 Charles M. Hannum. All rights reserved.
@ -53,4 +53,5 @@ struct le_softc {
struct intrhand sc_ih; /* interrupt vectoring */
struct lereg1 *sc_r1; /* LANCE registers */
struct dma_softc *sc_dma; /* pointer to my dma */
u_long sc_laddr; /* LANCE DMA address */
};