ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am dfe747ad: Merge "ion: update struct and type definitions to match kernel header"

Browse source 
* commit 'dfe747ada3ec58d104d0ea57bf4f86692cd8a4fe':
  ion: update struct and type definitions to match kernel header
This commit is contained in:
Colin Cross 2013-12-19 13:21:44 -08:00 • committed by Android Git Automerger
commit 949e2a7c28
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/ion/ion.h
View file

@ -30,15 +30,15 @@ struct ion_handle;
int ion_open(); int ion_open();
int ion_close(int fd); int ion_close(int fd);
int ion_alloc(int fd, size_t len, size_t align, unsigned int heap_mask, int ion_alloc(int fd, size_t len, size_t align, unsigned int heap_mask,
unsigned int flags, struct ion_handle **handle); unsigned int flags, ion_user_handle_t *handle);
int ion_alloc_fd(int fd, size_t len, size_t align, unsigned int heap_mask, int ion_alloc_fd(int fd, size_t len, size_t align, unsigned int heap_mask,
unsigned int flags, int *handle_fd); unsigned int flags, int *handle_fd);
int ion_sync_fd(int fd, int handle_fd); int ion_sync_fd(int fd, int handle_fd);
int ion_free(int fd, struct ion_handle *handle); int ion_free(int fd, ion_user_handle_t handle);
int ion_map(int fd, struct ion_handle *handle, size_t length, int prot, int ion_map(int fd, ion_user_handle_t handle, size_t length, int prot,
int flags, off_t offset, unsigned char **ptr, int *map_fd); int flags, off_t offset, unsigned char **ptr, int *map_fd);
int ion_share(int fd, struct ion_handle *handle, int *share_fd); int ion_share(int fd, ion_user_handle_t handle, int *share_fd);
int ion_import(int fd, int share_fd, struct ion_handle **handle); int ion_import(int fd, int share_fd, ion_user_handle_t *handle);
__END_DECLS __END_DECLS

14
libion/ion.c
View file

@ -55,13 +55,13 @@ static int ion_ioctl(int fd, int req, void *arg)
} }
int ion_alloc(int fd, size_t len, size_t align, unsigned int heap_mask, int ion_alloc(int fd, size_t len, size_t align, unsigned int heap_mask,
unsigned int flags, struct ion_handle **handle) unsigned int flags, ion_user_handle_t *handle)
{ {
int ret; int ret;
struct ion_allocation_data data = { struct ion_allocation_data data = {
.len = len, .len = len,
.align = align, .align = align,
.heap_mask = heap_mask, .heap_id_mask = heap_mask,
.flags = flags, .flags = flags,
}; };
@ -72,7 +72,7 @@ int ion_alloc(int fd, size_t len, size_t align, unsigned int heap_mask,
return ret; return ret;
} }
int ion_free(int fd, struct ion_handle *handle) int ion_free(int fd, ion_user_handle_t handle)
{ {
struct ion_handle_data data = { struct ion_handle_data data = {
.handle = handle, .handle = handle,
@ -80,7 +80,7 @@ int ion_free(int fd, struct ion_handle *handle)
return ion_ioctl(fd, ION_IOC_FREE, &data); return ion_ioctl(fd, ION_IOC_FREE, &data);
} }
int ion_map(int fd, struct ion_handle *handle, size_t length, int prot, int ion_map(int fd, ion_user_handle_t handle, size_t length, int prot,
int flags, off_t offset, unsigned char **ptr, int *map_fd) int flags, off_t offset, unsigned char **ptr, int *map_fd)
{ {
struct ion_fd_data data = { struct ion_fd_data data = {
@ -103,7 +103,7 @@ int ion_map(int fd, struct ion_handle *handle, size_t length, int prot,
return ret; return ret;
} }
int ion_share(int fd, struct ion_handle *handle, int *share_fd) int ion_share(int fd, ion_user_handle_t handle, int *share_fd)
{ {
int map_fd; int map_fd;
struct ion_fd_data data = { struct ion_fd_data data = {
@ -123,7 +123,7 @@ int ion_share(int fd, struct ion_handle *handle, int *share_fd)
int ion_alloc_fd(int fd, size_t len, size_t align, unsigned int heap_mask, int ion_alloc_fd(int fd, size_t len, size_t align, unsigned int heap_mask,
unsigned int flags, int *handle_fd) { unsigned int flags, int *handle_fd) {
struct ion_handle *handle; ion_user_handle_t handle;
int ret; int ret;
ret = ion_alloc(fd, len, align, heap_mask, flags, &handle); ret = ion_alloc(fd, len, align, heap_mask, flags, &handle);
@ -134,7 +134,7 @@ int ion_alloc_fd(int fd, size_t len, size_t align, unsigned int heap_mask,
return ret; return ret;
} }
int ion_import(int fd, int share_fd, struct ion_handle **handle) int ion_import(int fd, int share_fd, ion_user_handle_t *handle)
{ {
struct ion_fd_data data = { struct ion_fd_data data = {
.fd = share_fd, .fd = share_fd,

8
libion/ion_test.c
View file

@ -22,7 +22,7 @@ int heap_mask = 1;
int test = -1; int test = -1;
size_t stride; size_t stride;
int _ion_alloc_test(int *fd, struct ion_handle **handle) int _ion_alloc_test(int *fd, ion_user_handle_t *handle)
{ {
int ret; int ret;
@ -40,7 +40,7 @@ int _ion_alloc_test(int *fd, struct ion_handle **handle)
void ion_alloc_test() void ion_alloc_test()
{ {
int fd, ret; int fd, ret;
struct ion_handle *handle; ion_user_handle_t handle;
if(_ion_alloc_test(&fd, &handle)) if(_ion_alloc_test(&fd, &handle))
return; return;
@ -58,7 +58,7 @@ void ion_map_test()
{ {
int fd, map_fd, ret; int fd, map_fd, ret;
size_t i; size_t i;
struct ion_handle *handle; ion_user_handle_t handle;
unsigned char *ptr; unsigned char *ptr;
if(_ion_alloc_test(&fd, &handle)) if(_ion_alloc_test(&fd, &handle))
@ -99,7 +99,7 @@ void ion_map_test()
void ion_share_test() void ion_share_test()
{ {
struct ion_handle *handle; ion_user_handle_t handle;
int sd[2]; int sd[2];
int num_fd = 1; int num_fd = 1;
struct iovec count_vec = { struct iovec count_vec = {