mirror of
https://git.rwth-aachen.de/acs/public/villas/node/
synced 2025-03-16 00:00:02 +01:00
fixed compiler warnings
This commit is contained in:
parent
bd8987bf35
commit
abd8148a2b
3 changed files with 7 additions and 7 deletions
|
@ -54,7 +54,7 @@ struct vfio_container {
|
||||||
int version;
|
int version;
|
||||||
int extensions;
|
int extensions;
|
||||||
|
|
||||||
uint64_t iova_next; /**< Next free IOVA address */
|
void *iova_next; /**< Next free IOVA address */
|
||||||
|
|
||||||
struct list groups;
|
struct list groups;
|
||||||
};
|
};
|
||||||
|
|
|
@ -46,7 +46,7 @@ int dma_alloc(struct ip *c, struct dma_mem *mem, size_t len, int flags)
|
||||||
}
|
}
|
||||||
|
|
||||||
mem->len = len;
|
mem->len = len;
|
||||||
mem->base_phys = -1; /* find free */
|
mem->base_phys = (void *) -1; /* find free */
|
||||||
mem->base_virt = mmap(0, mem->len, PROT_READ | PROT_WRITE, flags | MAP_PRIVATE | MAP_ANONYMOUS | MAP_32BIT, 0, 0);
|
mem->base_virt = mmap(0, mem->len, PROT_READ | PROT_WRITE, flags | MAP_PRIVATE | MAP_ANONYMOUS | MAP_32BIT, 0, 0);
|
||||||
if (mem->base_virt == MAP_FAILED)
|
if (mem->base_virt == MAP_FAILED)
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -100,7 +100,7 @@ int dma_write(struct ip *c, char *buf, size_t len)
|
||||||
{
|
{
|
||||||
XAxiDma *xdma = &c->dma.inst;
|
XAxiDma *xdma = &c->dma.inst;
|
||||||
|
|
||||||
debug(25, "DMA write: dmac=%s buf=%p len=%#x", c->name, buf, len);
|
debug(25, "DMA write: dmac=%s buf=%p len=%#zx", c->name, buf, len);
|
||||||
|
|
||||||
return xdma->HasSg
|
return xdma->HasSg
|
||||||
? dma_sg_write(c, buf, len)
|
? dma_sg_write(c, buf, len)
|
||||||
|
@ -111,7 +111,7 @@ int dma_read(struct ip *c, char *buf, size_t len)
|
||||||
{
|
{
|
||||||
XAxiDma *xdma = &c->dma.inst;
|
XAxiDma *xdma = &c->dma.inst;
|
||||||
|
|
||||||
debug(25, "DMA read: dmac=%s buf=%p len=%#x", c->name, buf, len);
|
debug(25, "DMA read: dmac=%s buf=%p len=%#zx", c->name, buf, len);
|
||||||
|
|
||||||
return xdma->HasSg
|
return xdma->HasSg
|
||||||
? dma_sg_read(c, buf, len)
|
? dma_sg_read(c, buf, len)
|
||||||
|
@ -172,7 +172,7 @@ int dma_sg_write(struct ip *c, char *buf, size_t len)
|
||||||
return -5;
|
return -5;
|
||||||
|
|
||||||
remaining = len;
|
remaining = len;
|
||||||
bdbuf = (uint32_t) buf;
|
bdbuf = (uintptr_t) buf;
|
||||||
bd = bds;
|
bd = bds;
|
||||||
for (int i = 0; i < bdcnt; i++) {
|
for (int i = 0; i < bdcnt; i++) {
|
||||||
bdlen = MIN(remaining, FPGA_DMA_BOUNDARY);
|
bdlen = MIN(remaining, FPGA_DMA_BOUNDARY);
|
||||||
|
@ -246,7 +246,7 @@ int dma_sg_read(struct ip *c, char *buf, size_t len)
|
||||||
if (ret != XST_SUCCESS)
|
if (ret != XST_SUCCESS)
|
||||||
return -5;
|
return -5;
|
||||||
|
|
||||||
bdbuf = (uint32_t) buf;
|
bdbuf = (uintptr_t) buf;
|
||||||
remaining = len;
|
remaining = len;
|
||||||
bd = bds;
|
bd = bds;
|
||||||
for (int i = 0; i < bdcnt; i++) {
|
for (int i = 0; i < bdcnt; i++) {
|
||||||
|
|
|
@ -575,7 +575,7 @@ int vfio_map_dma(struct vfio_container *c, struct dma_mem *mem)
|
||||||
mem->len &= ~0xFFF;
|
mem->len &= ~0xFFF;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mem->base_phys == -1) {
|
if (mem->base_phys == (void *) -1) {
|
||||||
mem->base_phys = c->iova_next;
|
mem->base_phys = c->iova_next;
|
||||||
c->iova_next += mem->len;
|
c->iova_next += mem->len;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue