summaryrefslogtreecommitdiff
path: root/sys/arch/arc/dev/dma.c
diff options
context:
space:
mode:
authorPer Fogelstrom <pefo@cvs.openbsd.org>1997-04-19 17:20:05 +0000
committerPer Fogelstrom <pefo@cvs.openbsd.org>1997-04-19 17:20:05 +0000
commitf043b47880e1d055066f5786d164ca1bab944a4a (patch)
tree5cdcec964c71023bb555152c8e43c234a7efd443 /sys/arch/arc/dev/dma.c
parenta69a5ac6994ab8ae2fb41e30901abd9f7f51a9ac (diff)
-Wall cleanup.
Change to new MI assym.h file generation. (genassym.cf)
Diffstat (limited to 'sys/arch/arc/dev/dma.c')
-rw-r--r--sys/arch/arc/dev/dma.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/sys/arch/arc/dev/dma.c b/sys/arch/arc/dev/dma.c
index 085ec063793..bb6170dd537 100644
--- a/sys/arch/arc/dev/dma.c
+++ b/sys/arch/arc/dev/dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dma.c,v 1.3 1996/08/26 11:11:59 pefo Exp $ */
+/* $OpenBSD: dma.c,v 1.4 1997/04/19 17:19:51 pefo Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: @(#)rz.c 8.1 (Berkeley) 7/29/93
- * $Id: dma.c,v 1.3 1996/08/26 11:11:59 pefo Exp $
+ * $Id: dma.c,v 1.4 1997/04/19 17:19:51 pefo Exp $
*/
/*
@@ -52,9 +52,9 @@
#include <vm/vm_kern.h>
#include <vm/vm_page.h>
+#include <machine/pte.h>
#include <machine/cpu.h>
#include <machine/autoconf.h>
-#include <machine/pte.h>
#include <machine/pio.h>
#include <scsi/scsi_all.h>
@@ -71,6 +71,7 @@ extern vm_map_t phys_map;
dma_pte_t *free_dma_pte; /* Pointer to free dma pte list */
dma_pte_t *first_dma_pte; /* Pointer to first dma pte */
+
/*
* Initialize the dma mapping register area and pool.
*/
@@ -182,6 +183,7 @@ picaDmaTLBFree(dma_softc_t *dma)
* the dma control structure and invalidate dma TLB cache.
*/
+void
picaDmaTLBMap(dma_softc_t *sc)
{
vm_offset_t pa;
@@ -221,7 +223,6 @@ picaDmaStart(sc, addr, size, datain)
size_t size;
int datain;
{
- int mode;
pDmaReg regs = sc->dma_reg;
/* Halt DMA */
@@ -328,8 +329,6 @@ picaDmaEnd(dma_softc_t *sc)
void
picaDmaNull(dma_softc_t *sc)
{
- pDmaReg regs = sc->dma_reg;
-
printf("picaDmaNull called\n");
}
@@ -338,14 +337,15 @@ picaDmaNull(dma_softc_t *sc)
* Called from asc to set up dma
*/
void
-asc_dma_init(dma_softc_t *sc)
+asc_dma_init(sc)
+ dma_softc_t *sc;
{
sc->reset = picaDmaReset;
sc->enintr = picaDmaNull;
sc->start = picaDmaStart;
sc->map = picaDmaMap;
- sc->isintr = (int(*)())picaDmaNull;
- sc->intr = (int(*)())picaDmaNull;
+ sc->isintr = (int(*)(struct dma_softc *))picaDmaNull;
+ sc->intr = (int(*)(struct dma_softc *))picaDmaNull;
sc->end = picaDmaEnd;
sc->dma_reg = (pDmaReg)R4030_SYS_DMA0_REGS;
@@ -364,8 +364,8 @@ fdc_dma_init(dma_softc_t *sc)
sc->enintr = picaDmaNull;
sc->start = picaDmaStart;
sc->map = picaDmaMap;
- sc->isintr = (int(*)())picaDmaNull;
- sc->intr = (int(*)())picaDmaNull;
+ sc->isintr = (int(*)(struct dma_softc *))picaDmaNull;
+ sc->intr = (int(*)(struct dma_softc *))picaDmaNull;
sc->end = picaDmaEnd;
sc->dma_reg = (pDmaReg)R4030_SYS_DMA1_REGS;
@@ -384,9 +384,9 @@ sn_dma_init(dma_softc_t *sc, int pages)
sc->enintr = picaDmaNull;
sc->start = picaDmaFlush;
sc->map = picaDmaMap;
- sc->isintr = (int(*)())picaDmaNull;
- sc->intr = (int(*)())picaDmaNull;
- sc->end = (int(*)())picaDmaNull;
+ sc->isintr = (int(*)(struct dma_softc *))picaDmaNull;
+ sc->intr = (int(*)(struct dma_softc *))picaDmaNull;
+ sc->end = (int(*)(struct dma_softc *))picaDmaNull;
sc->dma_reg = (pDmaReg)NULL;
sc->pte_size = pages;