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

Commit d809eace authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am 9f34b141: am 85d5d611: am c4f4e5e2: am cd8b953e: Merge changes... 

am 9f34b141: am 85d5d611: am c4f4e5e2: am cd8b953e: Merge changes I2d3fef08,Idb828aa4,Ica764b1f,I9ae8887b,I376fad86,I4d00a9dd

* commit '9f34b141':
  libion: update to latest uapi header
  libion: return -errno from ion_close
  libion: add include for size_t
  libion: add NULL checks
  libion: clean up whitespace
  libion: move ion.h into local include directory
parents 141ce606 9f34b141

libion/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -5,11 +5,14 @@ LOCAL_SRC_FILES := ion.c 
LOCAL_MODULE := libion

LOCAL_MODULE_TAGS := optional

LOCAL_SHARED_LIBRARIES := liblog

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/kernel-headers

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include $(LOCAL_PATH)/kernel-headers

include $(BUILD_SHARED_LIBRARY)



include $(CLEAR_VARS)

LOCAL_SRC_FILES := ion.c ion_test.c

LOCAL_MODULE := iontest

LOCAL_MODULE_TAGS := optional tests

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/kernel-headers

LOCAL_SHARED_LIBRARIES := liblog

include $(BUILD_EXECUTABLE)

include/ion/ion.h→libion/include/ion/ion.h

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#ifndef __SYS_CORE_ION_H

#define __SYS_CORE_ION_H



#include <sys/types.h>

#include <linux/ion.h>



__BEGIN_DECLS

libion/ion.c

+97 −77
Original line number Diff line number Diff line
@@ -40,7 +40,10 @@ int ion_open() 


int ion_close(int fd)

{

        return close(fd);

    int ret = close(fd);

    if (ret < 0)

        return -errno;

    return ret;

}



static int ion_ioctl(int fd, int req, void *arg)
@@ -65,6 +68,9 @@ int ion_alloc(int fd, size_t len, size_t align, unsigned int heap_mask, 
        .flags = flags,

    };



    if (handle == NULL)

        return -EINVAL;



    ret = ion_ioctl(fd, ION_IOC_ALLOC, &data);

    if (ret < 0)

        return ret;
@@ -83,11 +89,17 @@ 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 ret;

    struct ion_fd_data data = {

        .handle = handle,

    };



        int ret = ion_ioctl(fd, ION_IOC_MAP, &data);

    if (map_fd == NULL)

        return -EINVAL;

    if (ptr == NULL)

        return -EINVAL;



    ret = ion_ioctl(fd, ION_IOC_MAP, &data);

    if (ret < 0)

        return ret;

    *map_fd = data.fd;
