diff options
| author | Colin Cross <ccross@android.com> | 2013-12-19 21:18:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-19 21:18:51 +0000 |
| commit | dfe747ada3ec58d104d0ea57bf4f86692cd8a4fe (patch) | |
| tree | fb7fa4465e2c610cdea5f69b88e9694fdd8af6ce /include | |
| parent | 67cb61ee5a8b8f5c967361430fff250e76c3a1dc (diff) | |
| parent | 969eac8161ba3c08bac4278451c91f3307f3f565 (diff) | |
| download | system_core-dfe747ada3ec58d104d0ea57bf4f86692cd8a4fe.tar.gz system_core-dfe747ada3ec58d104d0ea57bf4f86692cd8a4fe.tar.bz2 system_core-dfe747ada3ec58d104d0ea57bf4f86692cd8a4fe.zip | |
Merge "ion: update struct and type definitions to match kernel header"
Diffstat (limited to 'include')
| -rw-r--r-- | include/ion/ion.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/ion/ion.h b/include/ion/ion.h index fbd34e2a9..0451b5a50 100644 --- a/include/ion/ion.h +++ b/include/ion/ion.h @@ -30,15 +30,15 @@ struct ion_handle; int ion_open(); int ion_close(int fd); int ion_alloc(int fd, size_t len, size_t align, unsigned int heap_mask, - unsigned int flags, struct ion_handle **handle); + unsigned int flags, ion_user_handle_t *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_sync_fd(int fd, 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 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 ion_share(int fd, struct ion_handle *handle, int *share_fd); -int ion_import(int fd, int share_fd, struct ion_handle **handle); +int ion_share(int fd, ion_user_handle_t handle, int *share_fd); +int ion_import(int fd, int share_fd, ion_user_handle_t *handle); __END_DECLS |