commit ea699f0cf4c9ae7fac24683674c93427993a7190
author Rom Lemarchand <romlem@google.com> Mon Oct 21 15:18:40 2013 -0700
committer Rom Lemarchand <romlem@google.com> Wed Nov 06 09:55:03 2013 -0800
tree 66ae21d73f374edb6663b3ee16d787960181cf39
parent fdbbcc2fab86de95be429cf4abded08e979da6dc

Refresh libc/kernel/common/linux/ion.h

Change-Id: Ibd2bf99224b31bbad7b3a9b0d82bfef19162db7b

libc/kernel/common/linux/ion.h

diff --git a/libc/kernel/common/linux/ion.h b/libc/kernel/common/linux/ion.h
index f18939d..59045d2 100644
--- a/libc/kernel/common/linux/ion.h
+++ b/libc/kernel/common/linux/ion.h
@@ -19,39 +19,44 @@
 #ifndef _LINUX_ION_H
 #define _LINUX_ION_H
 #include <linux/types.h>
-struct ion_handle;
+typedef int ion_user_handle_t;
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 enum ion_heap_type {
  ION_HEAP_TYPE_SYSTEM,
  ION_HEAP_TYPE_SYSTEM_CONTIG,
  ION_HEAP_TYPE_CARVEOUT,
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+ ION_HEAP_TYPE_CHUNK,
+ ION_HEAP_TYPE_DMA,
  ION_HEAP_TYPE_CUSTOM,
  ION_NUM_HEAPS = 16,
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 };
 #define ION_HEAP_SYSTEM_MASK (1 << ION_HEAP_TYPE_SYSTEM)
-/* 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)
+/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
+#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
 #define ION_FLAG_CACHED_NEEDS_SYNC 2
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 struct ion_allocation_data {
  size_t len;
  size_t align;
- unsigned int heap_mask;
+ unsigned int heap_id_mask;
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  unsigned int flags;
- struct ion_handle *handle;
+ ion_user_handle_t handle;
 };
 struct ion_fd_data {
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- struct ion_handle *handle;
+ ion_user_handle_t handle;
  int fd;
 };
 struct ion_handle_data {
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
- struct ion_handle *handle;
+ ion_user_handle_t handle;
 };
 struct ion_custom_data {
  unsigned int cmd;