diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2012-06-28 14:16:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-28 14:16:17 -0700 |
| commit | 984410aebe0525e9fe3b80b94d06960094597b18 (patch) | |
| tree | 32847d6a08e9de11b4292217c484301d6151c52a /include | |
| parent | 3f2b0a506f1e09e6960c050778870da289fc4702 (diff) | |
| parent | a50fd5568ea72ea1ad662207ccea512735803174 (diff) | |
| download | system_core-984410aebe0525e9fe3b80b94d06960094597b18.tar.gz system_core-984410aebe0525e9fe3b80b94d06960094597b18.tar.bz2 system_core-984410aebe0525e9fe3b80b94d06960094597b18.zip | |
Merge "Modify ion to use new definition of ALLOC ioctl argument"
Diffstat (limited to 'include')
| -rw-r--r-- | include/ion/ion.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/ion/ion.h b/include/ion/ion.h index cafead59..78a6e2e1 100644 --- a/include/ion/ion.h +++ b/include/ion/ion.h @@ -27,8 +27,10 @@ __BEGIN_DECLS int ion_open(); int ion_close(int fd); -int ion_alloc(int fd, size_t len, size_t align, unsigned int flags, - struct ion_handle **handle); +int ion_alloc(int fd, size_t len, size_t align, unsigned int heap_mask, + unsigned int flags, struct ion_handle **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_free(int fd, struct ion_handle *handle); int ion_map(int fd, struct ion_handle *handle, size_t length, int prot, int flags, off_t offset, unsigned char **ptr, int *map_fd); |