@@ -106,11 +118,15 @@ int ion_map(int fd, ion_user_handle_t handle, size_t length, int prot, 
int ion_share(int fd, ion_user_handle_t handle, int *share_fd)

{

    int map_fd;

    int ret;

    struct ion_fd_data data = {

        .handle = handle,

    };



        int ret = ion_ioctl(fd, ION_IOC_SHARE, &data);

    if (share_fd == NULL)

        return -EINVAL;



    ret = ion_ioctl(fd, ION_IOC_SHARE, &data);

    if (ret < 0)

        return ret;

    *share_fd = data.fd;
@@ -136,11 +152,15 @@ int ion_alloc_fd(int fd, size_t len, size_t align, unsigned int heap_mask, 


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

{

    int ret;

    struct ion_fd_data data = {

        .fd = share_fd,

    };



        int ret = ion_ioctl(fd, ION_IOC_IMPORT, &data);

    if (handle == NULL)

        return -EINVAL;



    ret = ion_ioctl(fd, ION_IOC_IMPORT, &data);

    if (ret < 0)

        return ret;

    *handle = data.handle;

libion/ion_test.c

+209 −215
Original line number Diff line number Diff line
@@ -224,21 +224,15 @@ int main(int argc, char* argv[]) { 
            break;

        case 'z':

            map_flags = 0;

			map_flags |= strstr(optarg, "PROT_EXEC") ?

				PROT_EXEC : 0;

			map_flags |= strstr(optarg, "PROT_READ") ?

				PROT_READ: 0;

			map_flags |= strstr(optarg, "PROT_WRITE") ?

				PROT_WRITE: 0;

			map_flags |= strstr(optarg, "PROT_NONE") ?

				PROT_NONE: 0;

            map_flags |= strstr(optarg, "PROT_EXEC") ? PROT_EXEC : 0;

            map_flags |= strstr(optarg, "PROT_READ") ? PROT_READ: 0;

            map_flags |= strstr(optarg, "PROT_WRITE") ? PROT_WRITE: 0;

            map_flags |= strstr(optarg, "PROT_NONE") ? PROT_NONE: 0;

            break;

        case 'p':

            prot = 0;

			prot |= strstr(optarg, "MAP_PRIVATE") ?

				MAP_PRIVATE	 : 0;

			prot |= strstr(optarg, "MAP_SHARED") ?

				MAP_PRIVATE	 : 0;

            prot |= strstr(optarg, "MAP_PRIVATE") ? MAP_PRIVATE : 0;

            prot |= strstr(optarg, "MAP_SHARED") ? MAP_PRIVATE : 0;

            break;

        case 'f':

            alloc_flags = atol(optarg);

libion/kernel-headers/linux/ion.h

0 → 100644
+78 −0
Original line number Diff line number Diff line 
/****************************************************************************

 ****************************************************************************

 ***

 ***   This header was automatically generated from a Linux kernel header

 ***   of the same name, to make information necessary for userspace to

 ***   call into the kernel available to libc.  It contains only constants,

 ***   structures, and macros generated from the original header, and thus,

 ***   contains no copyrightable information.

 ***

 ***   To edit the content of this header, modify the corresponding

 ***   source file (e.g. under external/kernel-headers/original/) then

 ***   run bionic/libc/kernel/tools/update_all.py

 ***

 ***   Any manual change here will be lost the next time this script will

 ***   be run. You've been warned!

 ***

 ****************************************************************************

 ****************************************************************************/

#ifndef _UAPI_LINUX_ION_H

#define _UAPI_LINUX_ION_H

#include <linux/ioctl.h>

#include <linux/types.h>

/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

typedef int ion_user_handle_t;

enum ion_heap_type {

 ION_HEAP_TYPE_SYSTEM,

 ION_HEAP_TYPE_SYSTEM_CONTIG,

/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

 ION_HEAP_TYPE_CARVEOUT,

 ION_HEAP_TYPE_CHUNK,

 ION_HEAP_TYPE_DMA,

 ION_HEAP_TYPE_CUSTOM,

/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

 ION_NUM_HEAPS = 16,

};

#define ION_HEAP_SYSTEM_MASK (1 << ION_HEAP_TYPE_SYSTEM)

#define ION_HEAP_SYSTEM_CONTIG_MASK (1 << ION_HEAP_TYPE_SYSTEM_CONTIG)

/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

#define ION_HEAP_CARVEOUT_MASK (1 << ION_HEAP_TYPE_CARVEOUT)

#define ION_HEAP_TYPE_DMA_MASK (1 << ION_HEAP_TYPE_DMA)

#define ION_NUM_HEAP_IDS sizeof(unsigned int) * 8

#define ION_FLAG_CACHED 1

/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

#define ION_FLAG_CACHED_NEEDS_SYNC 2

struct ion_allocation_data {

 size_t len;

 size_t align;

/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

 unsigned int heap_id_mask;

 unsigned int flags;

 ion_user_handle_t handle;

};

/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

struct ion_fd_data {

 ion_user_handle_t handle;

 int fd;

};

/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

struct ion_handle_data {

 ion_user_handle_t handle;

};

struct ion_custom_data {

/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

 unsigned int cmd;

 unsigned long arg;

};

#define ION_IOC_MAGIC 'I'

/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

#define ION_IOC_ALLOC _IOWR(ION_IOC_MAGIC, 0,   struct ion_allocation_data)

#define ION_IOC_FREE _IOWR(ION_IOC_MAGIC, 1, struct ion_handle_data)

#define ION_IOC_MAP _IOWR(ION_IOC_MAGIC, 2, struct ion_fd_data)

#define ION_IOC_SHARE _IOWR(ION_IOC_MAGIC, 4, struct ion_fd_data)

/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

#define ION_IOC_IMPORT _IOWR(ION_IOC_MAGIC, 5, struct ion_fd_data)

#define ION_IOC_SYNC _IOWR(ION_IOC_MAGIC, 7, struct ion_fd_data)

#define ION_IOC_CUSTOM _IOWR(ION_IOC_MAGIC, 6, struct ion_custom_data)

#endif

/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */