use HAL_TBM_ prefix macro at log message

Change-Id: I17c778b96c5c8d546b4cee870d4891483dff487f

diff --git a/src/common.h b/src/common.h
index 525e195..360cbf6 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -37,11 +37,6 @@
 #include <time.h>
 #include <dlog.h>
 
-#define _D(fmt, args...)       SLOGD(fmt, ##args)
-#define _I(fmt, args...)       SLOGI(fmt, ##args)
-#define _W(fmt, args...)       SLOGW(fmt, ##args)
-#define _E(fmt, args...)       SLOGE(fmt, ##args)
-
 /* log level */
 void hal_tbm_log_print(int level, const char *fmt, ...);
 

diff --git a/src/hal-api-tbm.c b/src/hal-api-tbm.c
index 9d3b2d3..2b3b54e 100644 (file)
--- a/src/hal-api-tbm.c
+++ b/src/hal-api-tbm.c
@@ -151,7 +151,7 @@ hal_tbm_get_backend(hal_tbm_error *error)
 
        ret = hal_common_get_backend(HAL_MODULE_TBM, (void **)&backend_data);
        if (ret < 0) {
-                _E("Failed to get backend\n");
+                HAL_TBM_ERR("Failed to get backend\n");
                 if (error)
                        *error = HAL_TBM_ERROR_INVALID_OPERATION;
                return NULL;
@@ -162,7 +162,7 @@ hal_tbm_get_backend(hal_tbm_error *error)
        if (error)
                *error = HAL_TBM_ERROR_NONE;
 
-       _I("hal_tbm_get_backend");
+       HAL_TBM_INFO("hal_tbm_get_backend");
 
        return (hal_tbm_backend *)backend_data;
 }
@@ -174,19 +174,19 @@ hal_tbm_put_backend(hal_tbm_backend *backend)
        int ret;
 
        if (!backend_data && g_hal_tbm_backend_data != backend) {
-               _E("no backend_data\n");
+               HAL_TBM_ERR("no backend_data\n");
                return HAL_TBM_ERROR_INVALID_OPERATION;
        }
 
        ret = hal_common_put_backend(HAL_MODULE_TBM, backend_data);
        if (ret < 0) {
-                _E("Failed to put backend\n");
+                HAL_TBM_ERR("Failed to put backend\n");
                 return HAL_TBM_ERROR_INVALID_OPERATION;
        }
 
        g_hal_tbm_backend_data = NULL;
 
-       _I("hal_tbm_put_backend");
+       HAL_TBM_INFO("hal_tbm_put_backend");
 
        return HAL_TBM_ERROR_NONE;
 }
