diff options
| author | Christopher Ferris <cferris@google.com> | 2018-03-28 19:33:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-28 19:33:16 +0000 |
| commit | ee55376d75b61997f7edadb1063a3f34b3fbcf7f (patch) | |
| tree | 57fffe6b2fffbbc08551b0074f3e2489f5e22fd1 /libc | |
| parent | 21f6782ea465ead432aac2ff96f028ddd00dfbb2 (diff) | |
| parent | 85f05425442678e41276842402926ee631cf90d0 (diff) | |
Merge "Use the ion.h from the kernel headers."
am: 85f0542544
Change-Id: Ied47c59d69f049ee177297bb0e668ab54c02f6fa
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/kernel/uapi/linux/ion.h | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/libc/kernel/uapi/linux/ion.h b/libc/kernel/uapi/linux/ion.h index 7b5b031f57..7c9e6d74ff 100644 --- a/libc/kernel/uapi/linux/ion.h +++ b/libc/kernel/uapi/linux/ion.h @@ -20,7 +20,6 @@ #define _UAPI_LINUX_ION_H #include <linux/ioctl.h> #include <linux/types.h> -typedef int ion_user_handle_t; enum ion_heap_type { ION_HEAP_TYPE_SYSTEM, ION_HEAP_TYPE_SYSTEM_CONTIG, @@ -31,24 +30,12 @@ enum ion_heap_type { }; #define ION_NUM_HEAP_IDS (sizeof(unsigned int) * 8) #define ION_FLAG_CACHED 1 -#define ION_FLAG_CACHED_NEEDS_SYNC 2 struct ion_allocation_data { - size_t len; - size_t align; - unsigned int heap_id_mask; - unsigned int flags; - ion_user_handle_t handle; -}; -struct ion_fd_data { - ion_user_handle_t handle; - int fd; -}; -struct ion_handle_data { - ion_user_handle_t handle; -}; -struct ion_custom_data { - unsigned int cmd; - unsigned long arg; + __u64 len; + __u32 heap_id_mask; + __u32 flags; + __u32 fd; + __u32 unused; }; #define MAX_HEAP_NAME 32 struct ion_heap_data { @@ -68,11 +55,5 @@ struct ion_heap_query { }; #define ION_IOC_MAGIC 'I' #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) -#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) #define ION_IOC_HEAP_QUERY _IOWR(ION_IOC_MAGIC, 8, struct ion_heap_query) #endif |