[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_eu_ecall_interface.c b/mbtk/libgsw_lib/gsw_eu_ecall_interface.c
index 599d240..b25bbb0 100755
--- a/mbtk/libgsw_lib/gsw_eu_ecall_interface.c
+++ b/mbtk/libgsw_lib/gsw_eu_ecall_interface.c
@@ -12,101 +12,14 @@
#include <pthread.h>
#include "gsw_eu_ecall_interface.h"
+#include "gsw_log_interface.h"
+
#define RIL_MAX_NUMBER_LEN 40
#define MBTK_ECALL_MSD_LEN_MAX 600
-#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_ECALL "[HAL][GSW_ECALL]"
-#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--; \
- } \
- fun_ptr_log(LOG_VERBOSE_LEVEL, "%s#%s: "GSW_ECALL"" 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--; \
- } \
- fun_ptr_log(LOG_INFO_LEVEL, "%s#%s: "GSW_ECALL"" 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--; \
- } \
- fun_ptr_log(LOG_DEBUG_LEVEL, "%s#%s: "GSW_ECALL"" 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--; \
- } \
- fun_ptr_log(LOG_WARN_LEVEL, "%s#%s: "GSW_ECALL"" 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--; \
- } \
- fun_ptr_log(LOG_ERR_LEVEL, "%s#%s: "GSW_ECALL"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-typedef void (*mbtk_log)(int level, const char *format,...);
-
-
typedef unsigned int uint32;
typedef unsigned char uint8;
typedef unsigned short uint16;
@@ -415,12 +328,10 @@
//static mbtk_info_handle_t* ecall_info_handle = NULL;
-typedef void (*mbtk_log_init)(char *path, char *tag);
-static mbtk_log_init mbtk_log_init_ptr = NULL;
+
static void *handle = NULL;
-typedef void (*mbtk_log)(int level, const char *format,...);
-static mbtk_log fun_ptr_log = NULL;
+
static int ecall_init_flag = 0;
static mbtk_info_handle_t* ecall_info_handle = NULL;
@@ -451,7 +362,6 @@
{
dlclose(handle);
handle = NULL;
- mbtk_log_init_ptr = NULL;
mbtk_info_handle_get_ptr=NULL;
mbtk_info_handle_free_ptr=NULL;
mbtk_ecall_msd_set_ptr=NULL;
@@ -467,7 +377,6 @@
gsw_eu_ecall_event_cb=NULL;
g_setevent_cb=false;
mbtk_ecall_only_set_ptr = NULL;
- fun_ptr_log=NULL;
}
@@ -480,24 +389,6 @@
return GSW_HAL_NORMAL_FAIL;
}
- if(fun_ptr_log == NULL)
- {
- fun_ptr_log = (mbtk_log)dlsym(handle, "mbtk_log");
- if(fun_ptr_log == NULL)
- {
- return GSW_HAL_NORMAL_FAIL;
- }
- }
-
- if(mbtk_log_init_ptr == NULL)
- {
- mbtk_log_init_ptr = (mbtk_log_init)dlsym(handle, "mbtk_log_init");
- if(mbtk_log_init_ptr == NULL)
- {
- return GSW_HAL_NORMAL_FAIL;
- }
- }
-
if(mbtk_info_handle_get_ptr == NULL)
{
mbtk_info_handle_get_ptr = (mbtk_info_handle_get)dlsym(handle, "mbtk_info_handle_get");
@@ -615,37 +506,37 @@
{
case MBTK_CLCC:
{
- LOGD("RING : %d, %d, %d, %d, %d, %s, %d, %d", reg->dir1, reg->dir, reg->state, reg->mode, reg->mpty, reg->phone_number, reg->type, reg->disconnected_id);
+ LOGD(GSW_ECALL,"RING : %d, %d, %d, %d, %d, %s, %d, %d", reg->dir1, reg->dir, reg->state, reg->mode, reg->mpty, reg->phone_number, reg->type, reg->disconnected_id);
switch(reg->state)
{
case 0:
state_t = 0;
- LOGD("reg->state = GSW_VOICE_CALL_CONNECTED ");
+ LOGD(GSW_ECALL,"reg->state = GSW_VOICE_CALL_CONNECTED ");
break;
case 1:
//state_t = GSW_VOICE_CALL_HOLDING;
- LOGD("reg->state = GSW_VOICE_CALL_HOLDING ");
+ LOGD(GSW_ECALL,"reg->state = GSW_VOICE_CALL_HOLDING ");
break;
case 2:
//state_t = GSW_VOICE_CALL_DIALING;
- LOGD("reg->state = GSW_VOICE_CALL_DIALING ");
+ LOGD(GSW_ECALL,"reg->state = GSW_VOICE_CALL_DIALING ");
break;
case 3:
//state_t = GSW_VOICE_CALL_ALERTING;
- LOGD("reg->state = GSW_VOICE_CALL_ALERTING ");
+ LOGD(GSW_ECALL,"reg->state = GSW_VOICE_CALL_ALERTING ");
break;
case 4:
//state_t = GSW_VOICE_CALL_INCOMING;
- LOGD("reg->state = GSW_VOICE_CALL_INCOMING ");
+ LOGD(GSW_ECALL,"reg->state = GSW_VOICE_CALL_INCOMING ");
break;
case 5:
//state_t = GSW_VOICE_CALL_WAITING;
- LOGD("reg->state = GSW_VOICE_CALL_WAITING ");
+ LOGD(GSW_ECALL,"reg->state = GSW_VOICE_CALL_WAITING ");
break;
case 6:
//state_t = GSW_VOICE_CALL_END;
- LOGD("reg->state = GSW_VOICE_CALL_END ");
+ LOGD(GSW_ECALL,"reg->state = GSW_VOICE_CALL_END ");
break;
}
@@ -654,7 +545,7 @@
break;
default:
- LOGE("RING : None call_wait = %d", reg->call_wait);
+ LOGE(GSW_ECALL,"RING : None call_wait = %d", reg->call_wait);
break;
}
}
@@ -675,13 +566,11 @@
{
return GSW_HAL_NORMAL_FAIL;
}
-
- mbtk_log_init_ptr("syslog", "GSW_ECALL");
ecall_info_handle = mbtk_info_handle_get_ptr();
if(ecall_info_handle == NULL)
{
- LOGE("mbtk_info_handle_get_ptr fail!!!");
+ LOGE(GSW_ECALL,"mbtk_info_handle_get_ptr fail!!!");
return GSW_HAL_NORMAL_FAIL;
}
@@ -692,7 +581,7 @@
ret = mbtk_call_state_change_cb_reg_ptr(ecall_info_handle, gsw_call_state_change_cb);
if(ret < 0)
{
- LOGE("mbtk_call_state_change_cb_reg_ptr failed");
+ LOGE(GSW_ECALL,"mbtk_call_state_change_cb_reg_ptr failed");
return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -711,7 +600,7 @@
int ret = -1;
if(ecall_info_handle == NULL || ecall_init_flag ==0)
{
- LOGE("No init can not deinit");
+ LOGE(GSW_ECALL,"No init can not deinit");
return GSW_HAL_NORMAL_FAIL;
}
@@ -727,7 +616,7 @@
ret = mbtk_info_handle_free_ptr(&ecall_info_handle);
if(ret < 0 )
{
- LOGE("mbtk_info_handle_free handle faile");
+ LOGE(GSW_ECALL,"mbtk_info_handle_free handle faile");
}
ecall_info_handle = NULL;
ecall_init_flag = 0;
@@ -814,7 +703,7 @@
ret=mbtk_ecall_only_set_ptr(ecall_info_handle,&only_info);
if (ret != 0)
{
- LOGE("mbtk_ecall_only_set_success failed");
+ LOGE(GSW_ECALL,"mbtk_ecall_only_set_success failed");
return GSW_HAL_NORMAL_FAIL;
}
@@ -822,7 +711,7 @@
ret= mbtk_ecall_msd_set_ptr(ecall_info_handle,(const void*)msd_data);
if (ret != 0)
{
- LOGE("mbtk_ecall_msd_set_ptr failed");
+ LOGE(GSW_ECALL,"mbtk_ecall_msd_set_ptr failed");
return GSW_HAL_NORMAL_FAIL;
}
@@ -830,7 +719,7 @@
ret= mbtk_ecall_dial_start_ptr(ecall_info_handle,ecall_type);
if (ret != 0)
{
- LOGE("mbtk_ecall_dial_start_ptr failed");
+ LOGE(GSW_ECALL,"mbtk_ecall_dial_start_ptr failed");
return GSW_HAL_NORMAL_FAIL;
}
@@ -840,7 +729,7 @@
{
g_msd_send_status = GSW_EU_ECALL_MSD_TRANS_STATUS_FAILURE;
mbtk_send_singnal();
- LOGE("mbtk_ecall_push_ptr failed");
+ LOGE(GSW_ECALL,"mbtk_ecall_push_ptr failed");
return GSW_HAL_NORMAL_FAIL;
}
@@ -868,7 +757,7 @@
ret = mbtk_ecall_dial_start_ptr(ecall_info_handle,MBTK_ECALL_DIAL_TYPE_RELEASE);
if(ret != 0)
{
- LOGE("hangup ecall faile ");
+ LOGE(GSW_ECALL,"hangup ecall faile ");
return GSW_HAL_NORMAL_FAIL;
}
@@ -900,7 +789,7 @@
ret = mbtk_ecall_msd_set_ptr(ecall_info_handle,(const void*)msd_data);
if (ret != 0)
{
- LOGE("mbtk_ecall_msd_get_ptr failed");
+ LOGE(GSW_ECALL,"mbtk_ecall_msd_get_ptr failed");
return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -941,7 +830,7 @@
if(ecall_info_handle==NULL || p_config == NULL)
{
- LOGE("mbtk_ecall_cfg_get() fail.");
+ LOGE(GSW_ECALL,"mbtk_ecall_cfg_get() fail.");
return GSW_HAL_NO_MEMORY;
}
@@ -962,7 +851,7 @@
{
if(ecall_info_handle == NULL || p_config == NULL)
{
- LOGE("gsw_eu_ecall_setConfig no init");
+ LOGE(GSW_ECALL,"gsw_eu_ecall_setConfig no init");
return GSW_HAL_NO_MEMORY;
}
@@ -990,7 +879,7 @@
ret = mbtk_ecall_cfg_set_ptr(ecall_info_handle, &cfg_info);
if (ret < 0)
{
- LOGE("mbtk_ecall_cfg_set_ptr fail");
+ LOGE(GSW_ECALL,"mbtk_ecall_cfg_set_ptr fail");
return GSW_HAL_NORMAL_FAIL;
}
return GSW_HAL_SUCCESS;
@@ -1009,7 +898,7 @@
{
case MBTK_ECALL_URC_ID_MSD_REQ:
{
- LOGD("MBTK_ECALL_URC_ID_MSD_REQ");
+ LOGD(GSW_ECALL,"MBTK_ECALL_URC_ID_MSD_REQ");
event.process = GSW_EU_ECALL_EVENT_PROCESS_IVS_START_RECEIVED_MSD;
event.msdupdate = GSW_EU_ECALL_EVENT_MSDUPDATE_PSAP_REQURE_UPDATE_MSD;
event.extend_state = GSW_EU_ECALL_EVENT_EXTEND_STATE_NONE;
@@ -1018,7 +907,7 @@
}
case MBTK_ECALL_URC_ID_MSD_SEND_START:
{
- LOGD("MBTK_ECALL_URC_ID_MSD_SEND_START");
+ LOGD(GSW_ECALL,"MBTK_ECALL_URC_ID_MSD_SEND_START");
event.process = GSW_EU_ECALL_EVENT_PROCESS_IVS_START_RECEIVED_MSD;
event.msdupdate = GSW_EU_ECALL_EVENT_MSDUPDATE_PSAP_REQURE_UPDATE_MSD;
@@ -1028,7 +917,7 @@
}
case MBTK_ECALL_URC_ID_NACK:
{
- LOGD("MBTK_ECALL_URC_ID_NACK");
+ LOGD(GSW_ECALL,"MBTK_ECALL_URC_ID_NACK");
event.process = GSW_EU_ECALL_EVENT_PROCESS_IVS_NACK_RECEIVED;
event.msdupdate = GSW_EU_ECALL_EVENT_MSDUPADTE_NONE;
@@ -1038,7 +927,7 @@
}
case MBTK_ECALL_URC_ID_LLACK:
{
- LOGD("MBTK_ECALL_URC_ID_LLACK");
+ LOGD(GSW_ECALL,"MBTK_ECALL_URC_ID_LLACK");
event.process = GSW_EU_ECALL_EVENT_PROCESS_IVS_ACK_RECEIVED;
event.msdupdate = GSW_EU_ECALL_EVENT_MSDUPADTE_NONE;
@@ -1050,7 +939,7 @@
}
case MBTK_ECALL_URC_ID_HLACK:
{
- LOGD("MBTK_ECALL_URC_ID_HLACK");
+ LOGD(GSW_ECALL,"MBTK_ECALL_URC_ID_HLACK");
event.fail = GSW_EU_ECALL_EVENT_FAIL_NONE;
event.process = GSW_EU_ECALL_EVENT_PROCESS_IVS_HLACK_RECEIVED;
@@ -1063,12 +952,12 @@
}
case MBTK_ECALL_URC_ID_ALACK:
{
- LOGD("MBTK_ECALL_URC_ID_ALACK");
+ LOGD(GSW_ECALL,"MBTK_ECALL_URC_ID_ALACK");
event.extend_state = GSW_EU_ECALL_EVENT_EXTEND_STATE_IVS_ALACK_RECEIVED;
}
case MBTK_ECALL_URC_ID_MSD_UPDATE_DONE:
{
- LOGD("MBTK_ECALL_URC_ID_MSD_UPDATE_DONE");
+ LOGD(GSW_ECALL,"MBTK_ECALL_URC_ID_MSD_UPDATE_DONE");
event.process = GSW_EU_ECALL_EVENT_PROCESS_IVS_NONE;
event.msdupdate = GSW_EU_ECALL_EVENT_MSDUPADTE_NONE;
event.extend_state = GSW_EU_ECALL_EVENT_EXTEND_STATE_NONE;
@@ -1079,7 +968,7 @@
case MBTK_ECALL_URC_ID_T6_EXPIRED:
case MBTK_ECALL_URC_ID_T7_EXPIRED:
{
- LOGD("MBTK_ECALL_URC_ID_T5_EXPIRED | MBTK_ECALL_URC_ID_T5_EXPIRED | MBTK_ECALL_URC_ID_T7_EXPIRED");
+ LOGD(GSW_ECALL,"MBTK_ECALL_URC_ID_T5_EXPIRED | MBTK_ECALL_URC_ID_T5_EXPIRED | MBTK_ECALL_URC_ID_T7_EXPIRED");
event.msdupdate = GSW_EU_ECALL_EVENT_MSDUPDATE_IVS_UPDATE_MSD_TIMEOUT;
event.extend_state = GSW_EU_ECALL_EVENT_EXTEND_STATE_NONE;
event.establish = GSW_EU_ECALL_EVENT_ESTABLISH_SUCCESS;
@@ -1090,19 +979,19 @@
case MBTK_ECALL_URC_ID_3GPP_FATAL:
case MBTK_ECALL_URC_ID_GENERIC:
{
- LOGD("MBTK_ECALL_URC_ID_GENERIC|MBTK_ECALL_URC_ID_3GPP_FATAL");
+ LOGD(GSW_ECALL,"MBTK_ECALL_URC_ID_GENERIC|MBTK_ECALL_URC_ID_3GPP_FATAL");
event.extend_state = GSW_EU_ECALL_EVENT_EXTEND_STATE_NONE;
}
case MBTK_ECALL_URC_ID_MSD_UPDATE_ERR:
{
- LOGD("MBTK_ECALL_URC_ID_MSD_UPDATE_ERR");
+ LOGD(GSW_ECALL,"MBTK_ECALL_URC_ID_MSD_UPDATE_ERR");
event.msdupdate = GSW_EU_ECALL_EVENT_MSDUPDATE_IVS_UPDATE_MSD_TIMEOUT;
}
default:
{
- LOGE("No process urc_id : %d", ecall_data->urc_id);
+ LOGE(GSW_ECALL,"No process urc_id : %d", ecall_data->urc_id);
break;
}
}
@@ -1136,7 +1025,7 @@
if(ret < 0)
{
- LOGE("mbtk_ecall_state_change_cb_reg_ptr failed");
+ LOGE(GSW_ECALL,"mbtk_ecall_state_change_cb_reg_ptr failed");
return GSW_HAL_NORMAL_FAIL;
}
g_setevent_cb = true;
@@ -1185,7 +1074,7 @@
ret = pthread_create(&gsw_ecall_status_cb_thread, NULL, ecall_msd_status_cb_thread, NULL);
if(ret < 0)
{
- LOGE("pthread_create failed");
+ LOGE(GSW_ECALL,"pthread_create failed");
g_thread_running = false;
return GSW_HAL_NORMAL_FAIL;
}