diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2001-05-09 02:25:10 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2001-05-09 02:25:10 +0000 |
| commit | db3ddfef927f4a1092cea3ad37f1673ec2689964 (patch) | |
| tree | d611c03c14efb2753acad4fb8967e7219c84e8a9 /sys | |
| parent | a51d1143e2e6d1f92adc7d67d63dacf4794fcca7 (diff) | |
revert reverted patch now that bus_dma has been updated on i386
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, 4 insertions, 5 deletions
diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c index 134b930918d..82ba5503897 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.25 2001/05/08 05:22:01 jason Exp $ */ +/* $OpenBSD: if_txp.c,v 1.26 2001/05/09 02:25:08 jason Exp $ */ /* * Copyright (c) 2001 @@ -1004,7 +1004,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); } @@ -1013,7 +1013,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_size); + bus_dmamem_unmap(sc->sc_dmat, dma->dma_vaddr, dma->dma_map->dm_mapsize); 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 a4abf44b03a..c5c7391959e 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.21 2001/05/08 03:52:43 jason Exp $ */ +/* $OpenBSD: if_txpreg.h,v 1.22 2001/05/09 02:25:09 jason Exp $ */ /* * Copyright (c) 2001 Aaron Campbell <aaron@monkey.org>. @@ -528,7 +528,6 @@ 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 { |