diff options
Diffstat (limited to 'sys/arch/alpha/tc/tcds_dma.c')
| -rw-r--r-- | sys/arch/alpha/tc/tcds_dma.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/sys/arch/alpha/tc/tcds_dma.c b/sys/arch/alpha/tc/tcds_dma.c index b7173fdc931..00e9a22db79 100644 --- a/sys/arch/alpha/tc/tcds_dma.c +++ b/sys/arch/alpha/tc/tcds_dma.c @@ -1,5 +1,5 @@ -/* $OpenBSD: tcds_dma.c,v 1.4 1996/10/30 22:41:28 niklas Exp $ */ -/* $NetBSD: tcds_dma.c,v 1.13 1996/10/13 03:00:43 christos Exp $ */ +/* $OpenBSD: tcds_dma.c,v 1.5 1997/01/24 19:58:23 niklas Exp $ */ +/* $NetBSD: tcds_dma.c,v 1.15 1996/12/04 22:35:08 mycroft Exp $ */ /* * Copyright (c) 1994 Peter Galbavy. All rights reserved. @@ -67,10 +67,7 @@ tcds_dma_isintr(sc) { int x; - x = tcds_scsi_isintr(sc, 0); - - /* Clear the TCDS interrupt bit. */ - (void)tcds_scsi_isintr(sc, 1); + x = tcds_scsi_isintr(sc, 1); /* XXX */ return x; @@ -116,7 +113,6 @@ tcds_dma_intr(sc) if (!sc->sc_iswrite && (resid = (ESP_READ_REG(sc->sc_esp, ESP_FFLAG) & ESPFIFO_FF)) != 0) { - printf("empty FIFO of %d ", resid); ESPCMD(sc->sc_esp, ESPCMD_FLUSH); DELAY(1); } @@ -134,7 +130,7 @@ tcds_dma_intr(sc) trans = sc->sc_dmasize - resid; if (trans < 0) { /* transferred < 0 ? */ - printf("tcds_dma %d: xfer (%d) > req (%d)\n", + printf("tcds_dma %d: xfer (%d) > req (%ld)\n", sc->sc_slot, trans, sc->sc_dmasize); trans = sc->sc_dmasize; } @@ -162,7 +158,7 @@ tcds_dma_intr(sc) if (dud & TCDS_DUD0_VALID11) dudmask |= TCDS_DUD_BYTE11; #endif - ESP_DMA(("dud0 at 0x%lx dudmask 0x%x\n", + ESP_DMA(("dud0 at 0x%p dudmask 0x%x\n", addr, dudmask)); addr = (u_int32_t *)ALPHA_PHYS_TO_K0SEG((vm_offset_t)addr); *addr = (*addr & ~dudmask) | (dud & dudmask); @@ -183,7 +179,7 @@ tcds_dma_intr(sc) if (dud & TCDS_DUD1_VALID11) panic("tcds_dma: dud1 byte 3 valid"); #endif - ESP_DMA(("dud1 at 0x%lx dudmask 0x%x\n", + ESP_DMA(("dud1 at 0x%p dudmask 0x%x\n", addr, dudmask)); addr = (u_int32_t *)ALPHA_PHYS_TO_K0SEG((vm_offset_t)addr); *addr = (*addr & ~dudmask) | (dud & dudmask); @@ -225,7 +221,7 @@ tcds_dma_setup(sc, addr, len, datain, dmasize) sc->sc_dmalen = len; sc->sc_iswrite = datain; - ESP_DMA(("tcds_dma %d: start %d@0x%lx,%d\n", sc->sc_slot, *sc->sc_dmalen, *sc->sc_dmaaddr, sc->sc_iswrite)); + ESP_DMA(("tcds_dma %d: start %ld@%p,%d\n", sc->sc_slot, *sc->sc_dmalen, *sc->sc_dmaaddr, sc->sc_iswrite)); /* * the rules say we cannot transfer more than the limit @@ -235,7 +231,7 @@ tcds_dma_setup(sc, addr, len, datain, dmasize) size = min(*dmasize, DMAMAX((size_t) *sc->sc_dmaaddr)); *dmasize = sc->sc_dmasize = size; - ESP_DMA(("dma_start: dmasize = %d\n", sc->sc_dmasize)); + ESP_DMA(("dma_start: dmasize = %ld\n", sc->sc_dmasize)); /* Load address, set/clear unaligned transfer and read/write bits. */ /* XXX PICK AN ADDRESS TYPE, AND STICK TO IT! */ |