[Feature][T108] [task-view-1792] modify LOG
Only Configure: No
Affected branch: GSW_V1453
Affected module: log
Self-test: yes
Doc Update: no
Change-Id: Iee673a64346d0fad2450fec1092f61bae981e7dc
diff --git a/mbtk/libgsw_lib/gsw_secrypt_ss_interface.c b/mbtk/libgsw_lib/gsw_secrypt_ss_interface.c
index 7447fc5..4d95869 100755
--- a/mbtk/libgsw_lib/gsw_secrypt_ss_interface.c
+++ b/mbtk/libgsw_lib/gsw_secrypt_ss_interface.c
@@ -6,95 +6,10 @@
#include <stdint.h>
#include "gsw_secrypt_ss_interface.h"
#include "gsw_hal_errcode.h"
-
-#ifndef LOG_ERR_LEVEL
-#define LOG_ERR_LEVEL 3 /* error conditions */
-#endif
-#ifndef LOG_WARN_LEVEL
-#define LOG_WARN_LEVEL 4 /* warning conditions */
-#endif
-#ifndef LOG_INFO_LEVEL
-#define LOG_INFO_LEVEL 6 /* informational */
-#endif
-#ifndef LOG_DEBUG_LEVEL
-#define LOG_DEBUG_LEVEL 7 /* debug-level messages */
-#endif
-#ifndef LOG_VERBOSE_LEVEL
-#define LOG_VERBOSE_LEVEL 8
-#endif
+#include "gsw_log_interface.h"
#define GSW_TEE "[HAL][GSW_TEE]"
-#define LOGV(fmt, args ...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- mbtk_log(LOG_VERBOSE_LEVEL, "%s#%s: "GSW_TEE"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-#define LOGI(fmt, args...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- mbtk_log(LOG_INFO_LEVEL, "%s#%s: "GSW_TEE"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-#define LOGD(fmt, args...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- mbtk_log(LOG_DEBUG_LEVEL, "%s#%s: "GSW_TEE"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-#define LOGW(fmt, args...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- mbtk_log(LOG_WARN_LEVEL, "%s#%s: "GSW_TEE"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-#define LOGE(fmt, args...) \
- do{ \
- char *file_ptr_1001 = __FILE__; \
- char *ptr_1001 = file_ptr_1001 + strlen(file_ptr_1001) - 1; \
- char line_1001[10] = {0}; \
- sprintf(line_1001, "%d", __LINE__); \
- while(ptr_1001 >= file_ptr_1001 && *ptr_1001){ \
- if(*ptr_1001 == '/') \
- break; \
- ptr_1001--; \
- } \
- mbtk_log(LOG_ERR_LEVEL, "%s#%s: "GSW_TEE"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
/**
* struct TEEC_Context - Represents a connection between a client application
* and a TEE.
@@ -156,8 +71,8 @@
static void *dlHandle_mbtk;
typedef uint32_t TEEC_Result;
-static void (*mbtk_log)(int level, const char *format, ...);
-static void (*mbtk_log_init)(char *path, char *tag);
+// static void (*mbtk_log)(int level, const char *format, ...);
+// static void (*mbtk_log_init)(char *path, char *tag);
int (*prepare_tee_session)(struct test_ctx *ctx);
void (*terminate_tee_session)(struct test_ctx *ctx);
@@ -180,50 +95,50 @@
return GSW_HAL_NORMAL_FAIL;
}
- mbtk_log_init = (void (*)(char *path, char *tag))dlsym(dlHandle_mbtk, "mbtk_log_init");
- if (mbtk_log_init == NULL)
- {
- return GSW_HAL_NORMAL_FAIL;
- }
+ // mbtk_log_init = (void (*)(char *path, char *tag))dlsym(dlHandle_mbtk, "mbtk_log_init");
+ // if (mbtk_log_init == NULL)
+ // {
+ // return GSW_HAL_NORMAL_FAIL;
+ // }
- mbtk_log = (void (*)(int level, const char *format, ...))dlsym(dlHandle_mbtk, "mbtk_log");
- if (mbtk_log == NULL)
- {
- return GSW_HAL_NORMAL_FAIL;
- }
+ // mbtk_log = (void (*)(int level, const char *format, ...))dlsym(dlHandle_mbtk, "mbtk_log");
+ // if (mbtk_log == NULL)
+ // {
+ // return GSW_HAL_NORMAL_FAIL;
+ // }
prepare_tee_session = (int (*)(struct test_ctx *ctx))dlsym(dlHandle_secure, "prepare_tee_session");
if (prepare_tee_session == NULL)
{
- LOGE("prepare_tee_session dlsym fail\n");
+ LOGE(GSW_TEE,"prepare_tee_session dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
terminate_tee_session = (void (*)(struct test_ctx *ctx))dlsym(dlHandle_secure, "terminate_tee_session");
if (terminate_tee_session == NULL)
{
- LOGE("terminate_tee_session dlsym fail\n");
+ LOGE(GSW_TEE,"terminate_tee_session dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
read_secure_object = (TEEC_Result (*)(struct test_ctx *ctx, const char *id,char *data, size_t *data_len))dlsym(dlHandle_secure, "read_secure_object");
if (read_secure_object == NULL)
{
- LOGE("read_secure_object dlsym fail\n");
+ LOGE(GSW_TEE,"read_secure_object dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
write_secure_object = (TEEC_Result (*)(struct test_ctx *ctx, const char *id,char *data, size_t data_len))dlsym(dlHandle_secure, "write_secure_object");
if (write_secure_object == NULL)
{
- LOGE("write_secure_object dlsym fail\n");
+ LOGE(GSW_TEE,"write_secure_object dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
delete_secure_object = (TEEC_Result (*)(struct test_ctx *ctx, const char *id))dlsym(dlHandle_secure, "delete_secure_object");
if (delete_secure_object == NULL)
{
- LOGE("delete_secure_object dlsym fail\n");
+ LOGE(GSW_TEE,"delete_secure_object dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
@@ -238,15 +153,16 @@
*/
int32_t gsw_tee_sdk_init(void)
{
+ LOGE(GSW_TEE,"init start\n");
int32_t ret = 0;
ret = tee_api_import();
if(ret)
{
- LOGE("tee_api_import fail\n");
+ LOGE(GSW_TEE,"tee_api_import fail\n");
return ret;
}
ret = prepare_tee_session(&ctx);
- LOGE("init end\n");
+ LOGE(GSW_TEE,"init end\n");
return ret;
}
@@ -261,7 +177,7 @@
#define basic_buf_len 7000
int32_t gsw_tee_read_secure_data(const char* in_obj_name, char* out_buf, unsigned int* p_out_buf_len)
{
- LOGE("start read\n");
+ LOGE(GSW_TEE,"start read\n");
if (in_obj_name == NULL || out_buf == NULL)
{
return GSW_HAL_NORMAL_FAIL;
@@ -272,19 +188,19 @@
char *tmp_buf = (char*)malloc(basic_buf_len);
if (NULL == tmp_buf)
{
- LOGE("Failed malloc fail");
+ LOGE(GSW_TEE,"Failed malloc fail");
return GSW_HAL_NO_MEMORY;
}
TEEC_Result res = read_secure_object(&ctx, in_obj_name, tmp_buf, &size);
if (res != TEEC_SUCCESS)
{
- LOGE("Failed to read an object from the secure storage");
+ LOGE(GSW_TEE,"Failed to read an object from the secure storage");
ret = GSW_HAL_NORMAL_FAIL;
free(tmp_buf);
return ret;
}
- LOGE("really start end\n");
+ LOGE(GSW_TEE,"really start end\n");
memcpy(out_buf, tmp_buf, size);
*p_out_buf_len = size;
free(tmp_buf);
@@ -300,7 +216,7 @@
*/
int32_t gsw_tee_write_secure_data(const char* in_obj_name, char* in_buf, unsigned int in_buf_len)
{
- LOGE("write start\n");
+ LOGE(GSW_TEE,"write start\n");
if (in_obj_name == NULL || in_buf == NULL)
return GSW_HAL_NORMAL_FAIL;
int32_t ret = 0;
@@ -308,10 +224,10 @@
TEEC_Result res = write_secure_object(&ctx, in_obj_name,in_buf, in_buf_len);
if (res != TEEC_SUCCESS)
{
- LOGE("Failed to write an object from the secure storage");
+ LOGE(GSW_TEE,"Failed to write an object from the secure storage");
ret = GSW_HAL_NORMAL_FAIL;
}
- LOGE("write really end\n");
+ LOGE(GSW_TEE,"write really end\n");
return ret;
}
@@ -323,7 +239,7 @@
*/
int32_t gsw_tee_delete_secure_data(const char* in_obj_name)
{
- LOGE("delete start\n");
+ LOGE(GSW_TEE,"delete start\n");
if (in_obj_name == NULL)
return GSW_HAL_NORMAL_FAIL;
int32_t ret = 0;
@@ -331,10 +247,10 @@
TEEC_Result res = delete_secure_object(&ctx, in_obj_name);
if (res != TEEC_SUCCESS)
{
- LOGE("Failed to delete the object: 0x%x", res);
+ LOGE(GSW_TEE,"Failed to delete the object: 0x%x", res);
ret = GSW_HAL_NORMAL_FAIL;
}
- LOGE("delete really end\n");
+ LOGE(GSW_TEE,"delete really end\n");
return ret;
}
@@ -352,23 +268,23 @@
char *tmp_buf = (char*)malloc(basic_buf_len);
if (NULL == tmp_buf)
{
- LOGE("Failed malloc fail");
+ LOGE(GSW_TEE,"Failed malloc fail");
return GSW_HAL_NO_MEMORY;
}
TEEC_Result res = read_secure_object(&ctx, in_obj_name, tmp_buf, &size);
if (res == TEEC_ERROR_ITEM_NOT_FOUND)
{
- LOGE("the obj no found\n");
+ LOGE(GSW_TEE,"the obj no found\n");
ret = GSW_HAL_ERROR_TEE_SFS_FILE_NOEXIST;
}
else if (res == TEEC_SUCCESS)
{
- LOGE("the obj is exist\n");
+ LOGE(GSW_TEE,"the obj is exist\n");
ret = GSW_HAL_SUCCESS;
}
else
{
- LOGE("Failed to read an object from the secure storage");
+ LOGE(GSW_TEE,"Failed to read an object from the secure storage");
ret = GSW_HAL_NORMAL_FAIL;
}
free(tmp_buf);
@@ -383,7 +299,7 @@
*/
int32_t gsw_tee_sdk_deinit(void)
{
- LOGE("deinit start\n");
+ LOGE(GSW_TEE,"deinit start\n");
if (terminate_tee_session) {
terminate_tee_session(&ctx); // 终止TEE会话
terminate_tee_session = NULL;
@@ -398,7 +314,7 @@
dlclose(dlHandle_mbtk); // 卸载日志库
dlHandle_mbtk = NULL;
}
- LOGE("deinit end\n");
+ LOGE(GSW_TEE,"deinit end\n");
return GSW_HAL_SUCCESS;
}
@@ -414,7 +330,7 @@
s_init_flag = 0xAA55;
return GSW_HAL_SUCCESS;
}
- LOGE("secure sdk init fail!!!");
+ LOGE(GSW_TEE,"secure sdk init fail!!!");
return GSW_HAL_NORMAL_FAIL;
}
@@ -423,7 +339,7 @@
#if 0
if (NULL == objname || NULL == exist_state)
{
- LOGE("storage query input param error objname %p, exist_state %p",objname, exist_state);
+ LOGE(GSW_TEE,"storage query input param error objname %p, exist_state %p",objname, exist_state);
return GSW_HAL_ARG_INVALID;
}
int32_t ret = gsw_secure_init();
@@ -451,7 +367,7 @@
#if 0
if (NULL == objname || NULL == outbuf || NULL == outlen)
{
- LOGE("storage read input param error objname %p, outbuf %p, outlen %p",objname, outbuf, outlen);
+ LOGE(GSW_TEE,"storage read input param error objname %p, outbuf %p, outlen %p",objname, outbuf, outlen);
return GSW_HAL_ARG_INVALID;
}
int32_t ret = gsw_secure_init();
@@ -472,7 +388,7 @@
#if 0
if (NULL == objname || NULL == inbuf || 0 == inlen)
{
- LOGE("storage write input param error objname %p, outbuf %p, inlen %u",objname, inbuf, inlen);
+ LOGE(GSW_TEE,"storage write input param error objname %p, outbuf %p, inlen %u",objname, inbuf, inlen);
return GSW_HAL_ARG_INVALID;
}
int32_t ret = gsw_secure_init();
@@ -491,7 +407,7 @@
#if 0
if (NULL == objname)
{
- LOGE("storage delete input param error objname %p",objname);
+ LOGE(GSW_TEE,"storage delete input param error objname %p",objname);
return GSW_HAL_ARG_INVALID;
}
int32_t ret = gsw_secure_init();