CVS commit: src/sys/dev/ic

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Sun May 24 17:08:50 UTC 2015

Modified Files:
        src/sys/dev/ic: arn5008.c arn9003.c

Log Message:
Use bus_dmamap_load instead of bus_dmamap_load_raw


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/arn5008.c src/sys/dev/ic/arn9003.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/ic/arn5008.c
diff -u src/sys/dev/ic/arn5008.c:1.6 src/sys/dev/ic/arn5008.c:1.7
--- src/sys/dev/ic/arn5008.c:1.6	Sun Feb 23 15:29:11 2014
+++ src/sys/dev/ic/arn5008.c	Sun May 24 17:08:50 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: arn5008.c,v 1.6 2014/02/23 15:29:11 christos Exp $	*/
+/*	$NetBSD: arn5008.c,v 1.7 2015/05/24 17:08:50 matt Exp $	*/
 /*	$OpenBSD: ar5008.c,v 1.21 2012/08/25 12:14:31 kettenis Exp $	*/
 
 /*-
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arn5008.c,v 1.6 2014/02/23 15:29:11 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arn5008.c,v 1.7 2015/05/24 17:08:50 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/sockio.h>
@@ -518,8 +518,8 @@ ar5008_tx_alloc(struct athn_softc *sc)
 	if (error != 0)
 		goto fail;
 
-	error = bus_dmamap_load_raw(sc->sc_dmat, sc->sc_map, &sc->sc_seg, 1, size,
-	    BUS_DMA_NOWAIT);
+	error = bus_dmamap_load(sc->sc_dmat, sc->sc_map, sc->sc_descs,
+	    size, NULL, BUS_DMA_NOWAIT);
 	if (error != 0)
 		goto fail;
 
@@ -606,8 +606,8 @@ ar5008_rx_alloc(struct athn_softc *sc)
 	if (error != 0)
 		goto fail;
 
-	error = bus_dmamap_load_raw(sc->sc_dmat, rxq->map, &rxq->seg, 1,
-	    size, BUS_DMA_NOWAIT);
+	error = bus_dmamap_load(sc->sc_dmat, rxq->map, &rxq->descs,
+	    size, NULL, BUS_DMA_NOWAIT);
 	if (error != 0)
 		goto fail;
 
Index: src/sys/dev/ic/arn9003.c
diff -u src/sys/dev/ic/arn9003.c:1.6 src/sys/dev/ic/arn9003.c:1.7
--- src/sys/dev/ic/arn9003.c:1.6	Sun Feb 23 15:29:12 2014
+++ src/sys/dev/ic/arn9003.c	Sun May 24 17:08:50 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: arn9003.c,v 1.6 2014/02/23 15:29:12 christos Exp $	*/
+/*	$NetBSD: arn9003.c,v 1.7 2015/05/24 17:08:50 matt Exp $	*/
 /*	$OpenBSD: ar9003.c,v 1.25 2012/10/20 09:53:32 stsp Exp $	*/
 
 /*-
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arn9003.c,v 1.6 2014/02/23 15:29:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arn9003.c,v 1.7 2015/05/24 17:08:50 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/sockio.h>
@@ -655,8 +655,8 @@ ar9003_tx_alloc(struct athn_softc *sc)
 	if (error != 0)
 		goto fail;
 
-	error = bus_dmamap_load_raw(sc->sc_dmat, sc->sc_txsmap, &sc->sc_txsseg,
-	    1, size, BUS_DMA_NOWAIT | BUS_DMA_READ);
+	error = bus_dmamap_load(sc->sc_dmat, sc->sc_txsmap, sc->sc_txsring,
+	     size, NULL, BUS_DMA_NOWAIT | BUS_DMA_READ);
 	if (error != 0)
 		goto fail;
 
@@ -681,8 +681,8 @@ ar9003_tx_alloc(struct athn_softc *sc)
 	if (error != 0)
 		goto fail;
 
-	error = bus_dmamap_load_raw(sc->sc_dmat, sc->sc_map, &sc->sc_seg, 1, size,
-	    BUS_DMA_NOWAIT | BUS_DMA_WRITE);
+	error = bus_dmamap_load(sc->sc_dmat, sc->sc_map, sc->sc_descs, size,
+	    NULL, BUS_DMA_NOWAIT | BUS_DMA_WRITE);
 	if (error != 0)
 		goto fail;