From 06ba6bc3e19db62bd198e73b49f8389b9090bc0a Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Tue, 13 Mar 2018 15:24:26 +0900 Subject: [PATCH] move the position of the codes Change-Id: I4fbb55e67ca33bf26efc54f60d9a15761243471a --- src/tbm_bufmgr_int.h | 7 ++++--- src/tbm_type_int.h | 22 ++++++++++++---------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/tbm_bufmgr_int.h b/src/tbm_bufmgr_int.h index ea58185..4aeb3ab 100644 --- a/src/tbm_bufmgr_int.h +++ b/src/tbm_bufmgr_int.h @@ -48,14 +48,14 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include +#include #include #include #include #include -#include #include #include -#include +#include extern tbm_bufmgr gBufMgr; extern int b_dump_queue; @@ -206,14 +206,15 @@ struct _tbm_bufmgr { int fd; /* bufmgr fd */ tbm_bufmgr_bo_lock_type bo_lock_type; /* lock_type of bufmgr */ int capabilities; /* capabilities of bufmgr */ + int display_server; /* used by display server */ unsigned int bo_cnt; /* number of bos */ struct list_head bo_list; /* list of bos belonging to bufmgr */ struct list_head surf_list; /* list of surfaces belonging to 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 */ + void *module_data; tbm_bufmgr_backend backend; /* bufmgr backend */ - int display_server; /* used by display server */ }; /** diff --git a/src/tbm_type_int.h b/src/tbm_type_int.h index 0b3bd42..0100ea4 100644 --- a/src/tbm_type_int.h +++ b/src/tbm_type_int.h @@ -114,16 +114,6 @@ enum TBM_BUFMGR_CAPABILITY { }; /** - * @brief Enumeration of buffer manager lock try for bo - * @since_tizen 5.0 - */ -typedef enum { - TBM_BUFMGR_BO_LOCK_TYPE_NEVER = 0, /**< the bufmgr do not try to lock the bos when the tbm_bo_map is called. */ - TBM_BUFMGR_BO_LOCK_TYPE_ONCE, /**< the bufmgr tries to lock the bos only once when the tbm_bo_map is called. */ - TBM_BUFMGR_BO_LOCK_TYPE_ALWAYS, /**< the bufmgr always tries to lock the bos when the tbm_bo_map is called. */ -} tbm_bufmgr_bo_lock_type; - -/** * @brief Definition for the device type to get the default handle * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif */ @@ -167,6 +157,8 @@ typedef enum { */ #define TBM_OPTION_VENDOR (0xffff0000) + + /** * @brief tbm_bo_handle abstraction of the memory handle by TBM_DEVICE_TYPE * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif @@ -203,6 +195,16 @@ enum TBM_BO_FLAGS { typedef void (*tbm_data_free) (void *user_data); /** + * @brief Enumeration of buffer manager lock try for bo + * @since_tizen 5.0 + */ +typedef enum { + TBM_BUFMGR_BO_LOCK_TYPE_NEVER = 0, /**< the bufmgr do not try to lock the bos when the tbm_bo_map is called. */ + TBM_BUFMGR_BO_LOCK_TYPE_ONCE, /**< the bufmgr tries to lock the bos only once when the tbm_bo_map is called. */ + TBM_BUFMGR_BO_LOCK_TYPE_ALWAYS, /**< the bufmgr always tries to lock the bos when the tbm_bo_map is called. */ +} tbm_bufmgr_bo_lock_type; + +/** * @brief Enumeration of the trace log for debug * @since_tizen 5.0 */ -- 2.7.4