diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2001-05-03 05:22:52 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2001-05-03 05:22:52 +0000 |
| commit | b6a4c40414b9e09c5c9ab776b2b0aa34e9af38bd (patch) | |
| tree | 589bad6f92b6c1964da8ef3cce50bf24276a9767 /sys | |
| parent | 959d7223f8e0deca2b069ee1472c3ef8d1f65814 (diff) | |
grr... part of the bus_dma change depended on local stuff: revert that part
for now until folks comment on the dependent patch; pointed out by fgsch.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_txp.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_txpreg.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c index fa4e5670ee2..5bec3cdb15e 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.22 2001/05/02 15:00:32 jason Exp $ */ +/* $OpenBSD: if_txp.c,v 1.23 2001/05/03 05:22:51 jason Exp $ */ /* * Copyright (c) 2001 @@ -988,7 +988,7 @@ txp_dma_malloc(sc, size, dma, mapflags) } dma->dma_paddr = dma->dma_map->dm_segs[0].ds_addr; - + dma->dma_size = size; return (0); } @@ -997,7 +997,7 @@ txp_dma_free(sc, dma) struct txp_softc *sc; struct txp_dma_alloc *dma; { - bus_dmamem_unmap(sc->sc_dmat, dma->dma_vaddr, dma->dma_map->dm_mapsize); + bus_dmamem_unmap(sc->sc_dmat, dma->dma_vaddr, dma->dma_size); bus_dmamem_free(sc->sc_dmat, dma->dma_map->dm_segs, dma->dma_map->dm_nsegs); bus_dmamap_unload(sc->sc_dmat, dma->dma_map); bus_dmamap_destroy(sc->sc_dmat, dma->dma_map); diff --git a/sys/dev/pci/if_txpreg.h b/sys/dev/pci/if_txpreg.h index c8ede02aff3..e20eb569c93 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.19 2001/05/02 15:00:34 jason Exp $ */ +/* $OpenBSD: if_txpreg.h,v 1.20 2001/05/03 05:22:51 jason Exp $ */ /* * Copyright (c) 2001 Aaron Campbell <aaron@monkey.org>. @@ -509,6 +509,7 @@ struct txp_dma_alloc { u_int64_t dma_paddr; caddr_t dma_vaddr; bus_dmamap_t dma_map; + bus_size_t dma_size; /* XXX should use dm_mapsize */ }; struct txp_cmd_ring { |