X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftbm_bufmgr_int.h;h=97ae0e59c18feb19192b7785997c548275aa2ac9;hb=53d34ee207b956e9bae7c4b432f2976a10ce7b81;hp=22eae7370f2b2c1af297e4677dd22590ade47ec4;hpb=5562be21a51a019f457db98f867fdd30e832b761;p=platform%2Fcore%2Fuifw%2Flibtbm.git

diff --git a/src/tbm_bufmgr_int.h b/src/tbm_bufmgr_int.h
index 22eae73..97ae0e5 100644
--- 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,14 +179,13 @@ 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 */
-	int get_from_hal_surface;        /* bo_data has be detroyed by hal backend */
+	tbm_bo_data *bo_data;            /* bo data of the module */
+	int get_from_surface_data;       /* bo_data has be detroyed by surface_data */
 };
 
 /**
@@ -208,23 +204,7 @@ struct _tbm_bufmgr {
 	struct list_head surf_queue_list; /* list of surface queues belonging to bufmgr */
 	struct list_head debug_key_list;  /* list of debug data key list belonging to bufmgr */
 
-	//TODO: tbm_module *module;
-	tbm_module *module;               /* tbm module */
-
-	//TODO: replace this to data in tbm_module *module
-	void *module_data;                         /* backend module */
-	tbm_bufmgr_backend   backend;              /* bufmgr backend (will be DEPRECATED) */
-
-	tbm_backend_module       *backend_module_data;  /* backend module data */
-	tbm_backend_bufmgr_data  *bufmgr_data;          /* backend data of the backend module */
-	tbm_backend_bufmgr_func  *bufmgr_func;          /* backend functions for bufmgr */
-	tbm_backend_bo_func      *bo_func;              /* backend functions for bo */
-
-	int use_hal_tbm;                                /* use hal-api-tbm */
-	int auth_wl_socket_created;                     /* create wayland socket for authenticated drm_fd */
-	int auth_fd;
-	hal_tbm_backend          *hal_backend;          /* hal-api-tbm backend */
-	hal_tbm_bufmgr           *hal_bufmgr;           /* hal-api-tbm bufmgr */
+	tbm_module *module;               /* tbm module information */
 };
 
 /**
@@ -267,7 +247,7 @@ struct _tbm_surface {
 		int height;
 	} damage;
 
-	hal_tbm_surface *hal_surface; // hal_tbm_surface
+	tbm_surface_data *surface_data; /* surface data of the module */
 };
 
 typedef struct {
@@ -327,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_ */