Fix some more missing dt_ prefixes for dma tag fields.
This commit is contained in:
parent
88b707218e
commit
c07f24ca0c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=110047
@ -1093,9 +1093,9 @@ sparc64_dmamem_alloc_size(bus_dma_tag_t pt, bus_dma_tag_t dt, void **v, int f,
|
|||||||
{
|
{
|
||||||
bus_dma_tag_t lt;
|
bus_dma_tag_t lt;
|
||||||
|
|
||||||
for (lt = pt; lt->dmamem_alloc == NULL; lt = lt->parent)
|
for (lt = pt; lt->dt_dmamem_alloc == NULL; lt = lt->dt_parent)
|
||||||
;
|
;
|
||||||
return ((*lt->dmamem_alloc_size)(lt, dt, v, f, m, s));
|
return ((*lt->dt_dmamem_alloc_size)(lt, dt, v, f, m, s));
|
||||||
}
|
}
|
||||||
#define bus_dmamem_alloc_size(t, v, f, m, s) \
|
#define bus_dmamem_alloc_size(t, v, f, m, s) \
|
||||||
sparc64_dmamem_alloc_size((t), (t), (v), (f), (m), (s))
|
sparc64_dmamem_alloc_size((t), (t), (v), (f), (m), (s))
|
||||||
@ -1119,9 +1119,9 @@ sparc64_dmamem_free_size(bus_dma_tag_t pt, bus_dma_tag_t dt, void *v,
|
|||||||
{
|
{
|
||||||
bus_dma_tag_t lt;
|
bus_dma_tag_t lt;
|
||||||
|
|
||||||
for (lt = pt; lt->dmamem_free == NULL; lt = lt->parent)
|
for (lt = pt; lt->dt_dmamem_free == NULL; lt = lt->dt_parent)
|
||||||
;
|
;
|
||||||
(*lt->dmamem_free_size)(lt, dt, v, m, s);
|
(*lt->dt_dmamem_free_size)(lt, dt, v, m, s);
|
||||||
}
|
}
|
||||||
#define bus_dmamem_free_size(t, v, m, s) \
|
#define bus_dmamem_free_size(t, v, m, s) \
|
||||||
sparc64_dmamem_free_size((t), (t), (v), (m), (s))
|
sparc64_dmamem_free_size((t), (t), (v), (m), (s))
|
||||||
|
@ -1325,7 +1325,7 @@ psycho_dmamem_alloc_size(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr,
|
|||||||
{
|
{
|
||||||
struct psycho_softc *sc;
|
struct psycho_softc *sc;
|
||||||
|
|
||||||
sc = (struct psycho_softc *)pdmat->cookie;
|
sc = (struct psycho_softc *)pdmat->dt_cookie;
|
||||||
return (iommu_dvmamem_alloc_size(pdmat, ddmat, sc->sc_is, vaddr, flags,
|
return (iommu_dvmamem_alloc_size(pdmat, ddmat, sc->sc_is, vaddr, flags,
|
||||||
mapp, size));
|
mapp, size));
|
||||||
}
|
}
|
||||||
@ -1347,7 +1347,7 @@ psycho_dmamem_free_size(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void *vaddr,
|
|||||||
{
|
{
|
||||||
struct psycho_softc *sc;
|
struct psycho_softc *sc;
|
||||||
|
|
||||||
sc = (struct psycho_softc *)pdmat->cookie;
|
sc = (struct psycho_softc *)pdmat->dt_cookie;
|
||||||
iommu_dvmamem_free_size(pdmat, ddmat, sc->sc_is, vaddr, map, size);
|
iommu_dvmamem_free_size(pdmat, ddmat, sc->sc_is, vaddr, map, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -997,7 +997,7 @@ static int
|
|||||||
sbus_dmamem_alloc_size(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr,
|
sbus_dmamem_alloc_size(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr,
|
||||||
int flags, bus_dmamap_t *mapp, bus_size_t size)
|
int flags, bus_dmamap_t *mapp, bus_size_t size)
|
||||||
{
|
{
|
||||||
struct sbus_softc *sc = (struct sbus_softc *)pdmat->cookie;
|
struct sbus_softc *sc = (struct sbus_softc *)pdmat->dt_cookie;
|
||||||
|
|
||||||
return (iommu_dvmamem_alloc_size(pdmat, ddmat, &sc->sc_is, vaddr, flags,
|
return (iommu_dvmamem_alloc_size(pdmat, ddmat, &sc->sc_is, vaddr, flags,
|
||||||
mapp, size));
|
mapp, size));
|
||||||
@ -1017,7 +1017,7 @@ static void
|
|||||||
sbus_dmamem_free_size(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void *vaddr,
|
sbus_dmamem_free_size(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void *vaddr,
|
||||||
bus_dmamap_t map, bus_size_t size)
|
bus_dmamap_t map, bus_size_t size)
|
||||||
{
|
{
|
||||||
struct sbus_softc *sc = (struct sbus_softc *)pdmat->cookie;
|
struct sbus_softc *sc = (struct sbus_softc *)pdmat->dt_cookie;
|
||||||
|
|
||||||
iommu_dvmamem_free_size(pdmat, ddmat, &sc->sc_is, vaddr, map, size);
|
iommu_dvmamem_free_size(pdmat, ddmat, &sc->sc_is, vaddr, map, size);
|
||||||
}
|
}
|
||||||
|
@ -674,7 +674,7 @@ iommu_dvmamem_alloc_size(bus_dma_tag_t pt, bus_dma_tag_t dt,
|
|||||||
{
|
{
|
||||||
int error;
|
int error;
|
||||||
|
|
||||||
if (size > dt->maxsize)
|
if (size > dt->dt_maxsize)
|
||||||
return (ENOMEM);
|
return (ENOMEM);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -703,7 +703,7 @@ iommu_dvmamem_alloc(bus_dma_tag_t pt, bus_dma_tag_t dt, struct iommu_state *is,
|
|||||||
void **vaddr, int flags, bus_dmamap_t *mapp)
|
void **vaddr, int flags, bus_dmamap_t *mapp)
|
||||||
{
|
{
|
||||||
return (iommu_dvmamem_alloc_size(pt, dt, is, vaddr, flags, mapp,
|
return (iommu_dvmamem_alloc_size(pt, dt, is, vaddr, flags, mapp,
|
||||||
dt->maxsize));
|
dt->dt_maxsize));
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -720,7 +720,7 @@ void
|
|||||||
iommu_dvmamem_free(bus_dma_tag_t pt, bus_dma_tag_t dt, struct iommu_state *is,
|
iommu_dvmamem_free(bus_dma_tag_t pt, bus_dma_tag_t dt, struct iommu_state *is,
|
||||||
void *vaddr, bus_dmamap_t map)
|
void *vaddr, bus_dmamap_t map)
|
||||||
{
|
{
|
||||||
iommu_dvmamem_free_size(pt, dt, is, vaddr, map, dt->maxsize);
|
iommu_dvmamem_free_size(pt, dt, is, vaddr, map, dt->dt_maxsize);
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
Loading…
Reference in New Issue
Block a user