diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2012-06-28 14:16:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-28 14:16:10 -0700 |
| commit | 2ddf77b37731dff3a271c1312fc0bef2e7d41473 (patch) | |
| tree | a63e8e83e73929cefe9c97202e89f8aa164143ea | |
| parent | bd73eede4661298ddbdafa510c3af347683b5f60 (diff) | |
| parent | 6d3f548294631ba15fdf5110a469cb1540461cb1 (diff) | |
| download | bionic-2ddf77b37731dff3a271c1312fc0bef2e7d41473.zip bionic-2ddf77b37731dff3a271c1312fc0bef2e7d41473.tar.gz bionic-2ddf77b37731dff3a271c1312fc0bef2e7d41473.tar.bz2 | |
Merge "Modify ion header"
| -rw-r--r-- | libc/kernel/common/linux/ion.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libc/kernel/common/linux/ion.h b/libc/kernel/common/linux/ion.h index b8715a3..0f872ec 100644 --- a/libc/kernel/common/linux/ion.h +++ b/libc/kernel/common/linux/ion.h @@ -33,34 +33,38 @@ enum ion_heap_type { /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ION_HEAP_SYSTEM_CONTIG_MASK (1 << ION_HEAP_TYPE_SYSTEM_CONTIG) #define ION_HEAP_CARVEOUT_MASK (1 << ION_HEAP_TYPE_CARVEOUT) +#define ION_FLAG_CACHED 1 struct ion_allocation_data { - size_t len; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + size_t len; size_t align; + unsigned int heap_mask; unsigned int flags; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct ion_handle *handle; }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct ion_fd_data { struct ion_handle *handle; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ int fd; }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct ion_handle_data { struct ion_handle *handle; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; struct ion_custom_data { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ unsigned int cmd; unsigned long arg; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; #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) +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #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, int) #define ION_IOC_CUSTOM _IOWR(ION_IOC_MAGIC, 6, struct ion_custom_data) +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #endif + |