diff options
author | Russell King <rmk@arm.linux.org.uk> | 2012-10-25 12:01:33 +0100 |
---|---|---|
committer | Russell King <rmk@arm.linux.org.uk> | 2012-10-25 12:14:24 +0100 |
commit | 2e67ed108763894e78221d99ed2e8e8b5b570199 (patch) | |
tree | 422c7364e6efd88eb0683147a7bf9fbb0745899b /bmm_lib.c | |
parent | cee66e4b54e8a9e8098052341f218642a3c2d43c (diff) |
Make physical addresses 'unsigned long'
Rather than having physical addresses be a void * pointer, make them
integer like; they're really just numbers because we can't ever
dereference them and they certainly aren't pointer-like.
Diffstat (limited to 'bmm_lib.c')
-rw-r--r-- | bmm_lib.c | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -104,7 +104,7 @@ void bmm_free(void *vaddr) ioctl(bmm_fd, BMM_FREE, &io); } -void *bmm_attach(void *paddr, unsigned long len) +void *bmm_attach(unsigned long paddr, unsigned long len) { void *vaddr; @@ -114,7 +114,7 @@ void *bmm_attach(void *paddr, unsigned long len) if(bmm_init() < 0) return NULL; - vaddr = mmap(0, len, PROT_READ | PROT_WRITE, MAP_SHARED, bmm_fd, (unsigned long)paddr); + vaddr = mmap(0, len, PROT_READ | PROT_WRITE, MAP_SHARED, bmm_fd, paddr); return ((int)vaddr == -1) ? NULL : vaddr; } @@ -127,7 +127,7 @@ void bmm_detach(void *vaddr, unsigned long len) munmap(vaddr, len); } -void *bmm_get_vaddr(void *paddr) +void *bmm_get_vaddr(unsigned long paddr) { int ret; ioctl_arg_t io; @@ -135,7 +135,7 @@ void *bmm_get_vaddr(void *paddr) if(bmm_init() < 0) return NULL; - io.input = (unsigned long)paddr; + io.input = paddr; io.output = 0; io.arg = 0; ret = ioctl(bmm_fd, BMM_GET_VIRT_ADDR, &io); @@ -145,13 +145,13 @@ void *bmm_get_vaddr(void *paddr) return (void *)io.output; } -void *bmm_get_kern_paddr(void *vaddr, unsigned long size) +unsigned long bmm_get_kern_paddr(void *vaddr, unsigned long size) { int ret; ioctl_arg_t io; if(bmm_init() < 0) - return NULL; + return 0; io.input = (unsigned long)vaddr; io.length = (unsigned long)size; @@ -159,27 +159,27 @@ void *bmm_get_kern_paddr(void *vaddr, unsigned long size) io.arg = 0; ret = ioctl(bmm_fd, BMM_GET_KERN_PHYS_ADDR, &io); if(ret < 0) - return NULL; + return 0; - return (void *)io.output; + return io.output; } -void *bmm_get_paddr(void *vaddr) +unsigned long bmm_get_paddr(void *vaddr) { int ret; ioctl_arg_t io; if(bmm_init() < 0) - return NULL; + return 0; io.input = (unsigned long)vaddr; io.output = 0; io.arg = 0; ret = ioctl(bmm_fd,BMM_GET_PHYS_ADDR, &io); if(ret < 0) - return NULL; + return 0; - return (void *)io.output; + return io.output; } unsigned long bmm_get_mem_size(void *vaddr) |