From 301a463070206fdcc188c32f2601475849ef5027 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Thu, 22 Mar 2018 11:49:50 +0900 Subject: [PATCH] use tbm_log.h Change-Id: I2a10dc5d622d305be4c26db24cbf34b408cb95ad --- src/tbm_bufmgr_dumb.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/src/tbm_bufmgr_dumb.c b/src/tbm_bufmgr_dumb.c index 34de4a8..62c0ef6 100644 --- a/src/tbm_bufmgr_dumb.c +++ b/src/tbm_bufmgr_dumb.c @@ -62,20 +62,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define TBM_SURFACE_ALIGNMENT_PITCH_RGB (128) #define TBM_SURFACE_ALIGNMENT_PITCH_YUV (16) -/* check condition */ -#define DUMB_RETURN_IF_FAIL(cond) {\ - if (!(cond)) {\ - TBM_ERR("[%s] : '%s' failed.\n", __FUNCTION__, #cond);\ - return;\ - } \ -} -#define DUMB_RETURN_VAL_IF_FAIL(cond, val) {\ - if (!(cond)) {\ - TBM_ERR("[%s] : '%s' failed.\n", __FUNCTION__, #cond);\ - return val;\ - } \ -} - struct dma_buf_info { unsigned long size; unsigned int fence_supported; @@ -381,7 +367,7 @@ static tbm_error_e tbm_dumb_bufmgr_bind_native_display(tbm_backend_bufmgr_data *bufmgr_data, tbm_native_display *native_display) { tbm_bufmgr_dumb bufmgr_dumb = (tbm_bufmgr_dumb)bufmgr_data; - DUMB_RETURN_VAL_IF_FAIL(bufmgr_dumb != NULL, TBM_ERROR_INVALID_PARAMETER); + TBM_RETURN_VAL_IF_FAIL(bufmgr_dumb != NULL, TBM_ERROR_INVALID_PARAMETER); if (!tbm_drm_helper_wl_auth_server_init(native_display, bufmgr_dumb->fd, bufmgr_dumb->device_name, 0)) { @@ -401,7 +387,7 @@ tbm_dumb_bufmgr_get_supported_formats(tbm_backend_bufmgr_data *bufmgr_data, tbm_bufmgr_dumb bufmgr_dumb = (tbm_bufmgr_dumb)bufmgr_data; uint32_t *color_formats; - DUMB_RETURN_VAL_IF_FAIL(bufmgr_dumb != NULL, TBM_ERROR_INVALID_PARAMETER); + TBM_RETURN_VAL_IF_FAIL(bufmgr_dumb != NULL, TBM_ERROR_INVALID_PARAMETER); color_formats = (uint32_t *)calloc(1, sizeof(uint32_t) * TBM_COLOR_FORMAT_COUNT); if (color_formats == NULL) @@ -430,7 +416,7 @@ tbm_dumb_bufmgr_get_plane_data(tbm_backend_bufmgr_data *bufmgr_data, int _size = 0; int _bo_idx = 0; - DUMB_RETURN_VAL_IF_FAIL(bufmgr_dumb != NULL, TBM_ERROR_INVALID_PARAMETER); + TBM_RETURN_VAL_IF_FAIL(bufmgr_dumb != NULL, TBM_ERROR_INVALID_PARAMETER); switch (format) { /* 16 bpp RGB */ @@ -1394,7 +1380,7 @@ tbm_dumb_deinit(tbm_backend_bufmgr_data *bufmgr_data) unsigned long key; void *value; - DUMB_RETURN_IF_FAIL(bufmgr_dumb != NULL); + TBM_RETURN_IF_FAIL(bufmgr_dumb != NULL); bufmgr = bufmgr_dumb->bufmgr; -- 2.7.4