@@ -198,7 +198,7 @@ hal_tbm_backend_get_bufmgr(hal_tbm_backend *backend, hal_tbm_error *error)
        hal_tbm_bufmgr *bufmgr;
 
        if (!backend_data || g_hal_tbm_backend_data != backend_data) {
-               _E("no backend_data\n");
+               HAL_TBM_ERR("no backend_data\n");
                if (error)
                        *error = HAL_TBM_ERROR_INVALID_OPERATION;
                return NULL;
@@ -206,7 +206,7 @@ hal_tbm_backend_get_bufmgr(hal_tbm_backend *backend, hal_tbm_error *error)
 
        bufmgr = backend_data->bufmgr;
        if (!bufmgr) {
-               _E("no bufmgr\n");
+               HAL_TBM_ERR("no bufmgr\n");
                if (error)
                        *error = HAL_TBM_ERROR_INVALID_OPERATION;
                return NULL;
@@ -224,7 +224,7 @@ hal_tbm_backend_has_drm_device(hal_tbm_backend *backend, hal_tbm_error *error)
        hal_tbm_backend_data *backend_data = (hal_tbm_backend_data *)backend;
 
        if (!backend_data || g_hal_tbm_backend_data != backend_data) {
-               _E("no backend_data\n");
+               HAL_TBM_ERR("no backend_data\n");
                if (error)
                        *error = HAL_TBM_ERROR_INVALID_OPERATION;
                return 0;
@@ -239,18 +239,18 @@ hal_tbm_backend_get_master_drm_fd(hal_tbm_backend *backend, hal_tbm_error *error
        hal_tbm_backend_data *backend_data = (hal_tbm_backend_data *)backend;
 
        if (!backend_data || g_hal_tbm_backend_data != backend_data) {
-               _E("no backend_data\n");
+               HAL_TBM_ERR("no backend_data\n");
                if (error)
                        *error = HAL_TBM_ERROR_INVALID_OPERATION;
                return -1;
        }
 
        if (!backend_data->drm_info.is_master) {
-               _I("no master_drm_fd");
+               HAL_TBM_INFO("no master_drm_fd");
                return -1;
        }
 
-       _I("master_drm_fd is %d", backend_data->drm_info.drm_fd);
+       HAL_TBM_INFO("master_drm_fd is %d", backend_data->drm_info.drm_fd);
 
        return backend_data->drm_info.drm_fd;
 }
@@ -262,18 +262,18 @@ hal_tbm_backend_set_authenticated_drm_fd(hal_tbm_backend *backend, hal_tbm_fd au
        int ret;
 
        if (!backend_data || g_hal_tbm_backend_data != backend_data) {
-               _E("no backend_data\n");
+               HAL_TBM_ERR("no backend_data\n");
                return HAL_TBM_ERROR_INVALID_OPERATION;
        }
 
        if (!backend_data->drm_info.auth_drm_fd_func) {
-               _E("no backend_data->drm_info.auth_drm_fd_func\n");
+               HAL_TBM_ERR("no backend_data->drm_info.auth_drm_fd_func\n");
                return HAL_TBM_ERROR_INVALID_OPERATION;
        }
 
        ret = backend_data->drm_info.auth_drm_fd_func(auth_drm_fd, backend_data->drm_info.user_data);
        if (ret != HAL_TBM_ERROR_NONE) {
-               _E("backend_data->drm_info.auth_drm_fd_func failed\n");
+               HAL_TBM_ERR("backend_data->drm_info.auth_drm_fd_func failed\n");
                return ret;
        }
 
@@ -291,15 +291,15 @@ hal_tbm_bufmgr_get_capabilities(hal_tbm_bufmgr *bufmgr, hal_tbm_error *error)
        caps = bufmgr_funcs->bufmgr_get_capabilities((hal_tbm_bufmgr *)bufmgr, error);
        if (bufmgr_funcs->bufmgr_alloc_surface && bufmgr_funcs->bufmgr_import_surface) {
                caps |= HAL_TBM_BUFMGR_CAPABILITY_SHARE_SURFACE;
-               _I("HAL-BACKEND has HAL_TBM_BUFMGR_CAPABILITY_SHARE_SURFACE");
+               HAL_TBM_INFO("HAL-BACKEND has HAL_TBM_BUFMGR_CAPABILITY_SHARE_SURFACE");
        }
        if (bufmgr_funcs->bufmgr_import_fd) {
                caps |= HAL_TBM_BUFMGR_CAPABILITY_SHARE_FD;
-               _I("HAL-BACKEND has HAL_TBM_BUFMGR_CAPABILITY_SHARE_FD");
+               HAL_TBM_INFO("HAL-BACKEND has HAL_TBM_BUFMGR_CAPABILITY_SHARE_FD");
        }
        if (bufmgr_funcs->bufmgr_import_key) {
                caps |= HAL_TBM_BUFMGR_CAPABILITY_SHARE_KEY;
-               _I("HAL-BACKEND has HAL_TBM_BUFMGR_CAPABILITY_SHARE_KEY");
+               HAL_TBM_INFO("HAL-BACKEND has HAL_TBM_BUFMGR_CAPABILITY_SHARE_KEY");
        }
 
        return caps;