Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a97f22aa authored by Rom Lemarchand's avatar Rom Lemarchand
Browse files

ion: update struct and type definitions to match kernel header 

- Replacing struct ion_handle * with ion_user_handle_t
- Replacing heap_mask field name with heap_id_mask

Change-Id: Iaba1ccc62b9398a7b37c5a734bc21a9ecbbc8277
parent 62a70df0

include/ion/ion.h

+5 −5
Original line number Diff line number Diff line
@@ -28,15 +28,15 @@ __BEGIN_DECLS 
int ion_open();

int ion_close(int fd);

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,

		 unsigned int flags, int *handle_fd);

int ion_sync_fd(int fd, int handle_fd);

int ion_free(int fd, struct ion_handle *handle);

int ion_map(int fd, struct ion_handle *handle, size_t length, int prot,

int ion_free(int fd, ion_user_handle_t handle);

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 ion_share(int fd, struct ion_handle *handle, int *share_fd);

int ion_import(int fd, int share_fd, struct ion_handle **handle);

int ion_share(int fd, ion_user_handle_t handle, int *share_fd);

int ion_import(int fd, int share_fd, ion_user_handle_t *handle);



__END_DECLS

libion/ion.c

+7 −7
Original line number Diff line number Diff line
@@ -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,

	      unsigned int flags, struct ion_handle **handle)

	      unsigned int flags, ion_user_handle_t *handle)

{

        int ret;

        struct ion_allocation_data data = {

                .len = len,

                .align = align,

		.heap_mask = heap_mask,

		.heap_id_mask = heap_mask,

                .flags = flags,

        };
@@ -72,7 +72,7 @@ int ion_alloc(int fd, size_t len, size_t align, unsigned int heap_mask, 
        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 = {

                .handle = handle,
@@ -80,7 +80,7 @@ int ion_free(int fd, struct ion_handle *handle) 
        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)

{

        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;

}



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;

        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,

		 unsigned int flags, int *handle_fd) {

	struct ion_handle *handle;

	ion_user_handle_t handle;

	int ret;



	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;

}



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 = {

                .fd = share_fd,

libion/ion_test.c

+4 −4
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ int heap_mask = 1; 
int test = -1;

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;
@@ -41,7 +41,7 @@ int _ion_alloc_test(int *fd, struct ion_handle **handle) 
void ion_alloc_test()

{

	int fd, ret;

	struct ion_handle *handle;

	ion_user_handle_t handle;



	if(_ion_alloc_test(&fd, &handle))

			return;
@@ -59,7 +59,7 @@ void ion_map_test() 
{

	int fd, map_fd, ret;

	size_t i;

	struct ion_handle *handle;

	ion_user_handle_t handle;

	unsigned char *ptr;



	if(_ion_alloc_test(&fd, &handle))
@@ -100,7 +100,7 @@ void ion_map_test() 
void ion_share_test()



{

	struct ion_handle *handle;

	ion_user_handle_t handle;

	int sd[2];

	int num_fd = 1;

	struct iovec count_vec = {