[Feature][T108][task-view-1792][ril] log interface combine
Only Configure:No
Affected branchmaster
Affected module:ril
Is it affected on:asr
Self-test:Yes
Doc Update: No
Change-Id: I77ca80925ec875acfc32e791117b0cd795a2038a
diff --git a/mbtk/libgsw_lib/gsw_voice_interface.c b/mbtk/libgsw_lib/gsw_voice_interface.c
index e1dae08..4486816 100755
--- a/mbtk/libgsw_lib/gsw_voice_interface.c
+++ b/mbtk/libgsw_lib/gsw_voice_interface.c
@@ -4,6 +4,7 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
+#include "gsw_log_interface.h"
// mbtk includes
@@ -141,7 +142,6 @@
MBTK_VOICE_END_REASON_NORMAL_CALL_CLEARING,
MBTK_VOICE_END_REASON_NORMAL_UNSPECIFIED,
};
-
int gsw_global_end_reason = GSW_OTHER_END_NORMAL;
//----------------end_reason end------------
@@ -175,8 +175,6 @@
int (*mbtk_a_call_hang)(mbtk_info_handle_t* handle, int phone_id);
int (*mbtk_call_answer)(mbtk_info_handle_t* handle);
int (*mbtk_call_reg_get)(mbtk_info_handle_t* handle, mbtk_call_info_t *reg);
-static void (*mbtk_log)(int level, const char *format, ...);
-static void (*mbtk_log_init)(char *path, char *tag);
/*rtp begin*/
int (*mbtk_rtp_init)();
@@ -191,94 +189,8 @@
/*rtp end*/
-#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
-
#define GSW_VOICE "[HAL][GSW_VOICE]"
-#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_VOICE"" 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_VOICE"" 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_VOICE"" 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_VOICE"" 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_VOICE"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
#define MODULE_INIT_CHECK(init_flag) \
if(init_flag == 0) \
{ \
@@ -293,63 +205,63 @@
mbtk_rtp_init = (int (*)(void))dlsym(dlHandle_mbtk, "mbtk_rtp_init");
if (mbtk_rtp_init == NULL)
{
- LOGE("mbtk_rtp_init dlsym fail\n");
+ LOGE(GSW_VOICE,"mbtk_rtp_init dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_rtp_deinit = (int (*)(void))dlsym(dlHandle_mbtk, "mbtk_rtp_deinit");
if (mbtk_rtp_deinit == NULL)
{
- LOGE("mbtk_rtp_deinit dlsym fail\n");
+ LOGE(GSW_VOICE,"mbtk_rtp_deinit dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_rtp_enable = (int (*)(bool enable))dlsym(dlHandle_mbtk, "mbtk_rtp_enable");
if (mbtk_rtp_enable == NULL)
{
- LOGE("mbtk_rtp_enable dlsym fail\n");
+ LOGE(GSW_VOICE,"mbtk_rtp_enable dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_rtp_remote_ip_set = (int (*)(const char *ipv4))dlsym(dlHandle_mbtk, "mbtk_rtp_remote_ip_set");
if (mbtk_rtp_remote_ip_set == NULL)
{
- LOGE("mbtk_rtp_remote_ip_set dlsym fail\n");
+ LOGE(GSW_VOICE,"mbtk_rtp_remote_ip_set dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_rtp_server_port_set = (int (*)(int port))dlsym(dlHandle_mbtk, "mbtk_rtp_server_port_set");
if (mbtk_rtp_server_port_set == NULL)
{
- LOGE("mbtk_rtp_server_port_set dlsym fail\n");
+ LOGE(GSW_VOICE,"mbtk_rtp_server_port_set dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_rtp_client_port_set = (int (*)(int port))dlsym(dlHandle_mbtk, "mbtk_rtp_client_port_set");
if (mbtk_rtp_client_port_set == NULL)
{
- LOGE("mbtk_rtp_client_port_set dlsym fail\n");
+ LOGE(GSW_VOICE,"mbtk_rtp_client_port_set dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_rtp_sample_rate_set = (int (*)(int sample_rate))dlsym(dlHandle_mbtk, "mbtk_rtp_sample_rate_set");
if (mbtk_rtp_sample_rate_set == NULL)
{
- LOGE("mbtk_rtp_sample_rate_set dlsym fail\n");
+ LOGE(GSW_VOICE,"mbtk_rtp_sample_rate_set dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_rtp_channel_set = (int (*)(int channel))dlsym(dlHandle_mbtk, "mbtk_rtp_channel_set");
if (mbtk_rtp_channel_set == NULL)
{
- LOGE("mbtk_rtp_channel_set dlsym fail\n");
+ LOGE(GSW_VOICE,"mbtk_rtp_channel_set dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_rtp_vlan_set = (int (*)(const char *vlan))dlsym(dlHandle_mbtk, "mbtk_rtp_vlan_set");
if (mbtk_rtp_vlan_set == NULL)
{
- LOGE("mbtk_rtp_vlan_set dlsym fail\n");
+ LOGE(GSW_VOICE,"mbtk_rtp_vlan_set dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
@@ -366,64 +278,52 @@
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_info_handle_get = (mbtk_info_handle_t* (*)(void))dlsym(dlHandle_mbtk, "mbtk_info_handle_get");
if (mbtk_info_handle_get == NULL)
{
- LOGE("mbtk_info_handle_get dlsym fail\n");
+ LOGE(GSW_VOICE,"mbtk_info_handle_get dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_call_state_change_cb_reg = (int (*)(mbtk_info_handle_t* handle, mbtk_info_callback_func cb))dlsym(dlHandle_mbtk, "mbtk_call_state_change_cb_reg");
if(mbtk_call_state_change_cb_reg == NULL)
{
- LOGE("mbtk_call_state_change_cb_reg dlsym fail\n");
+ LOGE(GSW_VOICE,"mbtk_call_state_change_cb_reg dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_call_start = (int (*)(mbtk_info_handle_t* handle, char* phone_number))dlsym(dlHandle_mbtk, "mbtk_call_start");
if(mbtk_call_start == NULL)
{
- LOGE("mbtk_call_start dlsym fail\n");
+ LOGE(GSW_VOICE,"mbtk_call_start dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_call_answer = (int (*)(mbtk_info_handle_t* handle))dlsym(dlHandle_mbtk, "mbtk_call_answer");
if(mbtk_call_answer == NULL)
{
- LOGE("mbtk_call_answer dlsym fail\n");
+ LOGE(GSW_VOICE,"mbtk_call_answer dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_call_hang = (int (*)(mbtk_info_handle_t* handle))dlsym(dlHandle_mbtk, "mbtk_call_hang");
if(mbtk_call_hang == NULL)
{
- LOGE("mbtk_call_hang dlsym fail\n");
+ LOGE(GSW_VOICE,"mbtk_call_hang dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_a_call_hang = (int (*)(mbtk_info_handle_t* handle, int phone_id))dlsym(dlHandle_mbtk, "mbtk_a_call_hang");
if(mbtk_a_call_hang == NULL)
{
- LOGE("mbtk_a_call_hang dlsym fail\n");
+ LOGE(GSW_VOICE,"mbtk_a_call_hang dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_call_reg_get = (int (*)(mbtk_info_handle_t* handle, mbtk_call_info_t *reg))dlsym(dlHandle_mbtk, "mbtk_call_reg_get");
if(mbtk_call_reg_get == NULL)
{
- LOGE("mbtk_call_reg_get dlsym fail\n");
+ LOGE(GSW_VOICE,"mbtk_call_reg_get dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
@@ -432,7 +332,7 @@
static void end_reason_mbtk_to_gsw(char* mbtk_reason)
{
- LOGE("mbtk_reason:%s\n", mbtk_reason);
+ LOGE(GSW_VOICE,"mbtk_reason:%s\n", mbtk_reason);
gsw_global_end_reason = GSW_END_ABNORMAL;
int length=sizeof (g_normal_end_reason)/ sizeof(g_normal_end_reason[0]);
for(int i = 0; i<length; i++)
@@ -454,8 +354,8 @@
{
case MBTK_CLCC:
{
- LOGD("RING : %d, %d, %d, %d, %d, %s, %d, %d, end_reason:%s", reg->dir1, reg->dir, reg->state, reg->mode, reg->mpty, reg->phone_number, reg->type, reg->disconnected_id, reg->end_reason);
- //printf("RING : %d, %d, %d, %d, %d, %s, %d, %d, end_reason:%s\n", reg->dir1, reg->dir, reg->state, reg->mode, reg->mpty, reg->phone_number, reg->type, reg->disconnected_id, reg->end_reason);
+ LOGD(GSW_VOICE,"RING : %d, %d, %d, %d, %d, %s, %d, %d, end_reason:%s", reg->dir1, reg->dir, reg->state, reg->mode, reg->mpty, reg->phone_number, reg->type, reg->disconnected_id, reg->end_reason);
+ printf("RING : %d, %d, %d, %d, %d, %s, %d, %d, end_reason:%s\n", reg->dir1, reg->dir, reg->state, reg->mode, reg->mpty, reg->phone_number, reg->type, reg->disconnected_id, reg->end_reason);
switch(reg->state)
{
case 0:
@@ -495,9 +395,9 @@
break;
case MBTK_DISCONNECTED:
{
- LOGD("RING : call dis connected!");
- LOGD("RING : %d, %d, %d, %d, %d, %s, %d, %d, end_reason:%s", reg->dir1, reg->dir, reg->state, reg->mode, reg->mpty, reg->phone_number, reg->type, reg->disconnected_id, reg->end_reason);
- //printf("RING : %d, %d, %d, %d, %d, %s, %d, %d, end_reason:%s\n", reg->dir1, reg->dir, reg->state, reg->mode, reg->mpty, reg->phone_number, reg->type, reg->disconnected_id, reg->end_reason);
+ LOGD(GSW_VOICE,"RING : call dis connected!");
+ LOGD(GSW_VOICE,"RING : %d, %d, %d, %d, %d, %s, %d, %d, end_reason:%s", reg->dir1, reg->dir, reg->state, reg->mode, reg->mpty, reg->phone_number, reg->type, reg->disconnected_id, reg->end_reason);
+ printf("RING : %d, %d, %d, %d, %d, %s, %d, %d, end_reason:%s\n", reg->dir1, reg->dir, reg->state, reg->mode, reg->mpty, reg->phone_number, reg->type, reg->disconnected_id, reg->end_reason);
state_t = GSW_VOICE_CALL_END;
call_id_t = reg->dir1;
end_reason_mbtk_to_gsw((char *)reg->end_reason);
@@ -508,37 +408,37 @@
}
break;
case MBTK_CPAS:
- LOGD("CALL : Call state = %d", reg->pas);
+ LOGD(GSW_VOICE,"CALL : Call state = %d", reg->pas);
switch (reg->pas)
{
case MBTK_CALL_RADY:
- LOGD("CALL: call READY");
+ LOGD(GSW_VOICE,"CALL: call READY");
break;
case MBTK_CALL_UNAVAILABLE:
- LOGD("CALL: call unavaliable");
+ LOGD(GSW_VOICE,"CALL: call unavaliable");
break;
case MBTK_CALL_UNKNOWN:
- LOGD("CALL: call unknown");
+ LOGD(GSW_VOICE,"CALL: call unknown");
break;
case MBTK_CALL_RINGING:
- LOGD("CALL: call ringing");
+ LOGD(GSW_VOICE,"CALL: call ringing");
break;
case MBTK_CALL_PROGRESS:
- LOGD("CALL: call progress");
+ LOGD(GSW_VOICE,"CALL: call progress");
break;
case MBTK_CALL_ASLEEP:
- LOGD("CALL: call asleep");
+ LOGD(GSW_VOICE,"CALL: call asleep");
break;
case MBTK_CALL_ACTIVE:
- LOGD("CALL: call active");
+ LOGD(GSW_VOICE,"CALL: call active");
break;
default:
- //LOGE("\r\n");
+ //LOGE(GSW_VOICE,"\r\n");
break;
}
break;
default:
- LOGE("RING : None call_wait = %d", reg->call_wait);
+ LOGE(GSW_VOICE,"RING : None call_wait = %d", reg->call_wait);
break;
}
}
@@ -561,26 +461,20 @@
if(ind == NULL)
{
- LOGE("parameter is null\n");
+ LOGE(GSW_VOICE,"parameter is null\n");
return GSW_HAL_ARG_INVALID;
}
ret = mbtk_call_api_import();
if(ret != 0)
{
- if(mbtk_log != NULL)
- {
- LOGE("[gsw_voice_sdk_init]mbtk_call_api_import fail\n");
- }
+ LOGE(GSW_VOICE,"[gsw_voice_sdk_init]mbtk_call_api_import fail\n");
return GSW_HAL_NORMAL_FAIL;
}
- mbtk_log_init("syslog", "MBTK_RIL");
-
-
if(ret < 0)
{
- LOGE("mbtk_call_api_import fail,ret = %d\n",ret);
+ LOGE(GSW_VOICE,"mbtk_call_api_import fail,ret = %d\n",ret);
return GSW_HAL_NORMAL_FAIL;
}
@@ -588,7 +482,7 @@
if(ret!=0)
{
- LOGE("[gsw_voice_sdk_init]mbtk_rtp_init fail\n");
+ LOGE(GSW_VOICE,"[gsw_voice_sdk_init]mbtk_rtp_init fail\n");
return GSW_HAL_NORMAL_FAIL;
}
@@ -597,12 +491,12 @@
call_info_handle = mbtk_info_handle_get();
if(call_info_handle != NULL)
{
- LOGE("create gsw_voice_sdk_init success\n");
+ LOGE(GSW_VOICE,"create gsw_voice_sdk_init success\n");
ret = mbtk_call_state_change_cb_reg(call_info_handle, gsw_call_state_change_cb);
if(ret)
{
- LOGE("mbtk_call_state_change_cb_reg fail,ret = %d\n",ret);
+ LOGE(GSW_VOICE,"mbtk_call_state_change_cb_reg fail,ret = %d\n",ret);
(void) mbtk_rtp_deinit();
return GSW_HAL_NORMAL_FAIL;
}
@@ -610,7 +504,7 @@
{
gsw_voice_init_flag = 1;
gsw_voice_callback = ind;
- LOGE("create gsw_voice_sdk_init success\n");
+ LOGE(GSW_VOICE,"create gsw_voice_sdk_init success\n");
return GSW_HAL_SUCCESS;
}
@@ -619,7 +513,7 @@
else
{
(void) mbtk_rtp_deinit();
- LOGE("create gsw_voice_sdk_init fail\n");
+ LOGE(GSW_VOICE,"create gsw_voice_sdk_init fail\n");
return GSW_HAL_NORMAL_FAIL;
}
}
@@ -646,7 +540,7 @@
if(volume < 1 || volume > 7)
{
- LOGE("Error volume : %d", volume);
+ LOGE(GSW_VOICE,"Error volume : %d", volume);
return GSW_HAL_NORMAL_FAIL;
}
else
@@ -684,12 +578,12 @@
int err = system(cmd);
if ((err != -1) && (err != 127))
{
- LOGE("Set success.");
+ LOGE(GSW_VOICE,"Set success.");
level_call = volume;
}
else
{
- LOGE("Error : %d", err);
+ LOGE(GSW_VOICE,"Error : %d", err);
return GSW_HAL_NORMAL_FAIL;
}
@@ -712,13 +606,13 @@
if(handle == NULL)
{
- LOGE("handle is null\n");
+ LOGE(GSW_VOICE,"handle is null\n");
return GSW_HAL_ARG_INVALID;
}
if(callNumber == NULL)
{
- LOGE("callNumber is null\n");
+ LOGE(GSW_VOICE,"callNumber is null\n");
return GSW_HAL_ARG_INVALID;
}
@@ -727,15 +621,15 @@
if(ret != 0)
{
- LOGE("mbtk_call_start fail,ret = %d\n",ret);
+ LOGE(GSW_VOICE,"mbtk_call_start fail,ret = %d\n",ret);
return GSW_HAL_NORMAL_FAIL;
}
//get call id
mbtk_call_reg_get(call_info_handle, ®);
- LOGE("call id = %d\n",reg.dir1);
+ LOGE(GSW_VOICE,"call id = %d\n",reg.dir1);
*handle = reg.dir1;
- LOGE("gsw_voice_normal_voice_start id = %d\n", (int)*handle);
+ LOGE(GSW_VOICE,"gsw_voice_normal_voice_start id = %d\n", (int)*handle);
return GSW_HAL_SUCCESS;
@@ -759,12 +653,12 @@
if(ret != 0)
{
- LOGE("mbtk_call_answer fail,ret = %d\n", ret);
+ LOGE(GSW_VOICE,"mbtk_call_answer fail,ret = %d\n", ret);
return GSW_HAL_NORMAL_FAIL;
}
else
{
- LOGE("mbtk_call_answer success\n");
+ LOGE(GSW_VOICE,"mbtk_call_answer success\n");
}
return GSW_HAL_SUCCESS;
@@ -787,12 +681,12 @@
if(ret != 0)
{
- LOGE("mbtk_a_call_hang fail,ret = %d\n", ret);
+ LOGE(GSW_VOICE,"mbtk_a_call_hang fail,ret = %d\n", ret);
return GSW_HAL_NORMAL_FAIL;
}
else
{
- LOGE("mbtk_a_call_hang success\n");
+ LOGE(GSW_VOICE,"mbtk_a_call_hang success\n");
}
return GSW_HAL_SUCCESS;
@@ -815,12 +709,12 @@
ret = mbtk_call_answer(call_info_handle);
if(ret != 0)
{
- LOGE("mbtk_call_answer fail,ret = %d\n", ret);
+ LOGE(GSW_VOICE,"mbtk_call_answer fail,ret = %d\n", ret);
return GSW_HAL_NORMAL_FAIL;
}
else
{
- LOGE("mbtk_call_answer success\n");
+ LOGE(GSW_VOICE,"mbtk_call_answer success\n");
}
}