Yup, I managed to fat finger all three of these while doing bus_dmamap_sync()

conversion (luckily only sparc64 uses the 5 arg form so far =)

3 files changed, 10 insertions, 10 deletions

diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c
index 45306e85e0d..62288a04e62 100644
--- a/sys/dev/pci/isp_pci.c
+++ b/sys/dev/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isp_pci.c,v 1.21 2001/08/25 14:52:57 jason Exp $	*/
+/*	$OpenBSD: isp_pci.c,v 1.22 2001/08/26 03:32:22 jason Exp $	*/
 /*
  * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
  *
@@ -922,7 +922,7 @@ dmasync:
 mbxsync:
 	ISP_SWIZZLE_REQUEST(isp, rq);
 	isp_bus_dmamap_sync(pci->pci_dmat, pci->pci_rquest_dmap, 0,
-	    pci->pci_request_dmap->dm_mapsize, BUS_DMASYNC_PREWRITE);
+	    pci->pci_rquest_dmap->dm_mapsize, BUS_DMASYNC_PREWRITE);
 	return (CMD_QUEUED);
 }
 
@@ -934,7 +934,7 @@ isp_pci_intr(void *arg)
 	struct isp_pcisoftc *p = (struct isp_pcisoftc *)isp;
 
 	isp_bus_dmamap_sync(p->pci_dmat, p->pci_result_dmap, 0,
-	    pcs->pci_result_dmap->dm_mapsize, BUS_DMASYNC_POSTREAD);
+	    p->pci_result_dmap->dm_mapsize, BUS_DMASYNC_POSTREAD);
 
 	isp->isp_osinfo.onintstack = 1;
 	r = isp_intr(arg);
diff --git a/sys/dev/pci/pcscp.c b/sys/dev/pci/pcscp.c
index a2b01b0462d..dd540935cd3 100644
--- a/sys/dev/pci/pcscp.c
+++ b/sys/dev/pci/pcscp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcscp.c,v 1.5 2001/08/25 14:52:57 jason Exp $	*/
+/*	$OpenBSD: pcscp.c,v 1.6 2001/08/26 03:32:22 jason Exp $	*/
 /*	$NetBSD: pcscp.c,v 1.11 2000/11/14 18:42:58 thorpej Exp $	*/
 
 /*-
@@ -494,7 +494,7 @@ pcscp_dma_intr(sc)
 
 	WRITE_DMAREG(esc, DMA_CMD, DMACMD_IDLE | (datain ? DMACMD_DIR : 0));
 
-	pcscp_bus_dmamap_sync(esc->sc_dmat, dmap, 0, dmap_>dm_mapsize,
+	pcscp_bus_dmamap_sync(esc->sc_dmat, dmap, 0, dmap->dm_mapsize,
 	    datain ? BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE);
 	bus_dmamap_unload(esc->sc_dmat, dmap);
 
diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c
index 2c92b9625ac..467482c9634 100644
--- a/sys/dev/pci/yds.c
+++ b/sys/dev/pci/yds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yds.c,v 1.5 2001/08/25 14:52:57 jason Exp $	*/
+/*	$OpenBSD: yds.c,v 1.6 2001/08/26 03:32:22 jason Exp $	*/
 /*	$NetBSD: yds.c,v 1.5 2001/05/21 23:55:04 minoura Exp $	*/
 
 /*
@@ -1005,7 +1005,7 @@ yds_intr(p)
 
 			/* Sync play slot control data */
 			yds_bus_dmamap_sync(sc->sc_dmatag, sc->sc_ctrldata.map,
-			    sc->sc_pbankoff,
+			    sc->pbankoff,
 			    sizeof(struct play_slot_ctrl_bank) * (*sc->ptbl)*
 			    N_PLAY_SLOT_CTRL_BANK,
 			    BUS_DMASYNC_POSTWRITE|BUS_DMASYNC_POSTREAD);
@@ -1491,7 +1491,7 @@ yds_trigger_output(addr, start, end, blksize, intr, arg, param)
 	/* Sync play slot control data for both directions */
 	yds_bus_dmamap_sync(sc->sc_dmatag, sc->sc_ctrldata.map,
 	    sc->ptbloff, sizeof(struct play_slot_ctrl_bank) * channels *
-	    NPLAY_SLOT_CTRL_BANK, BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD);
+	    N_PLAY_SLOT_CTRL_BANK, BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD);
 	/* Sync ring buffer */
 	yds_bus_dmamap_sync(sc->sc_dmatag, p->map, 0, blksize,
 	    BUS_DMASYNC_PREWRITE);
@@ -1589,7 +1589,7 @@ yds_trigger_input(addr, start, end, blksize, intr, arg, param)
 #endif
 	/* Now the rec slot for the next frame is set up!! */
 	/* Sync record slot control data */
-	yds_bus_dmamap_sync(sc->sc_dmatag, sc->sc_ctrldata.map, sc->sc_rbankoff,
+	yds_bus_dmamap_sync(sc->sc_dmatag, sc->sc_ctrldata.map, sc->rbankoff,
 	    sizeof(struct rec_slot_ctrl_bank) * N_REC_SLOT_CTRL *
 	    N_REC_SLOT_CTRL_BANK, BUS_DMASYNC_PREWRITE|BUS_DMASYNC_PREREAD);
 	/* Sync ring buffer */
@@ -1663,7 +1663,7 @@ yds_halt_input(addr)
 		sc->sc_rec.intr = 0;
 		/* Sync rec slot control data */
 		yds_bus_dmamap_sync(sc->sc_dmatag, sc->sc_ctrldata.map,
-		    sc->sc_rbankoff, sizeof(struct rec_slot_ctrl_bank)*
+		    sc->rbankoff, sizeof(struct rec_slot_ctrl_bank)*
 		    N_REC_SLOT_CTRL*N_REC_SLOT_CTRL_BANK,
 		    BUS_DMASYNC_POSTWRITE|BUS_DMASYNC_POSTREAD);
 		/* Sync ring buffer */