diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2001-05-16 14:34:31 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2001-05-16 14:34:31 +0000 |
| commit | a298e9ff9d4b9418b1b5b64c70a04ed9774e676d (patch) | |
| tree | 0dc201bb44d7401ca451f5b19214dc3e4e12cc31 /sys | |
| parent | d0f0a36122c4edd58927c3ad15c6437dd649a5c8 (diff) | |
Use dm_mapsize instead of homegrown one; jason@ ok.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_txp.c | 7 | ||||
| -rw-r--r-- | sys/dev/pci/if_txpreg.h | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c index 36dc9576613..c941191dba5 100644 --- a/sys/dev/pci/if_txp.c +++ b/sys/dev/pci/if_txp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_txp.c,v 1.31 2001/05/16 02:47:49 jason Exp $ */ +/* $OpenBSD: if_txp.c,v 1.32 2001/05/16 14:34:29 fgsch Exp $ */ /* * Copyright (c) 2001 @@ -1080,7 +1080,6 @@ txp_dma_malloc(sc, size, dma, mapflags) goto fail_3; dma->dma_paddr = dma->dma_map->dm_segs[0].ds_addr; - dma->dma_size = size; return (0); fail_3: @@ -1099,9 +1098,9 @@ txp_dma_free(sc, dma) struct txp_dma_alloc *dma; { bus_dmamap_unload(sc->sc_dmat, dma->dma_map); - bus_dmamap_destroy(sc->sc_dmat, dma->dma_map); - bus_dmamem_unmap(sc->sc_dmat, dma->dma_vaddr, dma->dma_size); + bus_dmamem_unmap(sc->sc_dmat, dma->dma_vaddr, dma->dma_map->dm_mapsize); bus_dmamem_free(sc->sc_dmat, &dma->dma_seg, dma->dma_nseg); + bus_dmamap_destroy(sc->sc_dmat, dma->dma_map); } int diff --git a/sys/dev/pci/if_txpreg.h b/sys/dev/pci/if_txpreg.h index 99c6e61b856..f998c901abb 100644 --- a/sys/dev/pci/if_txpreg.h +++ b/sys/dev/pci/if_txpreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_txpreg.h,v 1.24 2001/05/15 14:57:28 jason Exp $ */ +/* $OpenBSD: if_txpreg.h,v 1.25 2001/05/16 14:34:30 fgsch Exp $ */ /* * Copyright (c) 2001 Aaron Campbell <aaron@monkey.org>. @@ -530,7 +530,6 @@ struct txp_dma_alloc { bus_dmamap_t dma_map; bus_dma_segment_t dma_seg; int dma_nseg; - bus_size_t dma_size; }; struct txp_cmd_ring { |