[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_data_interface.c b/mbtk/libgsw_lib/gsw_data_interface.c
index b12841e..96e893c 100755
--- a/mbtk/libgsw_lib/gsw_data_interface.c
+++ b/mbtk/libgsw_lib/gsw_data_interface.c
@@ -9,6 +9,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <pthread.h>
+#include "gsw_log_interface.h"
//mbtk include
@@ -146,98 +147,9 @@
int (*mbtk_data_call_state_get)(mbtk_info_handle_t* handle, int cid, mbtk_ipv4_info_t *ipv4, mbtk_ipv6_info_t *ipv6);
int (*mbtk_apn_set)(mbtk_info_handle_t* handle, int cid, mbtk_ip_type_enum ip_type, const void* apn_name, const void *user_name, const void *user_pass, const void *auth);
int (*ipv6_2_str)(const void *ipv6, void *ipv6_str);
-static void (*mbtk_log)(int level, const char *format, ...);
-static void (*mbtk_log_init)(char *path, char *tag);
-
-#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_DATA "[HAL][GSW_DATA]"
-#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_DATA"" 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_DATA"" 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_DATA"" 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_DATA"" 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_DATA"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-
//define
#define lib_mbtk_path "/lib/libmbtk_lib.so"
pthread_mutex_t data_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -253,7 +165,7 @@
(*linkState) = (Wan_State_ind_s *)malloc(sizeof(Wan_State_ind_s));
if((*linkState) == NULL)
{
- LOGE("malloc Wan_State_ind_s fail\n");
+ LOGE(GSW_DATA,"malloc Wan_State_ind_s fail\n");
return GSW_HAL_NORMAL_FAIL;
}
@@ -298,7 +210,7 @@
{
if ((*linkState) == NULL)
{
- LOGE("(*linkState) is null\n");
+ LOGE(GSW_DATA,"(*linkState) is null\n");
return GSW_HAL_NORMAL_FAIL;
}
@@ -343,79 +255,67 @@
{
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_DATA,"mbtk_info_handle_get dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_info_handle_free = (int (*)(mbtk_info_handle_t** handle))dlsym(dlHandle_mbtk, "mbtk_info_handle_free");
if (mbtk_info_handle_free == NULL)
{
- LOGE("mbtk_info_handle_free dlsym fail\n");
+ LOGE(GSW_DATA,"mbtk_info_handle_free dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_pdp_state_change_cb_reg = (int (*)(mbtk_info_handle_t* handle, mbtk_info_callback_func cb))dlsym(dlHandle_mbtk, "mbtk_pdp_state_change_cb_reg");
if (mbtk_pdp_state_change_cb_reg == NULL)
{
- LOGE("mbtk_pdp_state_change_cb_reg dlsym fail\n");
+ LOGE(GSW_DATA,"mbtk_pdp_state_change_cb_reg dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_qser_apn_set = (int (*)(mbtk_info_handle_t* handle, mbtk_qser_apn_info_s *apninfo, unsigned char *cid))dlsym(dlHandle_mbtk, "mbtk_qser_apn_set");
if (mbtk_qser_apn_set == NULL)
{
- LOGE("mbtk_qser_apn_set dlsym fail\n");
+ LOGE(GSW_DATA,"mbtk_qser_apn_set dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_data_call_start = (int (*)(mbtk_info_handle_t* handle, int cid, int auto_conn_interval, bool boot_conn, int timeout))dlsym(dlHandle_mbtk, "mbtk_data_call_start");
if (mbtk_data_call_start == NULL)
{
- LOGE("mbtk_data_call_start dlsym fail\n");
+ LOGE(GSW_DATA,"mbtk_data_call_start dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_data_call_stop = (int (*)(mbtk_info_handle_t* handle, int cid, int timeout))dlsym(dlHandle_mbtk, "mbtk_data_call_stop");
if (mbtk_data_call_stop == NULL)
{
- LOGE("mbtk_data_call_stop dlsym fail\n");
+ LOGE(GSW_DATA,"mbtk_data_call_stop dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_data_call_state_get = (int (*)(mbtk_info_handle_t* handle, int cid, mbtk_ipv4_info_t *ipv4, mbtk_ipv6_info_t *ipv6))dlsym(dlHandle_mbtk, "mbtk_data_call_state_get");
if (mbtk_data_call_state_get == NULL)
{
- LOGE("mbtk_data_call_state_get dlsym fail\n");
+ LOGE(GSW_DATA,"mbtk_data_call_state_get dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_apn_set = (int (*)(mbtk_info_handle_t* handle, int cid, mbtk_ip_type_enum ip_type, const void* apn_name, const void *user_name, const void *user_pass, const void *auth))dlsym(dlHandle_mbtk, "mbtk_apn_set");
if (mbtk_apn_set == NULL)
{
- LOGE("mbtk_apn_set dlsym fail\n");
+ LOGE(GSW_DATA,"mbtk_apn_set dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
ipv6_2_str = (int (*)(const void *ipv6, void *ipv6_str))dlsym(dlHandle_mbtk, "ipv6_2_str");
if (ipv6_2_str == NULL)
{
- LOGE("ipv6_2_str dlsym fail\n");
+ LOGE(GSW_DATA,"ipv6_2_str dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
@@ -447,63 +347,63 @@
}
//ip
- LOGD("ipv4.valid = %d", ipv4->valid);
+ LOGD(GSW_DATA,"ipv4.valid = %d", ipv4->valid);
if(ipv4->valid)
{
if(linkState==NULL)
{
- LOGE("linkState is NULL");
+ LOGE(GSW_DATA,"linkState is NULL");
return GSW_HAL_NORMAL_FAIL;
}
//parse ipv4_addr,gw,dns,sdns
if(inet_ntop(AF_INET, &(ipv4->IPAddr), linkState->v4_ip , GSW_PDP_ADDR_MAX_LEN) == NULL) {
- LOGE("IPv4 error");
+ LOGE(GSW_DATA,"IPv4 error");
} else {
- LOGD("IPv4 : %s", linkState->v4_ip);
+ LOGD(GSW_DATA,"IPv4 : %s", linkState->v4_ip);
}
if(inet_ntop(AF_INET, &(ipv4->GateWay), linkState->v4_gw , GSW_PDP_ADDR_MAX_LEN) == NULL) {
- LOGE("GateWay error");
+ LOGE(GSW_DATA,"GateWay error");
} else {
- LOGE("GateWay : %s", linkState->v4_gw);
+ LOGE(GSW_DATA,"GateWay : %s", linkState->v4_gw);
}
if(inet_ntop(AF_INET, &(ipv4->PrimaryDNS), linkState->v4_pdns , GSW_DNS_ADDR_MAX_LEN) == NULL) {
- LOGE("PrimaryDNS error");
+ LOGE(GSW_DATA,"PrimaryDNS error");
} else {
- LOGD("PrimaryDNS : %s", linkState->v4_pdns);
+ LOGD(GSW_DATA,"PrimaryDNS : %s", linkState->v4_pdns);
}
if(inet_ntop(AF_INET, &(ipv4->SecondaryDNS), linkState->v4_sdns , GSW_DNS_ADDR_MAX_LEN) == NULL) {
- LOGE("SecondaryDNS error");
+ LOGE(GSW_DATA,"SecondaryDNS error");
} else {
- LOGD("SecondaryDNS : %s", linkState->v4_sdns);
+ LOGD(GSW_DATA,"SecondaryDNS : %s", linkState->v4_sdns);
}
}
- LOGD("ipv6.valid = %d", ipv6->valid);
+ LOGD(GSW_DATA,"ipv6.valid = %d", ipv6->valid);
if(ipv6->valid)
{
//parse ipv6_addr,gw,dns,sdns
if(ipv6_2_str(&(ipv6->IPV6Addr), linkState->v6_ip)) {
- LOGE("IPv6 error");
+ LOGE(GSW_DATA,"IPv6 error");
} else {
- LOGD("IPv6 : %s", linkState->v6_ip);
+ LOGD(GSW_DATA,"IPv6 : %s", linkState->v6_ip);
}
if(ipv6_2_str(&(ipv6->PrimaryDNS), linkState->v6_pdns)) {
- LOGE("PrimaryDNS error");
+ LOGE(GSW_DATA,"PrimaryDNS error");
} else {
- LOGD("PrimaryDNS : %s", linkState->v6_pdns);
+ LOGD(GSW_DATA,"PrimaryDNS : %s", linkState->v6_pdns);
}
if(ipv6_2_str(&(ipv6->SecondaryDNS), linkState->v6_sdns)) {
- LOGE("SecondaryDNS error");
+ LOGE(GSW_DATA,"SecondaryDNS error");
} else {
- LOGD("SecondaryDNS : %s", linkState->v6_sdns);
+ LOGD(GSW_DATA,"SecondaryDNS : %s", linkState->v6_sdns);
}
}
@@ -513,32 +413,32 @@
static void data_call_state_change_cb(const void* data, int data_len)
{
- LOGE("data_call_state_change_cb() start\n");
+ LOGE(GSW_DATA,"data_call_state_change_cb() start\n");
if(data == NULL || data_len != sizeof(mbtk_pdp_cb_info_s))
{
- LOGE("data = [NULL], data_len(%d) != sizeof(mbtk_pdp_cb_info_s)(%d)", data_len, sizeof(mbtk_pdp_cb_info_s));
+ LOGE(GSW_DATA,"data = [NULL], data_len(%d) != sizeof(mbtk_pdp_cb_info_s)(%d)", data_len, sizeof(mbtk_pdp_cb_info_s));
return;
}
int ret = -1;
- LOGD("Wan_State_ind_malloc start\n");
+ LOGD(GSW_DATA,"Wan_State_ind_malloc start\n");
ret = Wan_State_ind_malloc(&linkState_arr);
if (ret != 0)
{
- LOGE("Wan_State_ind_malloc[0] fail\n");
+ LOGE(GSW_DATA,"Wan_State_ind_malloc[0] fail\n");
return ;
}
if(linkState_arr == NULL)
{
- LOGE("linkState_arr is NULL");
+ LOGE(GSW_DATA,"linkState_arr is NULL");
return ;
}
else
{
- LOGE("linkState_arr is not NULL");
+ LOGE(GSW_DATA,"linkState_arr is not NULL");
}
mbtk_pdp_cb_info_s *pdp_cb_info = (mbtk_pdp_cb_info_s *)data;
@@ -562,7 +462,7 @@
ret = Wan_State_ind_free(&linkState_arr);
if (ret != 0)
{
- LOGE("Wan_State_ind_free fail\n");
+ LOGE(GSW_DATA,"Wan_State_ind_free fail\n");
}
}
@@ -585,7 +485,7 @@
}
default :
{
- LOGE("[%s] gsw_id(linkid) unknown.[%d]", __func__, gsw_id);
+ LOGE(GSW_DATA,"[%s] gsw_id(linkid) unknown.[%d]", __func__, gsw_id);
return -1;
}
}
@@ -608,7 +508,7 @@
}
default :
{
- LOGE("[%s] gsw_id(apnid) unknown.[%d]", __func__, gsw_id);
+ LOGE(GSW_DATA,"[%s] gsw_id(apnid) unknown.[%d]", __func__, gsw_id);
return -1;
}
}
@@ -643,21 +543,21 @@
if (ret != GSW_HAL_SUCCESS)
{
- LOGE("mbtk_data_api_import fail\n");
+ LOGE(GSW_DATA,"mbtk_data_api_import fail\n");
return GSW_HAL_NORMAL_FAIL;
}
data_info_handle = (mbtk_info_handle_t*)mbtk_info_handle_get();
if (data_info_handle == NULL)
{
- LOGE("mbtk_info_handle_get fail\n");
+ LOGE(GSW_DATA,"mbtk_info_handle_get fail\n");
return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_pdp_state_change_cb_reg((mbtk_info_handle_t*)data_info_handle, data_call_state_change_cb);
if (ret != 0)
{
- LOGE("mbtk_pdp_state_change_cb_reg fail\n");
+ LOGE(GSW_DATA,"mbtk_pdp_state_change_cb_reg fail\n");
return GSW_HAL_NORMAL_FAIL;
}
@@ -684,7 +584,7 @@
ret = mbtk_info_handle_free((mbtk_info_handle_t**)&data_info_handle);
if (ret != 0)
{
- LOGE("mbtk_info_handle_free fail\n");
+ LOGE(GSW_DATA,"mbtk_info_handle_free fail\n");
return GSW_HAL_NORMAL_FAIL;
}
@@ -708,7 +608,7 @@
if(LinkInf == NULL)
{
- LOGE("apn info is null");
+ LOGE(GSW_DATA,"apn info is null");
return GSW_HAL_NORMAL_FAIL;
}
@@ -722,21 +622,21 @@
if(strcmp(LinkInf->normalProtocol,"IP") == 0)
{
ip_type = MBTK_IP_TYPE_IP;
- LOGE("pdp_type(protocol) is IP");
+ LOGE(GSW_DATA,"pdp_type(protocol) is IP");
}
else if(strcmp(LinkInf->normalProtocol,"IPV6") == 0)
{
ip_type = MBTK_IP_TYPE_IPV6;
- LOGE("pdp_type(protocol) is IPV6");
+ LOGE(GSW_DATA,"pdp_type(protocol) is IPV6");
}
else if(strcmp(LinkInf->normalProtocol,"IPV4V6") == 0)
{
ip_type = MBTK_IP_TYPE_IPV4V6;
- LOGE("pdp_type(protocol) is IPV4V6");
+ LOGE(GSW_DATA,"pdp_type(protocol) is IPV4V6");
}
else
{
- LOGE("pdp_type(protocol) error");
+ LOGE(GSW_DATA,"pdp_type(protocol) error");
return GSW_HAL_NORMAL_FAIL;
}
@@ -744,7 +644,7 @@
ret = gsw_id_convert_to_channel_id(apnid, GSW_ID_CONVERT_TYPE_APNID, &cid);
if(0 != ret)
{
- LOGE("[%s] gsw_id_convert_to_channel_id() fail", __func__);
+ LOGE(GSW_DATA,"[%s] gsw_id_convert_to_channel_id() fail", __func__);
return GSW_HAL_NORMAL_FAIL;
}
@@ -771,19 +671,19 @@
else if(0 == strcmp(LinkInf->authType, "3"))
{
//nonsupport
- LOGE("[%s] LinkInf->authType(3) nonsupport", __func__);
+ LOGE(GSW_DATA,"[%s] LinkInf->authType(3) nonsupport", __func__);
return GSW_HAL_NORMAL_FAIL;
}
else
{
- LOGE("[%s] LinkInf->authType(%s) unknown", __func__, LinkInf->authType);
+ LOGE(GSW_DATA,"[%s] LinkInf->authType(%s) unknown", __func__, LinkInf->authType);
return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_apn_set(data_info_handle, cid, ip_type, LinkInf -> apn, LinkInf -> usr, LinkInf -> pwd, (const void *)auth_type);
if(ret != 0)
{
- LOGE("[%s] mbtk_apn_set fail() fail.[%d]", __func__, ret);
+ LOGE(GSW_DATA,"[%s] mbtk_apn_set fail() fail.[%d]", __func__, ret);
return GSW_HAL_NORMAL_FAIL;
}
@@ -811,28 +711,28 @@
if(LinkInf == NULL)
{
- LOGE("apn info is null");
+ LOGE(GSW_DATA,"apn info is null");
return GSW_HAL_NORMAL_FAIL;
}
ret = gsw_data_call_set_apn(LinkInf);
if(ret != GSW_HAL_SUCCESS)
{
- LOGE("[%s] gsw_data_call_set_apn() fail", __func__);
+ LOGE(GSW_DATA,"[%s] gsw_data_call_set_apn() fail", __func__);
return GSW_HAL_NORMAL_FAIL;
}
ret = gsw_id_convert_to_channel_id(linkid, GSW_ID_CONVERT_TYPE_LINKID, &cid);
if(0 != ret)
{
- LOGE("[%s] gsw_id_convert_to_channel_id() fail", __func__);
+ LOGE(GSW_DATA,"[%s] gsw_id_convert_to_channel_id() fail", __func__);
return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_data_call_start((mbtk_info_handle_t*)data_info_handle, cid, 0, FALSE, 0);
if(ret != 0)
{
- LOGE("[%s] mbtk_data_call_start fail.[%d]", __func__, ret);
+ LOGE(GSW_DATA,"[%s] mbtk_data_call_start fail.[%d]", __func__, ret);
return GSW_HAL_NORMAL_FAIL;
}
@@ -864,21 +764,21 @@
if(LinkInf == NULL)
{
- LOGE("apn info is null");
+ LOGE(GSW_DATA,"apn info is null");
return GSW_HAL_NORMAL_FAIL;
}
ret = gsw_id_convert_to_channel_id(linkid, GSW_ID_CONVERT_TYPE_LINKID, &cid);
if(0 != ret)
{
- LOGE("[%s] gsw_id_convert_to_channel_id() fail", __func__);
+ LOGE(GSW_DATA,"[%s] gsw_id_convert_to_channel_id() fail", __func__);
return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_data_call_stop((mbtk_info_handle_t*)data_info_handle, cid, 15);
if(ret != 0)
{
- LOGE("[%s] mbtk_data_call_stop() fail.[%d]",__func__, ret);
+ LOGE(GSW_DATA,"[%s] mbtk_data_call_stop() fail.[%d]",__func__, ret);
return GSW_HAL_NORMAL_FAIL;
}
@@ -920,7 +820,7 @@
FILE *fp = popen(command, "r");
if(fp == NULL)
{
- LOGE("popen fail\n");
+ LOGE(GSW_DATA,"popen fail\n");
return GSW_HAL_NORMAL_FAIL;
}
@@ -938,7 +838,7 @@
}
// RX bytes
if (strstr(buffer, "RX bytes")) {
- LOGE("RX bytes %s\n",strstr(buffer, "RX bytes"));
+ LOGE(GSW_DATA,"RX bytes %s\n",strstr(buffer, "RX bytes"));
sscanf(buffer, " RX bytes:%llu ", &rx_bytes);
}
// RX packets
@@ -952,16 +852,16 @@
pclose(fp);
// 输出结果
- LOGE("TX Bytes: %llu\n", tx_bytes);
- LOGE("TX Packets: %llu\n", tx_packets);
- LOGE("TX Dropped: %llu\n", tx_dropped);
- LOGE("RX Bytes: %llu\n", rx_bytes);
- LOGE("RX Packets: %llu\n", rx_packets);
- LOGE("RX Dropped: %llu\n", rx_dropped);
+ LOGE(GSW_DATA,"TX Bytes: %llu\n", tx_bytes);
+ LOGE(GSW_DATA,"TX Packets: %llu\n", tx_packets);
+ LOGE(GSW_DATA,"TX Dropped: %llu\n", tx_dropped);
+ LOGE(GSW_DATA,"RX Bytes: %llu\n", rx_bytes);
+ LOGE(GSW_DATA,"RX Packets: %llu\n", rx_packets);
+ LOGE(GSW_DATA,"RX Dropped: %llu\n", rx_dropped);
if(data_pkt == NULL)
{
- LOGE("data_pkt is null\n");
+ LOGE(GSW_DATA,"data_pkt is null\n");
return GSW_HAL_NORMAL_FAIL;
}
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;
}
diff --git a/mbtk/libgsw_lib/gsw_sim_interface.c b/mbtk/libgsw_lib/gsw_sim_interface.c
index b4c8873..b7d2d23 100755
--- a/mbtk/libgsw_lib/gsw_sim_interface.c
+++ b/mbtk/libgsw_lib/gsw_sim_interface.c
@@ -3,6 +3,8 @@
#include <dlfcn.h>
#include <time.h>
#include "gsw_nw_interface.h"
+#include "gsw_log_interface.h"
+
#define MBTK_BUFF_TEMP_SIZE_32 32
#define MBTK_ERR_OK 0
@@ -85,100 +87,10 @@
int (*mbtk_phone_number_get)(mbtk_info_handle_t* handle, void *phone_number);
int (*mbtk_set_modem_fun)(mbtk_info_handle_t* handle, mbtk_modem_info_t *info);
int (*mbtk_sim_power_set)(int power);
-static void (*mbtk_log)(int level, const char *format, ...);
-static void (*mbtk_log_init)(char *path, char *tag);
-#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_SIM "[HAL][GSW_SIM]"
-#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_SIM"" 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_SIM"" 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_SIM"" 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_SIM"" 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_SIM"" fmt, ptr_1001 + 1, line_1001, ##args); \
- } while(0)
-
-
-
-
static void *dlHandle_mbtk;
@@ -190,50 +102,38 @@
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_SIM,"mbtk_info_handle_get dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_info_handle_free = (int (*)(mbtk_info_handle_t** handle))dlsym(dlHandle_mbtk, "mbtk_info_handle_free");
if (mbtk_info_handle_free == NULL)
{
- LOGE("mbtk_info_handle_free dlsym fail\n");
+ LOGE(GSW_SIM,"mbtk_info_handle_free dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_imsi_get = (int (*)(mbtk_info_handle_t* handle, void *imsi))dlsym(dlHandle_mbtk, "mbtk_imsi_get");
if (mbtk_imsi_get == NULL)
{
- LOGE("mbtk_imsi_get dlsym fail\n");
+ LOGE(GSW_SIM,"mbtk_imsi_get dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_iccid_get = (int (*)(mbtk_info_handle_t* handle, void *iccid))dlsym(dlHandle_mbtk, "mbtk_iccid_get");
if (mbtk_iccid_get == NULL)
{
- LOGE("mbtk_iccid_get dlsym fail\n");
+ LOGE(GSW_SIM,"mbtk_iccid_get dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_phone_number_get = (int (*)(mbtk_info_handle_t* handle, void *phone_number))dlsym(dlHandle_mbtk, "mbtk_phone_number_get");
if (mbtk_phone_number_get == NULL)
{
- LOGE("mbtk_phone_number_get dlsym fail\n");
+ LOGE(GSW_SIM,"mbtk_phone_number_get dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
@@ -241,25 +141,25 @@
mbtk_sim_state_get = (int (*)(mbtk_info_handle_t* handle, mbtk_sim_state_enum *sim_state))dlsym(dlHandle_mbtk, "mbtk_sim_state_get");
if (mbtk_sim_state_get == NULL)
{
- LOGE("mbtk_sim_state_get dlsym fail\n");
+ LOGE(GSW_SIM,"mbtk_sim_state_get dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_set_modem_fun = (int (*)(mbtk_info_handle_t* handle, mbtk_modem_info_t *info))dlsym(dlHandle_mbtk, "mbtk_set_modem_fun");
if (mbtk_set_modem_fun == NULL)
{
- LOGE("mbtk_set_modem_fun dlsym fail\n");
+ LOGE(GSW_SIM,"mbtk_set_modem_fun dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
mbtk_sim_power_set = (int (*)(int power))dlsym(dlHandle_mbtk, "mbtk_sim_power_set");
if (mbtk_sim_power_set == NULL)
{
- LOGE("mbtk_sim_power_set dlsym fail\n");
+ LOGE(GSW_SIM,"mbtk_sim_power_set dlsym fail\n");
return GSW_HAL_NORMAL_FAIL;
}
- LOGD("gsw_sim_api_import end\n");
+ LOGD(GSW_SIM,"gsw_sim_api_import end\n");
return GSW_HAL_SUCCESS;
}
@@ -281,19 +181,14 @@
ret = gsw_sim_api_import();
if(ret != GSW_HAL_SUCCESS)
{
- if(mbtk_log != NULL)
- {
- LOGE("gsw_sim_import fail\n");
- }
+ LOGE(GSW_SIM,"gsw_sim_import fail\n");
return GSW_HAL_NORMAL_FAIL;
}
- mbtk_log_init("syslog", "MBTK_RIL");
-
sim_info_handle = mbtk_info_handle_get();
if(sim_info_handle == NULL)
{
- LOGE("mbtk_info_handle_get fail\n");
+ LOGE(GSW_SIM,"mbtk_info_handle_get fail\n");
return GSW_HAL_NORMAL_FAIL;
}
@@ -321,7 +216,7 @@
ret = mbtk_info_handle_free(&sim_info_handle);
if(ret != GSW_HAL_SUCCESS)
{
- LOGE("mbtk_info_handle_free fail\n");
+ LOGE(GSW_SIM,"mbtk_info_handle_free fail\n");
return GSW_HAL_NORMAL_FAIL;
}
@@ -353,17 +248,17 @@
mbtk_sim_state_enum sim = MBTK_SIM_ABSENT;
- LOGD("mbtk_get_sim_status start\n");
+ LOGD(GSW_SIM,"mbtk_get_sim_status start\n");
ret = mbtk_sim_state_get(sim_info_handle, &sim);
if(ret)
{
- LOGE("[gsw_get_sim_status] mbtk_sim_state_get fail [err = %d].", ret);
+ LOGE(GSW_SIM,"[gsw_get_sim_status] mbtk_sim_state_get fail [err = %d].", ret);
return GSW_HAL_NORMAL_FAIL;
}
else
{
- LOGD("[gsw_get_sim_status] sim = %d\n", sim);
+ LOGD(GSW_SIM,"[gsw_get_sim_status] sim = %d\n", sim);
switch (sim)
{
case MBTK_SIM_ABSENT:
@@ -424,20 +319,20 @@
if(iccid == NULL)
{
- LOGE("iccid is NULL.");
+ LOGE(GSW_SIM,"iccid is NULL.");
return GSW_HAL_ARG_INVALID;
}
if(len < GSW_SIM_ICCID_LENGTH)
{
- LOGE("iccid len is too short,len = %d\n", len);
+ LOGE(GSW_SIM,"iccid len is too short,len = %d\n", len);
return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_iccid_get(sim_info_handle, (void *)iccid);
if(ret != MBTK_ERR_OK)
{
- LOGE("[gsw_sim] mbtk_iccid_get fail [err = %d].", ret);
+ LOGE(GSW_SIM,"[gsw_sim] mbtk_iccid_get fail [err = %d].", ret);
return GSW_HAL_NORMAL_FAIL;
}
@@ -463,20 +358,20 @@
if(imsi == NULL)
{
- LOGE("imsi is NULL.");
+ LOGE(GSW_SIM,"imsi is NULL.");
return GSW_HAL_ARG_INVALID;
}
if(len < GSW_SIM_IMSI_LENGTH)
{
- LOGE("imsi len is too short,len = %d\n", len);
+ LOGE(GSW_SIM,"imsi len is too short,len = %d\n", len);
return GSW_HAL_NORMAL_FAIL;
}
ret = mbtk_imsi_get(sim_info_handle, (void *)imsi);
if(ret != MBTK_ERR_OK)
{
- LOGE("[gsw_sim] mbtk_imsi_get fail [err = %d].", ret);
+ LOGE(GSW_SIM,"[gsw_sim] mbtk_imsi_get fail [err = %d].", ret);
return GSW_HAL_NORMAL_FAIL;
}
@@ -515,7 +410,7 @@
ret = mbtk_phone_number_get(sim_info_handle, (void *)msisdn);
if(ret != MBTK_ERR_OK)
{
- LOGE("[gsw_sim] mbtk_phone_number_get fail [err = %d].", ret);
+ LOGE(GSW_SIM,"[gsw_sim] mbtk_phone_number_get fail [err = %d].", ret);
return GSW_HAL_NORMAL_FAIL;
}
@@ -544,7 +439,7 @@
ret = mbtk_set_modem_fun(sim_info_handle, &info);
if(ret)
{
- LOGE("mbtk_set_modem_fun() fail [err = %d].", ret);
+ LOGE(GSW_SIM,"mbtk_set_modem_fun() fail [err = %d].", ret);
return GSW_HAL_NORMAL_FAIL;
}
@@ -575,7 +470,7 @@
ret = mbtk_set_modem_fun(sim_info_handle, &info);
if(ret)
{
- LOGE("mbtk_set_modem_fun() fail [err = %d].", ret);
+ LOGE(GSW_SIM,"mbtk_set_modem_fun() fail [err = %d].", ret);
return GSW_HAL_NORMAL_FAIL;
}
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");
}
}