diff --git a/sys/arch/arc/jazz/dma.c b/sys/arch/arc/jazz/dma.c index cba21f185fdc..85e9b434cb8d 100644 --- a/sys/arch/arc/jazz/dma.c +++ b/sys/arch/arc/jazz/dma.c @@ -1,4 +1,4 @@ -/* $NetBSD: dma.c,v 1.8 2001/07/24 16:26:53 tsutsui Exp $ */ +/* $NetBSD: dma.c,v 1.9 2003/02/10 11:43:28 tsutsui Exp $ */ /* $OpenBSD: dma.c,v 1.5 1998/03/01 16:49:57 niklas Exp $ */ /* @@ -71,15 +71,6 @@ void picaDmaReset __P((dma_softc_t *sc)); void picaDmaEnd __P((dma_softc_t *sc)); void picaDmaNull __P((dma_softc_t *sc)); -/* - * Initialize the dma mapping register area and pool. - */ -void -picaDmaInit() -{ - jazz_dmatlb_init(&jazzio_bus, jazzio_conf->jc_dmatlbreg); -} - /* * Allocate an array of 'size' dma pte entrys. * Return address to first pte. diff --git a/sys/arch/arc/jazz/dma.h b/sys/arch/arc/jazz/dma.h index 5e2267a2a604..7a4f82e1fd1e 100644 --- a/sys/arch/arc/jazz/dma.h +++ b/sys/arch/arc/jazz/dma.h @@ -1,4 +1,4 @@ -/* $NetBSD: dma.h,v 1.2 2001/07/24 16:26:53 tsutsui Exp $ */ +/* $NetBSD: dma.h,v 1.3 2003/02/10 11:43:29 tsutsui Exp $ */ /* $OpenBSD: dma.h,v 1.3 1997/04/19 17:19:51 pefo Exp $ */ /* @@ -106,7 +106,6 @@ typedef struct dma_softc { #define DMA_DRAIN(r) #define DMA_END(r) ((r->end)(r)) -void picaDmaInit __P((void)); void picaDmaTLBAlloc __P((dma_softc_t *)); void picaDmaTLBFree __P((dma_softc_t *)); void picaDmaMap __P((struct dma_softc *, char *, size_t, int)); diff --git a/sys/arch/arc/jazz/jazzio.c b/sys/arch/arc/jazz/jazzio.c index 759a8acc32b2..d0772e60e539 100644 --- a/sys/arch/arc/jazz/jazzio.c +++ b/sys/arch/arc/jazz/jazzio.c @@ -1,4 +1,4 @@ -/* $NetBSD: jazzio.c,v 1.8 2003/01/01 00:32:05 thorpej Exp $ */ +/* $NetBSD: jazzio.c,v 1.9 2003/02/10 11:43:29 tsutsui Exp $ */ /* $OpenBSD: picabus.c,v 1.11 1999/01/11 05:11:10 millert Exp $ */ /* NetBSD: tc.c,v 1.2 1995/03/08 00:39:05 cgd Exp */ @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -145,8 +146,8 @@ jazzioattach(parent, self, aux) sc->sc_bus.ab_dv = (struct device *)sc; - /* Initialize PICA Dma */ - picaDmaInit(); + /* Initialize jazzio dma mapping register area and pool */ + jazz_dmatlb_init(&jazzio_bus, jazzio_conf->jc_dmatlbreg); /* Create bus_dma_tag */ jazz_bus_dma_tag_init(&sc->sc_dmat);