rpitx/librpitx
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed for 64bit environment-But not warranty to work under 64bit anyway

Browse source
This commit is contained in:
F5OEO 2018-03-18 21:27:21 +00:00
parent 479a1f42e9
commit ef1ecf24ee
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dma.cpp
View file

@ -112,7 +112,7 @@ uint32_t dma::mem_phys_to_virt(volatile uint32_t phys)
{ {
//MBOX METHOD //MBOX METHOD
uint32_t offset=phys-mbox.bus_addr; uint32_t offset=phys-mbox.bus_addr;
uint32_t result=(uint32_t)((uint8_t *)mbox.virt_addr+offset); uint32_t result=(size_t)((uint8_t *)mbox.virt_addr+offset);
//printf("MemtoVirt:Offset=%lx phys=%lx -> %lx\n",offset,phys,result); //printf("MemtoVirt:Offset=%lx phys=%lx -> %lx\n",offset,phys,result);
return result; return result;
} }
@ -146,7 +146,7 @@ int dma::getcbposition()
volatile uint32_t dmacb=(uint32_t)(dma_reg.gpioreg[DMA_CONBLK_AD+channel*0x40]); volatile uint32_t dmacb=(uint32_t)(dma_reg.gpioreg[DMA_CONBLK_AD+channel*0x40]);
//fprintf(stderr,"cb=%x\n",dmacb); //fprintf(stderr,"cb=%x\n",dmacb);
if(dmacb>0) if(dmacb>0)
return mem_phys_to_virt(dmacb)-(uint32_t)virtbase; return mem_phys_to_virt(dmacb)-(size_t)virtbase;
else else
return -1; return -1;
// dma_reg.gpioreg[DMA_CONBLK_AD+channel*0x40]-mem_virt_to_phys((void *)cbarray ); // dma_reg.gpioreg[DMA_CONBLK_AD+channel*0x40]-mem_virt_to_phys((void *)cbarray );