diff options
| author | Hashcode <hashcode0f@gmail.com> | 2016-09-12 09:08:52 -0700 |
|---|---|---|
| committer | Hashcode <hashcode0f@gmail.com> | 2016-09-12 09:10:35 -0700 |
| commit | 6263c87069ed01bd71940183bfecedfeac4e1680 (patch) | |
| tree | e64583eeb0d0c1808d6305a9e49af35b6a7faa14 | |
| parent | fe1b5d9404fdad05756f0af113bd093d09b2952c (diff) | |
| download | android_hardware_ti_omap4-cm-14.0.tar.gz android_hardware_ti_omap4-cm-14.0.tar.bz2 android_hardware_ti_omap4-cm-14.0.zip | |
domx: clean up usage of USE_TI_LIBIONcm-14.0
- Replace incorrect checks of USE_TI_ION with USE_TI_LIBION
- 1 reference to ion_user_handle_t was left unprotected. Add
check for USE_TI_LIBION
| -rwxr-xr-x | domx/domx/plugins/memplugin_ion.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/domx/domx/plugins/memplugin_ion.c b/domx/domx/plugins/memplugin_ion.c index a407fd3..d8e246a 100755 --- a/domx/domx/plugins/memplugin_ion.c +++ b/domx/domx/plugins/memplugin_ion.c @@ -232,7 +232,7 @@ MEMPLUGIN_ERRORTYPE MemPlugin_ION_Alloc(void *pMemPluginHandle, OMX_U32 nClient, if(pIonBufferParams->bMap == OMX_TRUE) { ret = (OMX_S16) ion_map(nClient, -#ifdef USE_TI_ION +#ifdef USE_TI_LIBION pIonBufferProp->sBuffer_accessor.pBufferHandle, #else (ion_user_handle_t)pIonBufferProp->sBuffer_accessor.pBufferHandle, @@ -254,7 +254,11 @@ MEMPLUGIN_ERRORTYPE MemPlugin_ION_Alloc(void *pMemPluginHandle, OMX_U32 nClient, else { ret = (OMX_S16) ion_share(nClient, +#ifdef USE_TI_LIBION + pIonBufferProp->sBuffer_accessor.pBufferHandle, +#else (ion_user_handle_t)pIonBufferProp->sBuffer_accessor.pBufferHandle, +#endif (int *)&(pIonBufferProp->sBuffer_accessor.bufferFd)); if(ret < 0) { @@ -289,7 +293,7 @@ MEMPLUGIN_ERRORTYPE MemPlugin_ION_Free(__unused void *pMemPluginHandle,OMX_U32 n //close close(pIonBufferProp->sBuffer_accessor.bufferFd); //free -#ifdef USE_TI_ION +#ifdef USE_TI_LIBION ion_free(nClient, (struct ion_handle*)pIonBufferProp->sBuffer_accessor.pBufferHandle); #else ion_free(nClient, (ion_user_handle_t)pIonBufferProp->sBuffer_accessor.pBufferHandle); |