From 20fa5f4038584abdb10b48122a7e3592fe964cd7 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Thu, 29 Mar 2018 10:24:30 +0900 Subject: [PATCH] move tbm_surface_queue_error_e types to tbm_error_e Change-Id: Ib8b4ebe51a27e49da5f05e03fcc80df4fe3a2d24 --- src/tbm_surface_queue.h | 12 +----------- src/tbm_type_common.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/tbm_surface_queue.h b/src/tbm_surface_queue.h index 1c0baf6..8ff2a58 100644 --- a/src/tbm_surface_queue.h +++ b/src/tbm_surface_queue.h @@ -33,17 +33,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define _TBM_SURFACE_QUEUE_H_ #include - -typedef enum { - TBM_SURFACE_QUEUE_ERROR_NONE = 0, /**< Successful */ - TBM_SURFACE_QUEUE_ERROR_INVALID_SURFACE = -1, - TBM_SURFACE_QUEUE_ERROR_INVALID_QUEUE = -2, - TBM_SURFACE_QUEUE_ERROR_EMPTY = -3, - TBM_SURFACE_QUEUE_ERROR_INVALID_PARAMETER = -4, - TBM_SURFACE_QUEUE_ERROR_SURFACE_ALLOC_FAILED = -5, - TBM_SURFACE_QUEUE_ERROR_ALREADY_EXIST = -6, - TBM_SURFACE_QUEUE_ERROR_UNKNOWN_SURFACE = -7, -} tbm_surface_queue_error_e; +#include typedef enum { TBM_SURFACE_QUEUE_TRACE_NONE = 0, /**< Successful */ diff --git a/src/tbm_type_common.h b/src/tbm_type_common.h index 8f68fa8..b632e51 100644 --- a/src/tbm_type_common.h +++ b/src/tbm_type_common.h @@ -87,6 +87,7 @@ typedef enum { TBM_ERROR_OUT_OF_MEMORY = TBM_ERROR_BASE | 0x0001, /**< failed to allocate the memory */ TBM_ERROR_INVALID_PARAMETER = TBM_ERROR_BASE | 0x0002, /**< failed to get the valid parameter */ TBM_ERROR_OPERATION_FAILED = TBM_ERROR_BASE | 0x0003, /**< failed to operation */ + TBM_BO_ERROR_GET_FD_FAILED = TBM_ERROR_BASE | 0x0101, /**< failed to get fd in bo */ TBM_BO_ERROR_HEAP_ALLOC_FAILED = TBM_ERROR_BASE | 0x0102, /**< failed to allocate the heap memory in bo */ TBM_BO_ERROR_LOAD_MODULE_FAILED = TBM_ERROR_BASE | 0x0103,/**< failed to load module*/ @@ -103,8 +104,19 @@ typedef enum { TBM_BO_ERROR_UNMAP_FAILED = TBM_ERROR_BASE | 0x0114, /**< failed to unmap the tbm_bo */ TBM_BO_ERROR_SWAP_FAILED = TBM_ERROR_BASE | 0x0115, /**< failed to swap the tbm_bos */ TBM_BO_ERROR_DUP_FD_FAILED = TBM_ERROR_BASE | 0x0116, /**< failed to duplicate fd */ + + TBM_SURFACE_QUEUE_ERROR_NONE = 0, /**< Successful */ + TBM_SURFACE_QUEUE_ERROR_INVALID_SURFACE = -1, + TBM_SURFACE_QUEUE_ERROR_INVALID_QUEUE = -2, + TBM_SURFACE_QUEUE_ERROR_EMPTY = -3, + TBM_SURFACE_QUEUE_ERROR_INVALID_PARAMETER = -4, + TBM_SURFACE_QUEUE_ERROR_SURFACE_ALLOC_FAILED = -5, + TBM_SURFACE_QUEUE_ERROR_ALREADY_EXIST = -6, + TBM_SURFACE_QUEUE_ERROR_UNKNOWN_SURFACE = -7, } tbm_error_e; +typedef tbm_error_e tbm_surface_queue_error_e; + /** * @brief Enumeration of tbm buffer manager capability. * @since_tizen 2.4 -- 2.7.4