T108: 解决Bug84723
Change-Id: I8d02db28c95c6b40810652fad6a142cd309a5262
diff --git a/mbtk/liblynq_lib/src/lynq_sim.c b/mbtk/liblynq_lib/src/lynq_sim.c
index 7a45479..7c3a3a5 100755
--- a/mbtk/liblynq_lib/src/lynq_sim.c
+++ b/mbtk/liblynq_lib/src/lynq_sim.c
@@ -20,7 +20,7 @@
void qser_sim_state_change_cb(const void* data, int data_len)
{
uint8 *ptr = (uint8*)data;
- LOGE("SIM state : %d\n", *ptr);
+ LOGE("[qser_sim] SIM state : %d\n", *ptr);
QSER_SIM_CARD_STATUS_INFO_T qser_sim_statue = {0};
if(*ptr == 0)
{
@@ -50,10 +50,9 @@
int qser_sim_client_init(sim_client_handle_type *ph_sim)
{
//UNUSED(ph_sim);
- mbtk_log_init("radio", "QSER_SIM");
if(ph_sim == NULL)
{
- LOGE("ph_sim is NULL.");
+ LOGE("[qser_sim] ph_sim is NULL.");
return QSER_RESULT_FAIL;
}
@@ -68,7 +67,7 @@
}
else
{
- LOGE("mbtk_info_handle_get() fail.");
+ LOGE("[qser_sim] mbtk_info_handle_get() fail.");
return QSER_RESULT_FAIL;
}
}
@@ -83,7 +82,7 @@
}
*ph_sim = qser_h_sim;
- LOGE("mbtk_info_handle_get() success.");
+ LOGE("[qser_sim] mbtk_info_handle_get() success.");
return QSER_RESULT_SUCCESS;
}
@@ -96,19 +95,19 @@
if(h_sim != qser_h_sim)
{
- LOGE("h_sim is error.");
+ LOGE("[qser_sim] h_sim is error.");
return QSER_RESULT_FAIL;
}
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_sim] handle is NULL.");
return QSER_RESULT_FAIL;
}
if(imsi == NULL || imsiLen < 15)
{
- LOGE("imsi is NULL.");
+ LOGE("[qser_sim] imsi is NULL.");
return QSER_RESULT_FAIL;
}
@@ -116,13 +115,13 @@
int err = mbtk_imsi_get(qser_info_handle, imsi);
if(err)
{
- LOGE("mbtk_imsi_get is fail.");
+ LOGE("[qser_sim] mbtk_imsi_get is fail.");
return QSER_RESULT_FAIL;
}
if(strlen(imsi) > imsiLen)
{
- LOGE("get datalength out of range.");
+ LOGE("[qser_sim] get datalength out of range.");
return QSER_RESULT_FAIL;
}
@@ -138,19 +137,19 @@
if(h_sim != qser_h_sim)
{
- LOGE("h_sim is error.");
+ LOGE("[qser_sim] h_sim is error.");
return QSER_RESULT_FAIL;
}
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_sim] handle is NULL.");
return QSER_RESULT_FAIL;
}
if(iccid == NULL || iccidLen < QSER_SIM_ICCID_LEN_MAX)
{
- LOGE("iccid is NULL.");
+ LOGE("[qser_sim] iccid is NULL.");
return QSER_RESULT_FAIL;
}
@@ -158,13 +157,13 @@
int err = mbtk_iccid_get(qser_info_handle, iccid);
if(err)
{
- LOGE("mbtk_iccid_get is fail.");
+ LOGE("[qser_sim] mbtk_iccid_get is fail.");
return QSER_RESULT_FAIL;
}
if(strlen(iccid) > iccidLen)
{
- LOGE("get datalength out of range.");
+ LOGE("[qser_sim] get datalength out of range.");
return QSER_RESULT_FAIL;
}
@@ -180,19 +179,19 @@
if(h_sim != qser_h_sim)
{
- LOGE("h_sim is error.");
+ LOGE("[qser_sim] h_sim is error.");
return QSER_RESULT_FAIL;
}
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_sim] handle is NULL.");
return QSER_RESULT_FAIL;
}
if(phone_num == NULL || phoneLen < 11)
{
- LOGE("phone_num is NULL.");
+ LOGE("[qser_sim] phone_num is NULL.");
return QSER_RESULT_FAIL;
}
@@ -200,13 +199,13 @@
int err = mbtk_phone_number_get(qser_info_handle, phone_num);
if(err)
{
- LOGE("mbtk_phone_number_get is fail.");
+ LOGE("[qser_sim] mbtk_phone_number_get is fail.");
return QSER_RESULT_FAIL;
}
if(strlen(phone_num) > phoneLen)
{
- LOGE("get datalength out of range.");
+ LOGE("[qser_sim] get datalength out of range.");
return QSER_RESULT_FAIL;
}
@@ -220,26 +219,26 @@
if(h_sim != qser_h_sim)
{
- LOGE("h_sim is error.");
+ LOGE("[qser_sim] h_sim is error.");
return QSER_RESULT_FAIL;
}
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_sim] handle is NULL.");
return QSER_RESULT_FAIL;
}
if(pt_info == NULL)
{
- LOGE("pt_info is NULL.");
+ LOGE("[qser_sim] pt_info is NULL.");
return QSER_RESULT_FAIL;
}
int err = mbtk_verify_pin(qser_info_handle, pt_info->pin_value);
if(err)
{
- LOGE("mbtk_verify_pin is fail.");
+ LOGE("[qser_sim] mbtk_verify_pin is fail.");
return QSER_RESULT_FAIL;
}
@@ -253,19 +252,19 @@
if(h_sim != qser_h_sim)
{
- LOGE("h_sim is error.");
+ LOGE("[qser_sim] h_sim is error.");
return QSER_RESULT_FAIL;
}
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_sim] handle is NULL.");
return QSER_RESULT_FAIL;
}
if(pt_info == NULL)
{
- LOGE("pt_info is NULL.");
+ LOGE("[qser_sim] pt_info is NULL.");
return QSER_RESULT_FAIL;
}
@@ -275,7 +274,7 @@
int err = mbtk_change_pin(qser_info_handle, &pin_info);
if(err)
{
- LOGE("mbtk_change_pin is fail.");
+ LOGE("[qser_sim] mbtk_change_pin is fail.");
return QSER_RESULT_FAIL;
}
@@ -289,19 +288,19 @@
if(h_sim != qser_h_sim)
{
- LOGE("h_sim is error.");
+ LOGE("[qser_sim] h_sim is error.");
return QSER_RESULT_FAIL;
}
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_sim] handle is NULL.");
return QSER_RESULT_FAIL;
}
if(pt_info == NULL)
{
- LOGE("pt_info is NULL.");
+ LOGE("[qser_sim] pt_info is NULL.");
return QSER_RESULT_FAIL;
}
@@ -311,7 +310,7 @@
int err = mbtk_unlock_pin(qser_info_handle, &puk_pin_info);
if(err)
{
- LOGE("mbtk_unlock_pin is fail.");
+ LOGE("[qser_sim] mbtk_unlock_pin is fail.");
return QSER_RESULT_FAIL;
}
@@ -325,19 +324,19 @@
if(h_sim != qser_h_sim)
{
- LOGE("h_sim is error.");
+ LOGE("[qser_sim] h_sim is error.");
return QSER_RESULT_FAIL;
}
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_sim] handle is NULL.");
return QSER_RESULT_FAIL;
}
if(pt_info == NULL)
{
- LOGE("pt_info is NULL.");
+ LOGE("[qser_sim] pt_info is NULL.");
return QSER_RESULT_FAIL;
}
@@ -347,7 +346,7 @@
int err = mbtk_enable_pin(qser_info_handle, &pin_info);
if(err)
{
- LOGE("mbtk_enable_pin is fail.");
+ LOGE("[qser_sim] mbtk_enable_pin is fail.");
return QSER_RESULT_FAIL;
}
@@ -361,19 +360,19 @@
if(h_sim != qser_h_sim)
{
- LOGE("h_sim is error.");
+ LOGE("[qser_sim] h_sim is error.");
return QSER_RESULT_FAIL;
}
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_sim] handle is NULL.");
return QSER_RESULT_FAIL;
}
if(pt_info == NULL)
{
- LOGE("pt_info is NULL.");
+ LOGE("[qser_sim] pt_info is NULL.");
return QSER_RESULT_FAIL;
}
@@ -383,7 +382,7 @@
int err = mbtk_enable_pin(qser_info_handle, &pin_info);
if(err)
{
- LOGE("mbtk_enable_pin is fail.");
+ LOGE("[qser_sim] mbtk_enable_pin is fail.");
return QSER_RESULT_FAIL;
}
@@ -398,19 +397,19 @@
if(h_sim != qser_h_sim)
{
- LOGE("h_sim is error.");
+ LOGE("[qser_sim] h_sim is error.");
return QSER_RESULT_FAIL;
}
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_sim] handle is NULL.");
return QSER_RESULT_FAIL;
}
if(pt_info == NULL)
{
- LOGE("pt_info is NULL.");
+ LOGE("[qser_sim] pt_info is NULL.");
return QSER_RESULT_FAIL;
}
@@ -420,12 +419,12 @@
int err = mbtk_sim_state_get(qser_info_handle, &sim);
if(err)
{
- LOGE("mbtk_sim_state_get fail [err = %d].", err);
+ LOGE("[qser_sim] mbtk_sim_state_get fail [err = %d].", err);
return QSER_RESULT_FAIL;
}
else
{
- LOGE("sim = %d.", sim);
+ LOGE("[qser_sim] sim = %d.", sim);
memset(pt_info, 0x0, sizeof(QSER_SIM_CARD_STATUS_INFO_T));
switch (sim)
{
@@ -456,7 +455,7 @@
err = mbtk_sim_card_type_get(qser_info_handle, &sim_card_type);
if(err)
{
- LOGE("mbtk_sim_state_get fail [err = %d].", err);
+ LOGE("[qser_sim] mbtk_sim_state_get fail [err = %d].", err);
return QSER_RESULT_FAIL;
}
else
@@ -472,7 +471,7 @@
err = mbtk_pin_last_num_get(qser_info_handle, &qser_last_times);
if(err)
{
- LOGE("mbtk_sim_state_get fail [err = %d].", err);
+ LOGE("[qser_sim] mbtk_sim_state_get fail [err = %d].", err);
return QSER_RESULT_FAIL;
}
else
@@ -493,26 +492,26 @@
if(h_sim != qser_h_sim)
{
- LOGE("h_sim is error.");
+ LOGE("[qser_sim] h_sim is error.");
return QSER_RESULT_FAIL;
}
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_sim] handle is NULL.");
return QSER_RESULT_FAIL;
}
if(imei == NULL)
{
- LOGE("imei is NULL.");
+ LOGE("[qser_sim] imei is NULL.");
return QSER_RESULT_FAIL;
}
int err = mbtk_imei_get(qser_info_handle, imei);
if(err)
{
- LOGE("mbtk_imei_get Error : %d\n", err);
+ LOGE("[qser_sim] mbtk_imei_get Error : %d\n", err);
return QSER_RESULT_FAIL;
}
return QSER_RESULT_SUCCESS;
@@ -525,19 +524,19 @@
//UNUSED(sv);
if(h_sim != qser_h_sim)
{
- LOGE("h_sim is error.");
+ LOGE("[qser_sim] h_sim is error.");
return QSER_RESULT_FAIL;
}
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_sim] handle is NULL.");
return QSER_RESULT_FAIL;
}
if(imei == NULL || sv == NULL)
{
- LOGE("param is NULL.");
+ LOGE("[qser_sim] param is NULL.");
return QSER_RESULT_FAIL;
}
@@ -545,7 +544,7 @@
int err = mbtk_imei_get(qser_info_handle, imei);
if(err)
{
- LOGE("mbtk_imei_get Error: %d\n", err);
+ LOGE("[qser_sim] mbtk_imei_get Error: %d\n", err);
return QSER_RESULT_FAIL;
}
@@ -561,13 +560,13 @@
if(h_sim != qser_h_sim)
{
- LOGE("h_sim is error.");
+ LOGE("[qser_sim] h_sim is error.");
return QSER_RESULT_FAIL;
}
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_sim] handle is NULL.");
return QSER_RESULT_FAIL;
}
@@ -578,7 +577,7 @@
int err = mbtk_set_modem_fun(qser_info_handle, &info);
if(err)
{
- LOGE("mbtk_set_modem_fun Error : %d\n", err);
+ LOGE("[qser_sim] mbtk_set_modem_fun Error : %d\n", err);
return QSER_RESULT_FAIL;
}
@@ -586,7 +585,7 @@
err = mbtk_set_modem_fun(qser_info_handle, &info);
if(err)
{
- LOGE("mbtk_set_modem_fun Error : %d\n", err);
+ LOGE("[qser_sim] mbtk_set_modem_fun Error : %d\n", err);
return QSER_RESULT_FAIL;
}
return QSER_RESULT_SUCCESS;
@@ -599,26 +598,26 @@
if(h_sim != qser_h_sim)
{
- LOGE("h_sim is error.");
+ LOGE("[qser_sim] h_sim is error.");
return QSER_RESULT_FAIL;
}
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_sim] handle is NULL.");
return QSER_RESULT_FAIL;
}
if(buf == NULL)
{
- LOGE("buf is NULL.");
+ LOGE("[qser_sim] buf is NULL.");
return QSER_RESULT_FAIL;
}
int err = mbtk_version_get(qser_info_handle, buf);
if(err)
{
- LOGE("mbtk_version_get Error : %d\n", err);
+ LOGE("[qser_sim] mbtk_version_get Error : %d\n", err);
return QSER_RESULT_FAIL;
}
return QSER_RESULT_SUCCESS;
@@ -630,13 +629,13 @@
if(h_sim != qser_h_sim)
{
- LOGE("h_sim is error.");
+ LOGE("[qser_sim] h_sim is error.");
return QSER_RESULT_FAIL;
}
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_sim] handle is NULL.");
return QSER_RESULT_FAIL;
}
@@ -649,7 +648,7 @@
int err = mbtk_set_modem_fun(qser_info_handle, &info);
if(err)
{
- LOGE("mbtk_set_modem_fun Error : %d\n", err);
+ LOGE("[qser_sim] mbtk_set_modem_fun Error : %d\n", err);
return QSER_RESULT_FAIL;
}
@@ -657,7 +656,7 @@
err = mbtk_set_modem_fun(qser_info_handle, &info);
if(err)
{
- LOGE("mbtk_set_modem_fun Error : %d\n", err);
+ LOGE("[qser_sim] mbtk_set_modem_fun Error : %d\n", err);
return QSER_RESULT_FAIL;
}
return QSER_RESULT_SUCCESS;
@@ -667,13 +666,13 @@
{
if(qser_info_handle == NULL)
{
- LOGE("handle is NULL.");
+ LOGE("[qser_sim] handle is NULL.");
return QSER_RESULT_FAIL;
}
if(handlerPtr == NULL)
{
- LOGE("param is NULL.");
+ LOGE("[qser_sim] param is NULL.");
qser_sim_state_cb = NULL;
return QSER_RESULT_SUCCESS;
}
@@ -684,7 +683,7 @@
int ret = mbtk_sim_state_change_cb_reg(qser_info_handle, qser_sim_state_change_cb);
if(ret != 0)
{
- LOGE("set cb fail.");
+ LOGE("[qser_sim] set cb fail.");
qser_sim_state_cb = NULL;
return QSER_RESULT_FAIL;
}
@@ -699,19 +698,19 @@
//UNUSED(h_sim);
if(h_sim != qser_h_sim)
{
- LOGE("h_sim is error.");
+ LOGE("[qser_sim] h_sim is error.");
return QSER_RESULT_FAIL;
}
if(qser_info_handle)
{
- LOGE("qser_info_handle_num = %d", qser_info_handle_num);
+ LOGE("[qser_sim] qser_info_handle_num = %d", qser_info_handle_num);
if(qser_info_handle_num == 1)
{ // 最后一个引用，可释放。
int ret = mbtk_info_handle_free(&qser_info_handle);
if(ret)
{
- LOGE("mbtk_info_handle_free() fail.");
+ LOGE("[qser_sim] mbtk_info_handle_free() fail.");
return QSER_RESULT_FAIL;
}
else
@@ -730,7 +729,7 @@
}
else
{
- LOGE("handle not inited.");
+ LOGE("[qser_sim] handle not inited.");
return QSER_RESULT_FAIL;
}