From 6263c87069ed01bd71940183bfecedfeac4e1680 Mon Sep 17 00:00:00 2001 From: Hashcode Date: Mon, 12 Sep 2016 09:08:52 -0700 Subject: domx: clean up usage of USE_TI_LIBION - 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 --- domx/domx/plugins/memplugin_ion.c | 8 ++++++-- 1 file 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); -- cgit v1.2.3