summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2007-09-15 08:55:29 +0000
committerjsg <jsg@openbsd.org>2007-09-15 08:55:29 +0000
commit7f2ae1a912b272e04493aa791dd4baa646f18c65 (patch)
tree3338299f74061180253b5499c12933cd8be67c9b
parentProperly fill in some of the pci information the driver uses internally. (diff)
downloadwireguard-openbsd-7f2ae1a912b272e04493aa791dd4baa646f18c65.tar.xz
wireguard-openbsd-7f2ae1a912b272e04493aa791dd4baa646f18c65.zip
convert bus_dmamap_load() calls
-rw-r--r--sys/dev/ic/bwi.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index 50ac333812f..15103430f36 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bwi.c,v 1.16 2007/09/15 07:20:51 jsg Exp $ */
+/* $OpenBSD: bwi.c,v 1.17 2007/09/15 08:55:29 jsg Exp $ */
/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
@@ -6933,8 +6933,8 @@ bwi_dma_ring_alloc(struct bwi_softc *sc, bus_dma_tag_t dtag,
return (error);
}
- error = bus_dmamap_load(dtag, rd->rdata_dmap, rd->rdata_desc, size,
- bwi_dma_ring_addr, &rd->rdata_paddr, BUS_DMA_WAITOK);
+ error = bus_dmamap_load(sc->sc_dmat, rd->rdata_dmap, rd->rdata_desc,
+ size, NULL, BUS_DMA_WAITOK);
if (error) {
DPRINTF(1, "%s: can't load DMA mem\n", sc->sc_dev.dv_xname);
bus_dmamem_free(dtag, rd->rdata_desc, rd->rdata_dmap);
@@ -6989,10 +6989,8 @@ bwi_dma_txstats_alloc(struct bwi_softc *sc, uint32_t ctrl_base,
return (error);
}
- error = bus_dmamap_load(st->stats_ring_dtag, st->stats_ring_dmap,
- st->stats_ring, dma_size,
- bwi_dma_ring_addr, &st->stats_ring_paddr,
- BUS_DMA_WAITOK);
+ error = bus_dmamap_load(sc->sc_dmat, st->stats_ring_dmap,
+ st->stats_ring, dma_size, NULL, BUS_DMA_WAITOK);
if (error) {
DPRINTF(1, "%s: can't load txstats ring DMA mem\n",
sc->sc_dev.dv_xname);
@@ -7031,9 +7029,8 @@ bwi_dma_txstats_alloc(struct bwi_softc *sc, uint32_t ctrl_base,
return (error);
}
- error = bus_dmamap_load(st->stats_dtag, st->stats_dmap, st->stats,
- dma_size, bwi_dma_ring_addr, &st->stats_paddr,
- BUS_DMA_WAITOK);
+ error = bus_dmamap_load(sc->sc_dmat, st->stats_dmap, st->stats,
+ dma_size, NULL, BUS_DMA_WAITOK);
if (error) {
DRPINTF(1, "%s: can't load txstats DMA mem\n",
sc->sc_dev.dv_xname);