diff options
author | scottl <scottl@FreeBSD.org> | 2003-05-27 04:59:59 +0000 |
---|---|---|
committer | scottl <scottl@FreeBSD.org> | 2003-05-27 04:59:59 +0000 |
commit | f26aca7b718b2d8b17889ad8eb0c65281493cc06 (patch) | |
tree | aaea1de6e07eae55f5e31e6ae4f5d42cc5ae59a1 /sys/sparc64 | |
parent | 5fd5bdfb84667ef474531ecc19cceafdf2ef5e36 (diff) | |
download | FreeBSD-src-f26aca7b718b2d8b17889ad8eb0c65281493cc06.zip FreeBSD-src-f26aca7b718b2d8b17889ad8eb0c65281493cc06.tar.gz |
Bring back bus_dmasync_op_t. It is now a typedef to an int, though the
BUS_DMASYNC_ definitions remain as before. The does not change the ABI,
and reverts the API to be a bit more compatible and flexible. This has
survived a full 'make universe'.
Approved by: re (bmah)
Diffstat (limited to 'sys/sparc64')
-rw-r--r-- | sys/sparc64/include/bus.h | 6 | ||||
-rw-r--r-- | sys/sparc64/pci/psycho.c | 5 | ||||
-rw-r--r-- | sys/sparc64/sbus/sbus.c | 5 | ||||
-rw-r--r-- | sys/sparc64/sparc64/bus_machdep.c | 5 | ||||
-rw-r--r-- | sys/sparc64/sparc64/iommu.c | 2 |
5 files changed, 14 insertions, 9 deletions
diff --git a/sys/sparc64/include/bus.h b/sys/sparc64/include/bus.h index c69c270..39a048c 100644 --- a/sys/sparc64/include/bus.h +++ b/sys/sparc64/include/bus.h @@ -905,6 +905,7 @@ memsetw(void *d, int val, size_t size) struct mbuf; struct uio; +typedef int bus_dmasync_op_t; #define BUS_DMASYNC_PREREAD 1 #define BUS_DMASYNC_POSTREAD 2 #define BUS_DMASYNC_PREWRITE 4 @@ -975,7 +976,7 @@ struct bus_dma_tag { bus_dmamap_t, struct uio *, bus_dmamap_callback2_t *, void *, int); void (*dt_dmamap_unload)(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t); void (*dt_dmamap_sync)(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, - int); + bus_dmasync_op_t); /* * DMA memory utility functions. @@ -1080,7 +1081,8 @@ sparc64_dmamap_unload(bus_dma_tag_t pt, bus_dma_tag_t dt, bus_dmamap_t p) sparc64_dmamap_unload((t), (t), (p)) static __inline void -sparc64_dmamap_sync(bus_dma_tag_t pt, bus_dma_tag_t dt, bus_dmamap_t m, int op) +sparc64_dmamap_sync(bus_dma_tag_t pt, bus_dma_tag_t dt, bus_dmamap_t m, + bus_dmasync_op_t op) { bus_dma_tag_t lt; diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c index 5de26ba..4cd7fef 100644 --- a/sys/sparc64/pci/psycho.c +++ b/sys/sparc64/pci/psycho.c @@ -111,7 +111,8 @@ static int psycho_dmamap_load_mbuf(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, static int psycho_dmamap_load_uio(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, struct uio *, bus_dmamap_callback2_t *, void *, int); static void psycho_dmamap_unload(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t); -static void psycho_dmamap_sync(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, int); +static void psycho_dmamap_sync(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, + bus_dmasync_op_t); static int psycho_dmamem_alloc(bus_dma_tag_t, bus_dma_tag_t, void **, int, bus_dmamap_t *); static void psycho_dmamem_free(bus_dma_tag_t, bus_dma_tag_t, void *, @@ -1402,7 +1403,7 @@ psycho_dmamap_unload(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map) static void psycho_dmamap_sync(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map, - int op) + bus_dmasync_op_t op) { struct psycho_softc *sc; diff --git a/sys/sparc64/sbus/sbus.c b/sys/sparc64/sbus/sbus.c index 8debb26..dfd8708 100644 --- a/sys/sparc64/sbus/sbus.c +++ b/sys/sparc64/sbus/sbus.c @@ -242,7 +242,8 @@ static int sbus_dmamap_load_mbuf(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, static int sbus_dmamap_load_uio(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, struct uio *, bus_dmamap_callback2_t *, void *, int); static void sbus_dmamap_unload(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t); -static void sbus_dmamap_sync(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, int); +static void sbus_dmamap_sync(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, + bus_dmasync_op_t); static int sbus_dmamem_alloc(bus_dma_tag_t, bus_dma_tag_t, void **, int, bus_dmamap_t *); static void sbus_dmamem_free(bus_dma_tag_t, bus_dma_tag_t, void *, @@ -979,7 +980,7 @@ sbus_dmamap_unload(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map) static void sbus_dmamap_sync(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map, - int op) + bus_dmasync_op_t op) { struct sbus_softc *sc = (struct sbus_softc *)pdmat->dt_cookie; diff --git a/sys/sparc64/sparc64/bus_machdep.c b/sys/sparc64/sparc64/bus_machdep.c index e4eea40..d8e46ed 100644 --- a/sys/sparc64/sparc64/bus_machdep.c +++ b/sys/sparc64/sparc64/bus_machdep.c @@ -169,7 +169,8 @@ static int nexus_dmamap_load_mbuf(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, static int nexus_dmamap_load_uio(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, struct uio *, bus_dmamap_callback2_t *, void *, int); static void nexus_dmamap_unload(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t); -static void nexus_dmamap_sync(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, int); +static void nexus_dmamap_sync(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, + bus_dmasync_op_t); static int nexus_dmamem_alloc(bus_dma_tag_t, bus_dma_tag_t, void **, int, bus_dmamap_t *); static void nexus_dmamem_free(bus_dma_tag_t, bus_dma_tag_t, void *, @@ -548,7 +549,7 @@ nexus_dmamap_unload(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map) */ static void nexus_dmamap_sync(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map, - int op) + bus_dmasync_op_t op) { /* diff --git a/sys/sparc64/sparc64/iommu.c b/sys/sparc64/sparc64/iommu.c index fc4c0a8..a18a987 100644 --- a/sys/sparc64/sparc64/iommu.c +++ b/sys/sparc64/sparc64/iommu.c @@ -992,7 +992,7 @@ iommu_dvmamap_unload(bus_dma_tag_t pt, bus_dma_tag_t dt, struct iommu_state *is, void iommu_dvmamap_sync(bus_dma_tag_t pt, bus_dma_tag_t dt, struct iommu_state *is, - bus_dmamap_t map, int op) + bus_dmamap_t map, bus_dmasync_op_t op) { struct bus_dmamap_res *r; vm_offset_t va; |