tbm_bufmgr: lock/unlock tbm_bufmgr_mutex at tbm_bufmgr function

[platform/core/uifw/libtbm.git] / src / tbm_bufmgr_int.h

diff --git a/src/tbm_bufmgr_int.h b/src/tbm_bufmgr_int.h
index dffecc0..97ae0e5 100644 (file)
--- a/src/tbm_bufmgr_int.h
+++ b/src/tbm_bufmgr_int.h
@@ -55,10 +55,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tbm_surface_internal.h>
 #include <tbm_surface_queue.h>
 #include <tbm_log.h>
-#include <tbm_bufmgr_backend.h>
-#include <tbm_backend.h>
 #include <tbm_error.h>
-#include <hal/hal-tbm.h>
 #include "tbm_module.h"
 
 extern tbm_bufmgr gBufMgr;
@@ -182,13 +179,12 @@ struct _tbm_bo {
        int ref_cnt;                     /* ref count of bo */
        int flags;                       /* TBM_BO_FLAGS :bo memory type */
        struct list_head user_data_list; /* list of the user_date in bo */
-       void *priv;                      /* bo private  (will be DEPRECATED) */
        struct list_head item_link;      /* link of bo */
        tbm_surface_h surface;           /* tbm_surface */
        int lock_cnt;                    /* lock count of bo */
        unsigned int map_cnt;            /* device map count */
 
-       tbm_backend_bo_data *bo_data;    /* bo data of the backend module */
+       tbm_bo_data *bo_data;            /* bo data of the module */
        int get_from_surface_data;       /* bo_data has be detroyed by surface_data */
 };
 
@@ -251,7 +247,7 @@ struct _tbm_surface {
                int height;
        } damage;
 
-       tbm_backend_surface_data *surface_data; /* surface data of the backend module */
+       tbm_surface_data *surface_data; /* surface data of the module */
 };
 
 typedef struct {
@@ -311,10 +307,10 @@ void _tbm_bufmgr_mutex_lock(void);
 void _tbm_bufmgr_mutex_unlock(void);
 tbm_bo tbm_bufmgr_internal_find_bo(tbm_bufmgr bufmgr, tbm_bo bo);
 
-tbm_bo tbm_bufmgr_internal_alloc_bo(tbm_bufmgr bufmgr, int size, int flags, tbm_error_e *error);
+tbm_bo tbm_bufmgr_internal_alloc_bo(tbm_bufmgr bufmgr, int size, int flags);
 tbm_bo tbm_bufmgr_internal_alloc_bo_with_format(tbm_bufmgr bufmgr, int format, int bo_idx, int width, int bpp, int height, tbm_bo_memory_type flags, tbm_error_e *error);
-tbm_bo tbm_bufmgr_internal_alloc_bo_with_bo_data(tbm_bufmgr bufmgr, tbm_backend_bo_data *bo_data, int flags);
-tbm_bo tbm_bufmgr_internal_import_bo_with_key(tbm_bufmgr bufmgr, tbm_key key, tbm_error_e *error);
-tbm_bo tbm_bufmgr_internal_import_bo_with_fd(tbm_bufmgr bufmgr, tbm_fd fd, tbm_error_e *error);
+tbm_bo tbm_bufmgr_internal_alloc_bo_with_bo_data(tbm_bufmgr bufmgr, tbm_bo_data *bo_data, int flags, tbm_error_e *error);
+tbm_bo tbm_bufmgr_internal_import_bo_with_key(tbm_bufmgr bufmgr, tbm_key key);
+tbm_bo tbm_bufmgr_internal_import_bo_with_fd(tbm_bufmgr bufmgr, tbm_fd fd);
 
 #endif /* _TBM_BUFMGR_INT_H_ */