Merge "[Feature][ZXW-293]Fix WIFI related control foot gpio132, gpio91 is still affected after removing mmc0 from uboot"
diff --git a/ap/app/zte_comm/at_ctl/src/atctrl/at_ctl.c b/ap/app/zte_comm/at_ctl/src/atctrl/at_ctl.c
index 644e497..8a23c3a 100755
--- a/ap/app/zte_comm/at_ctl/src/atctrl/at_ctl.c
+++ b/ap/app/zte_comm/at_ctl/src/atctrl/at_ctl.c
@@ -796,7 +796,9 @@
/* Æô¶¯ÏûÏ¢¶¨Ê±²éѯ*/
at_timeout_start_perio_query();
}
- sc_cfg_get("customIndCmdList", PsmIndAtCmdPrefix, sizeof(PsmIndAtCmdPrefix));
+ //xf.li@20240603 modify for T106BUG-639 start
+ //sc_cfg_get("customIndCmdList", PsmIndAtCmdPrefix, sizeof(PsmIndAtCmdPrefix));
+ //xf.li@20240603 modify for T106BUG-639 end
while(g_powerOnType != POWER_ON_LOCALUPDATE)
{
iRet = 0;
diff --git a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/data/data.cpp b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/data/data.cpp
index c00501e..a9d44b2 100755
--- a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/data/data.cpp
+++ b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/data/data.cpp
@@ -168,7 +168,7 @@
static int net_id = 1000;
int ims_type_in_db = 0;
-
+int g_default_apnflag = 0;//jb.qi change for apn status uci on 20240605
static int data_call_num = 0;
RIL_Data_Call_Response_v6 *data_call_response = NULL;
@@ -1527,6 +1527,8 @@
{
int i = 0;
int pdp_count = 0;
+ int ret = 0; //jb.qi change for apn status uci on 20240605
+ int ret1 = 0;//jb.qi change for apn status uci on 20240605
RLOGD("in updateRILDataCallResponsev11");
if(num != 1)
{
@@ -1555,7 +1557,15 @@
lynq_apn_cid_table[j].status = (int)p_cur[i].status;
memcpy(lynq_apn_cid_table[j].address, p_cur[i].addresses, strlen(p_cur[i].addresses) + 1);
lynq_apn_cid_table[j].dialing = 0;
- //break;
+ /*jb.qi change for apn status uci start on 20240605*/
+ ret = strcmp(lynq_apn_cid_table[j].apntype, "iot_default");
+ ret1 = strcmp(lynq_apn_cid_table[j].apntype, "default");
+ if(ret == 0 || ret1 == 0)
+ {
+ lynq_set_value("lynq_apn","apn_status","1");
+ g_default_apnflag = 1;
+ }
+ /*jb.qi change for apn status uci end on 20240605*/
}
else
{
@@ -1673,6 +1683,11 @@
void handleUnsolDataCalllistChange(int num ,RIL_Data_Call_Response_v11* p_cur){
int i;
int pdp_count = 0;
+ /*jb.qi change for apn status uci start on 20240605*/
+ int apn_status = 0;
+ int ret = 0;
+ int ret1 = 0;
+ /*jb.qi change for apn status uci end on 20240605*/
RLOGD("num = %d, apn_count = %d", num, apn_count);
for(int j = 0; j < LYNQ_APN_CHANNEL_MAX; j++)
{
@@ -1747,9 +1762,28 @@
lynq_apn_cid_table[i].dialing);
if(lynq_apn_cid_table[i].cid != -1)
{
+ /*jb.qi change for apn status uci start on 20240605*/
+ if(g_default_apnflag == 1)
+ {
+ ret = strcmp(lynq_apn_cid_table[i].apntype, "iot_default");
+ ret1 = strcmp(lynq_apn_cid_table[i].apntype, "default");
+ if(ret == 0 || ret1 == 0)
+ {
+ apn_status = 1;
+ }
+ }
+ /*jb.qi change for apn status uci end on 20240605*/
pdp_count++;
}
}
+ /*jb.qi change for apn status uci start*/
+ if((apn_status == 0) && (g_default_apnflag == 1))
+ {
+ RLOGD("default apnstatus is 0");
+ lynq_set_value("lynq_apn","apn_status","0");
+ g_default_apnflag = 0;
+ }
+ /*jb.qi change for apn status uci end*/
if(pdp_count == 0)
{
#ifdef LED_SUPPORT
@@ -2022,3 +2056,4 @@
resetApnDB();
return 0;
}
+
diff --git a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/ril.cpp b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/ril.cpp
index 964989e..26f34a7 100755
--- a/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/ril.cpp
+++ b/cap/zx297520v3/src/lynq/framework/lynq-ril-service/src/ril.cpp
@@ -2913,12 +2913,19 @@
p.writeInt32(p_cur->WCDMA_SignalStrength.rscp);
p.writeInt32(p_cur->WCDMA_SignalStrength.ecno);
#ifdef TELEMATIC_5G_SUPPORT
- p.writeInt32(p_cur->NR_SignalStrength.ssRsrp);
- p.writeInt32(p_cur->NR_SignalStrength.ssRsrq);
- p.writeInt32(p_cur->NR_SignalStrength.ssSinr);
- p.writeInt32(p_cur->NR_SignalStrength.csiRsrp);
- p.writeInt32(p_cur->NR_SignalStrength.csiRsrq);
- p.writeInt32(p_cur->NR_SignalStrength.csiSinr);
+ if(responselen >= sizeof (RIL_SignalStrength_v14))
+ {
+ p.writeInt32(p_cur->NR_SignalStrength.ssRsrp);
+ p.writeInt32(p_cur->NR_SignalStrength.ssRsrq);
+ p.writeInt32(p_cur->NR_SignalStrength.ssSinr);
+ p.writeInt32(p_cur->NR_SignalStrength.csiRsrp);
+ p.writeInt32(p_cur->NR_SignalStrength.csiRsrq);
+ p.writeInt32(p_cur->NR_SignalStrength.csiSinr);
+ }
+ else
+ {
+ memset(&(p_cur->NR_SignalStrength), 0, sizeof(p_cur->NR_SignalStrength));
+ }
#endif
startResponse;
diff --git a/cap/zx297520v3/src/lynq/framework/lynq-sdk-ready/lynq_timer.cpp b/cap/zx297520v3/src/lynq/framework/lynq-sdk-ready/lynq_timer.cpp
index 4893dcb..b1d4c23 100755
--- a/cap/zx297520v3/src/lynq/framework/lynq-sdk-ready/lynq_timer.cpp
+++ b/cap/zx297520v3/src/lynq/framework/lynq-sdk-ready/lynq_timer.cpp
@@ -138,7 +138,7 @@
RLOGD("__FUNCTION__ %s create sock_fd failed %s\n", __FUNCTION__, strerror(errno));
/*set uci*/
/*socket abnormal*/
- system("uci set lynq_uci.sdk_ready='3'");
+ lynq_set_section("sdk_ready", "3");
/*set uci*/
return NULL;
}
@@ -162,7 +162,7 @@
RLOGD("__FUNCTION__ %s time out setting failed %s\n", __FUNCTION__, strerror(errno));
/*set uci*/
/*socket abnormal*/
- system("uci set lynq_uci.sdk_ready='3'");
+ lynq_set_section("sdk_ready", "3");
/*set uci*/
return NULL;
}
@@ -195,7 +195,7 @@
{
RLOGD("__FUNCTION__ %s Close to end %s\n", __FUNCTION__, strerror(errno));
//unknow
- system("uci set lynq_uci.sdk_ready='4'");
+ lynq_set_section("sdk_ready", "4");
pthread_mutex_unlock(&g_lynq_sim_sendto_mutex);
continue;
}
@@ -203,7 +203,7 @@
{
RLOGD("__FUNCTION__ %s sendto error %s\n", __FUNCTION__, strerror(errno));
//unknow
- system("uci set lynq_uci.sdk_ready='4'");
+ lynq_set_section("sdk_ready", "4");
pthread_mutex_unlock(&g_lynq_sim_sendto_mutex);
continue;
}
@@ -215,7 +215,7 @@
{
RLOGD("__FUNCTION__ %s Close to end\n", __FUNCTION__);
//unknow
- system("uci set lynq_uci.sdk_ready='4'");
+ lynq_set_section("sdk_ready", "4");
pthread_mutex_unlock(&g_lynq_sim_sendto_mutex);
continue;;
}
@@ -255,7 +255,7 @@
if(!t106_check_service("lynq-ril-service"))//not find,must be socket error
{
//unknow error
- system("uci set lynq_uci.sdk_ready='4'");
+ lynq_set_section("sdk_ready", "4");
}
#endif
pthread_mutex_unlock(&g_lynq_sim_sendto_mutex);
@@ -265,7 +265,7 @@
{
RLOGD("__FUNCTION__ %srecvfrom fail %s\n", __FUNCTION__, strerror(errno));
//unknow
- system("uci set lynq_uci.sdk_ready='4'");
+ lynq_set_section("sdk_ready", "4");
pthread_mutex_unlock(&g_lynq_sim_sendto_mutex);
continue;;
}
@@ -283,11 +283,13 @@
/*judge the res_error*/
if(!res_error)
{
- system("uci set lynq_uci.sdk_ready='0'");
+
+ lynq_set_section("sdk_ready", "0");
}
else
{
- system("uci set lynq_uci.sdk_ready='2'"); //Md configurations are inconsistent with AP configurations
+ //Md configurations are inconsistent with AP configurations
+ lynq_set_section("sdk_ready", "2");
}
RLOGD("__FUNCTION__ %s res_error %d\n", __FUNCTION__, res_error);
/*judge the res_error*/
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-network/lynq_network.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-network/lynq_network.cpp
index e1fdb18..1fd2780 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-network/lynq_network.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-network/lynq_network.cpp
@@ -18,6 +18,7 @@
#define LYNQ_RESP_STRING_MAX_NUM 128
#define LYNQ_TYPE_BUF 10
+#define LYNQ_URC_MSG_HEAD_ELEMENT_NUM 3
#define USER_LOG_TAG "LYNQ_NETWORK"
/*in CR AUTO00210807 MTK confirm set network selection mode max time is 14min 30s, first set 5 min 10s*/
@@ -1478,6 +1479,54 @@
return RESULT_OK;
}
+void convert_rscp(int relative_value, int* abs_value)
+{
+ if (0 == relative_value) {
+ (*abs_value) = 120;
+ }
+ else if (0 < relative_value && relative_value <= 96) {
+ (*abs_value) = 121 - relative_value;
+ }
+ else
+ {
+ (*abs_value) = 0x7FFFFFFF;
+ }
+}
+
+void convert_ecno(int relative_value, int* opposite_value_10_times)
+{
+ if (0 == relative_value)
+ {
+ (*opposite_value_10_times) = 240 ;
+ }
+ else if (0 < relative_value && relative_value <= 49)
+ {
+ (*opposite_value_10_times) = 245 - relative_value*5;
+ }
+ else
+ {
+ (*opposite_value_10_times) = 0x7FFFFFFF;
+ }
+}
+
+int is_rssi_valid(int rssi)
+{
+ if(rssi < 99 && rssi >=0)
+ {
+ return true;
+ }
+ return false;
+}
+
+int is_nr_ss_rsrp_valid(int ss_rsrp)
+{
+ if(ss_rsrp > 0 && ss_rsrp < 255)
+ {
+ return true;
+ }
+ return false;
+}
+
int lynq_solicited_signal_strength(signalStrength_t *solSigStren)
{
if(g_module_init_flag != MODULE_RUNNING)
@@ -1497,13 +1546,15 @@
{
LYERRLOG("%s call lynq_send_common_request failure, ret is %d",__func__,ret);
return ret;
- }
-
- int sum = 0;
+ }
+
+
int none = 0;
+ int rscp;
+ int ecno;
p->readInt32(&solSigStren->rssi);
- if((solSigStren->rssi > 0)&&(solSigStren->rssi < 99))
+ if(is_rssi_valid(solSigStren->rssi))
{
solSigStren->gw_sig_valid = 1;
}else{
@@ -1526,7 +1577,7 @@
p->readInt32(&solSigStren->rssnr);
LYINFLOG("LTE_signalstrength:%d",solSigStren->lte_signalstrength);
- if((solSigStren->lte_signalstrength > 0)&&(solSigStren->lte_signalstrength< 99))
+ if(is_rssi_valid(solSigStren->lte_signalstrength))
{
solSigStren->lte_sig_valid = 1;
}else{
@@ -1541,26 +1592,32 @@
p->readInt32(&none);
p->readInt32(&solSigStren->wcdma_signalstrength);
p->readInt32(&none);
- p->readInt32(&solSigStren->rscp);
- p->readInt32(&solSigStren->ecno);
+ p->readInt32(&rscp);
+ p->readInt32(&ecno);
+
+
LYINFLOG("WCDMA_signalstrength:%d",solSigStren->wcdma_signalstrength);
- if((solSigStren->wcdma_signalstrength > 0)&&(solSigStren->wcdma_signalstrength < 99))
+ if(is_rssi_valid(solSigStren->wcdma_signalstrength))
{
solSigStren->wcdma_sig_valid = 1;
+ convert_rscp(rscp,&solSigStren->rscp);
+ convert_ecno(ecno,&solSigStren->ecno);
}else{
solSigStren->wcdma_sig_valid = 0;
}
/*bug fix*/
- p->readInt32(&solSigStren->ssRsrp);
- p->readInt32(&solSigStren->ssRsrq);
- p->readInt32(&solSigStren->ssSinr);
- p->readInt32(&solSigStren->csiRsrp);
- p->readInt32(&solSigStren->csiRsrq);
- p->readInt32(&solSigStren->csiSinr);
- if(solSigStren->ssRsrp > 0 && solSigStren->ssRsrp < 255)
+ p->readInt32(&solSigStren->ssRsrp);
+
+ if(is_nr_ss_rsrp_valid(solSigStren->ssRsrp))
{
solSigStren->nr_sig_valid = 1;
- }else{
+ p->readInt32(&solSigStren->ssRsrq);
+ p->readInt32(&solSigStren->ssSinr);
+ p->readInt32(&solSigStren->csiRsrp);
+ p->readInt32(&solSigStren->csiRsrq);
+ p->readInt32(&solSigStren->csiSinr);
+ }
+ else{
LYERRLOG("None of NR signal info");
solSigStren->nr_sig_valid = 0;
}
@@ -1716,7 +1773,7 @@
case RIL_UNSOL_SIGNAL_STRENGTH:
{
p->readInt32(&s_network_urc_solSigStren.rssi);
- if((s_network_urc_solSigStren.rssi<=31)&&(s_network_urc_solSigStren.rssi>=0))
+ if(is_rssi_valid(s_network_urc_solSigStren.rssi))
{
s_network_urc_solSigStren.gw_sig_valid = 1;
LYINFLOG("urc_GSM_signalstrength:%d",s_network_urc_solSigStren.rssi);
@@ -1734,7 +1791,7 @@
p->readInt32(&s_network_urc_solSigStren.rsrp);
p->readInt32(&s_network_urc_solSigStren.rsrq);
p->readInt32(&s_network_urc_solSigStren.rssnr);
- if((s_network_urc_solSigStren.lte_signalstrength<=31)&&(s_network_urc_solSigStren.lte_signalstrength>=0))
+ if(is_rssi_valid(s_network_urc_solSigStren.lte_signalstrength))
{
s_network_urc_solSigStren.lte_sig_valid = 1;
LYINFLOG("urc_LTE_signalstrength:%d",s_network_urc_solSigStren.lte_signalstrength);
@@ -1750,30 +1807,38 @@
p->readInt32(&none);//bitErrorRate
p->readInt32(&s_network_urc_solSigStren.rscp);
p->readInt32(&s_network_urc_solSigStren.ecno);
- if((s_network_urc_solSigStren.wcdma_signalstrength<=31)&&(s_network_urc_solSigStren.wcdma_signalstrength>=0))
+ if(is_rssi_valid(s_network_urc_solSigStren.wcdma_signalstrength))
{
s_network_urc_solSigStren.wcdma_sig_valid = 1;
LYINFLOG("urc_WCDMA_signalstrength:%d",s_network_urc_solSigStren.wcdma_signalstrength);
}else{
s_network_urc_solSigStren.wcdma_sig_valid = 0;
}
- p->readInt32(&s_network_urc_solSigStren.ssRsrp);
- p->readInt32(&s_network_urc_solSigStren.ssRsrq);
- p->readInt32(&s_network_urc_solSigStren.ssSinr);
- p->readInt32(&s_network_urc_solSigStren.csiRsrp);
- p->readInt32(&s_network_urc_solSigStren.csiRsrq);
- p->readInt32(&s_network_urc_solSigStren.csiSinr);
- NR_sum = (s_network_urc_solSigStren.ssRsrp) + (s_network_urc_solSigStren.ssRsrq) + (s_network_urc_solSigStren.ssSinr) + (s_network_urc_solSigStren.csiRsrp)+\
- (s_network_urc_solSigStren.csiRsrq) + (s_network_urc_solSigStren.csiSinr);
- if(NR_sum != 0)
+
+ if(size >= sizeof(RIL_SignalStrength_v14)+sizeof(int)*LYNQ_URC_MSG_HEAD_ELEMENT_NUM)
{
- s_network_urc_solSigStren.nr_sig_valid = 1;
- LYINFLOG("[NR signal]ssRsrp is %d , ssRsrq is %d , ssSinr is %d , csiRsrp is %d , csiRsrq is %d , csiSinr is %d",\
- s_network_urc_solSigStren.ssRsrp,s_network_urc_solSigStren.ssRsrq,s_network_urc_solSigStren.ssSinr, \
- s_network_urc_solSigStren.csiRsrp,s_network_urc_solSigStren.csiRsrq,s_network_urc_solSigStren.csiSinr);
- }else{
- s_network_urc_solSigStren.nr_sig_valid = 0;
- }
+ p->readInt32(&s_network_urc_solSigStren.ssRsrp);
+ if(is_nr_ss_rsrp_valid(s_network_urc_solSigStren.ssRsrp))
+ {
+ s_network_urc_solSigStren.nr_sig_valid = 1;
+ p->readInt32(&s_network_urc_solSigStren.ssRsrq);
+ p->readInt32(&s_network_urc_solSigStren.ssSinr);
+ p->readInt32(&s_network_urc_solSigStren.csiRsrp);
+ p->readInt32(&s_network_urc_solSigStren.csiRsrq);
+ p->readInt32(&s_network_urc_solSigStren.csiSinr);
+ LYINFLOG("[NR signal]ssRsrp is %d , ssRsrq is %d , ssSinr is %d , csiRsrp is %d , csiRsrq is %d , csiSinr is %d",\
+ s_network_urc_solSigStren.ssRsrp,s_network_urc_solSigStren.ssRsrq,s_network_urc_solSigStren.ssSinr, \
+ s_network_urc_solSigStren.csiRsrp,s_network_urc_solSigStren.csiRsrq,s_network_urc_solSigStren.csiSinr);
+ }
+ else
+ {
+ s_network_urc_solSigStren.nr_sig_valid = 0;
+ }
+ }
+ else
+ {
+ s_network_urc_solSigStren.nr_sig_valid = 0;
+ }
send_urc_signal_changes();
break;
}
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp
index 010ed7c..786428f 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-qser-data/lynq-qser-data.cpp
@@ -1473,6 +1473,7 @@
info->ip_family = ip_family;
if ((strncmp(data_call_info.type,"IPV4", strlen("IPV4") + 1) == 0) || (strncmp(data_call_info.type,"IP", strlen("IP") + 1) == 0))
{
+ info->ip_family = QSER_DATA_CALL_TYPE_IPV4;
strcpy(info->v4.name,data_call_info.ifname);
datacall_ipv4_status_judge(data_call_info.active,info);
LYINFLOG("[IPV4]addresses:%s,gateways:%s,dnses:%s",data_call_info.addresses,data_call_info.gateways,data_call_info.dnses);
@@ -1480,6 +1481,7 @@
}
else if (strncmp(data_call_info.type,"IPV6", strlen("IPV6") + 1) == 0)
{
+ info->ip_family = QSER_DATA_CALL_TYPE_IPV6;
strcpy(info->v6.name,data_call_info.ifname);
datacall_ipv6_status_judge(data_call_info.active,info);
LYINFLOG("[IPV6]addresses:%s,gateways:%s,dnses:%s",data_call_info.addresses,data_call_info.gateways,data_call_info.dnses);
@@ -1487,6 +1489,7 @@
}
else if (strncmp(data_call_info.type,"IPV4V6", strlen("IPV4V6") + 1) == 0)
{
+ info->ip_family = QSER_DATA_CALL_TYPE_IPV4V6;
strcpy(info->v4.name,data_call_info.ifname);
datacall_ipv4_status_judge(data_call_info.active,info);
LYINFLOG("[IPV4V6]addresses:%s,gateways:%s,dnses:%s",data_call_info.addresses,data_call_info.gateways,data_call_info.dnses);
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-qser-network/lynq_qser_network.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-qser-network/lynq_qser_network.cpp
index 86f3ed6..e1d2ab4 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-qser-network/lynq_qser_network.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-qser-network/lynq_qser_network.cpp
@@ -134,15 +134,15 @@
{
QSER_NW_SINGNAL_EVENT_IND_T msg_buf;
msg_buf.gsm_sig_info_valid = signalstrength.gw_sig_valid;
- msg_buf.gsm_sig_info.rssi = signalstrength.rssi;
+ msg_buf.gsm_sig_info.rssi = (signalstrength.rssi<<1)-110;
msg_buf.wcdma_sig_info_valid = signalstrength.wcdma_sig_valid;
- msg_buf.wcdma_sig_info.rssi = signalstrength.rscp;
- msg_buf.wcdma_sig_info.ecio = signalstrength.ecno;
+ msg_buf.wcdma_sig_info.rssi = (signalstrength.wcdma_signalstrength<<1)-113;
+ msg_buf.wcdma_sig_info.ecio = signalstrength.ecno/5;
msg_buf.tdscdma_sig_info_valid = 0;
msg_buf.lte_sig_info_valid = signalstrength.lte_sig_valid;
- msg_buf.lte_sig_info.rssi = -125;
- msg_buf.lte_sig_info.rsrp = signalstrength.rsrp;
- msg_buf.lte_sig_info.rsrq = signalstrength.rsrq;
+ msg_buf.lte_sig_info.rssi = (signalstrength.lte_signalstrength<<1)-113;
+ msg_buf.lte_sig_info.rsrp = -signalstrength.rsrp;
+ msg_buf.lte_sig_info.rsrq = -signalstrength.rsrq;
msg_buf.lte_sig_info.snr = signalstrength.rssnr;
msg_buf.cdma_sig_info_valid = 0;
msg_buf.hdr_sig_info_valid = 0;
@@ -736,15 +736,15 @@
return RESULT_ERROR;
}
pt_info->gsm_sig_info_valid = lib_info.gw_sig_valid;
- pt_info->gsm_sig_info.rssi = lib_info.rssi-110;
+ pt_info->gsm_sig_info.rssi = (lib_info.rssi<<1)-110;
pt_info->wcdma_sig_info_valid = lib_info.wcdma_sig_valid;
- pt_info->wcdma_sig_info.rssi = lib_info.wcdma_signalstrength-110;
+ pt_info->wcdma_sig_info.rssi = (lib_info.wcdma_signalstrength<<1)-113;
pt_info->wcdma_sig_info.ecio = lib_info.ecno/5;
pt_info->tdscdma_sig_info_valid = 0;
pt_info->lte_sig_info_valid = lib_info.lte_sig_valid;
- pt_info->lte_sig_info.rssi = lib_info.lte_signalstrength-110;
- pt_info->lte_sig_info.rsrp = lib_info.rsrp*(-1);
- pt_info->lte_sig_info.rsrq = lib_info.rsrq*(-1);
+ pt_info->lte_sig_info.rssi = (lib_info.lte_signalstrength<<1)-113;
+ pt_info->lte_sig_info.rsrp = -lib_info.rsrp;
+ pt_info->lte_sig_info.rsrq = -lib_info.rsrq;
pt_info->lte_sig_info.snr = lib_info.rssnr;
pt_info->cdma_sig_info_valid = 0;
pt_info->hdr_sig_info_valid = 0;
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-uci/include/lynq_uci.h b/cap/zx297520v3/src/lynq/lib/liblynq-uci/include/lynq_uci.h
index 0a08c31..7a75378 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-uci/include/lynq_uci.h
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-uci/include/lynq_uci.h
@@ -23,7 +23,7 @@
int lynq_uci_set(const char *arg);
-int lynq_add_section(char *section_type, char *section);
+int lynq_set_section(char *section_type, char *section);
int lynq_set_value(char *section, char *key, char *value);
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-uci/lynq_uci.config b/cap/zx297520v3/src/lynq/lib/liblynq-uci/lynq_uci.config
index c08d25b..aabd1ba 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-uci/lynq_uci.config
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-uci/lynq_uci.config
@@ -13,11 +13,11 @@
option lynq_gnss_sync_time_enable '0'
config lynq_autosuspend 'lynq_autosuspend'
option auto_enable '0'
- option debug '1'
+ option debug '0'
option whitelist_state '1011'
config debug_mode 'debug_mode'
- option sysinfo_debug_status '1'
+ option sysinfo_debug_status '0'
option check_file_size '228'
config lynq_fota_rw 'lynq_fota'
@@ -32,6 +32,11 @@
config rndis_status 'rndis'
option status '0'
+config 1 'sdk_ready'
+
+config lynq_apn 'lynq_apn'
+ option apn_status '0'
+
config lynq_led_rw 'lynq_led'
option lynq_statusled_on '0'
- option lynq_netled_on '0'
\ No newline at end of file
+ option lynq_netled_on '0'
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-uci/src/lynq_uci.c b/cap/zx297520v3/src/lynq/lib/liblynq-uci/src/lynq_uci.c
index b8a658d..37db955 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-uci/src/lynq_uci.c
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-uci/src/lynq_uci.c
@@ -167,12 +167,11 @@
return 0;//#if UCI_SUPPORT add
}
-int lynq_add_section(char *section_type, char *section)//rita add @2021.7.30 for adding section
+int lynq_set_section(char *section_type, char *section)//rita add @2021.7.30 for adding section
{
#if UCI_SUPPORT
char buf[128] = "";
- sprintf(buf,"lynq_uci.%s=%s", section, section_type);
- //printf("[%s-%d] buf = %s\n", __FUNCTION__, __LINE__, buf);
+ sprintf(buf,"lynq_uci.%s=%s", section_type, section);
int ret = lynq_uci_set(buf);
return ret;
diff --git a/cap/zx297520v3/zxic_code/zxic_binary/zxic_app_release/glibc/lib/libupi_ab.a b/cap/zx297520v3/zxic_code/zxic_binary/zxic_app_release/glibc/lib/libupi_ab.a
index bc86a20..4dea285 100755
--- a/cap/zx297520v3/zxic_code/zxic_binary/zxic_app_release/glibc/lib/libupi_ab.a
+++ b/cap/zx297520v3/zxic_code/zxic_binary/zxic_app_release/glibc/lib/libupi_ab.a
Binary files differ
diff --git a/cap/zx297520v3/zxic_code/zxic_binary/zxic_app_release/glibc/lib/libupi_ab.so b/cap/zx297520v3/zxic_code/zxic_binary/zxic_app_release/glibc/lib/libupi_ab.so
index 2679730..fe069d4 100755
--- a/cap/zx297520v3/zxic_code/zxic_binary/zxic_app_release/glibc/lib/libupi_ab.so
+++ b/cap/zx297520v3/zxic_code/zxic_binary/zxic_app_release/glibc/lib/libupi_ab.so
Binary files differ
diff --git a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3-vehicle_dc_ref.dts b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3-vehicle_dc_ref.dts
index 4f4e580..ca14eb2 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3-vehicle_dc_ref.dts
+++ b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3-vehicle_dc_ref.dts
@@ -204,6 +204,14 @@
linux,code = <KEY_WAKEUP>;
status = "disabled";//jb.qi change on 20231204
};
-
+//xf.li add for status init start
+&gpio_init {
+ status_127{
+ gpio_num = <127>;
+ gpio_dir = <1>;
+ gpio_dout = <1>;
+ };
+//xf.li add for status init end
+};
diff --git a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3.dtsi b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3.dtsi
index 006a945..9d2cb3c 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3.dtsi
+++ b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/arch/arm/boot/dts/zx297520v3.dtsi
@@ -905,7 +905,6 @@
status = "disabled";
};
-
};
firmware {
optee {
@@ -913,6 +912,11 @@
method = "icp";
};
};
+//xf.li add for status init start
+ gpio_init: gpio_init {
+ compatible = "lynq,gpio_init";
+ };
+//xf.li add for status init end
};
#include "zx297520v3-pinctrl.dtsi"
diff --git a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/Makefile b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/Makefile
index 5762280..f920c5e 100644
--- a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/Makefile
+++ b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/Makefile
@@ -22,7 +22,9 @@
obj-$(CONFIG_RAPIDIO) += rapidio/
obj-y += video/
obj-y += idle/
-
+#xf.li add for status init start
+obj-y += lynq_gpio_init/
+#xf.li add for status init end
# IPMI must come before ACPI in order to provide IPMI opregion support
obj-y += char/ipmi/
diff --git a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/lynq_gpio_init/Makefile b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/lynq_gpio_init/Makefile
new file mode 100644
index 0000000..0f7ff3d
--- /dev/null
+++ b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/lynq_gpio_init/Makefile
@@ -0,0 +1,2 @@
+
+obj-y += lynq_gpio_init.o
diff --git a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/lynq_gpio_init/lynq_gpio_init.c b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/lynq_gpio_init/lynq_gpio_init.c
new file mode 100755
index 0000000..5216ddb
--- /dev/null
+++ b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/lynq_gpio_init/lynq_gpio_init.c
@@ -0,0 +1,52 @@
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/gpio.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/platform_device.h>
+
+#include "lynq_gpio_init.h"
+
+static int __init lynq_gpio_init(void)
+{
+ struct device_node *gpio_device_node = NULL;
+ struct device_node *gpio_next_node = NULL;
+ int ret = 0;
+ int node_num = 0;
+ int i;
+
+ printk("GPIO_INIT:init start");
+ //find the dts node
+ gpio_device_node = of_find_node_by_path("/gpio_init");
+ if(gpio_device_node == NULL)
+ {
+ printk("GPIO_INIT: get DTS property failed!\n");
+ return 0;
+ }
+ //get the number of gpio_init child node
+ node_num = of_get_child_count(gpio_device_node);
+//set each gpio
+ for(i = 0; i < node_num; i++)
+ {
+ gpio_next_node = of_get_next_child(gpio_device_node, gpio_next_node);
+ if(gpio_next_node)
+ {
+ printk("GPIO_INIT: exist this node");
+ }
+ else
+ {
+ printk("GPIO_INIT: no more node");
+ break;
+ }
+ ret = set_gpio(gpio_next_node, i);
+ }
+
+ printk("GPIO_INIT:END");
+ return 0;
+}
+device_initcall(lynq_gpio_init);
+MODULE_AUTHOR("Mobiletek");
+MODULE_DESCRIPTION("driver for init gpio");
+MODULE_LICENSE("GPL");
+
diff --git a/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/lynq_gpio_init/lynq_gpio_init.h b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/lynq_gpio_init/lynq_gpio_init.h
new file mode 100755
index 0000000..6025e98
--- /dev/null
+++ b/cap/zx297520v3/zxic_code/zxic_source/linux-5.10/drivers/lynq_gpio_init/lynq_gpio_init.h
@@ -0,0 +1,136 @@
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/gpio.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/kobject.h>
+#include <linux/platform_device.h>
+#include <linux/device.h>
+#include <linux/string.h>
+#include <linux/sysfs.h>
+#include <linux/stat.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+
+struct gpio_node{
+ unsigned gpio_num;
+ int gpio_dir;
+ int gpio_dout;
+ int pre_mdelay_time;
+ int post_mdelay_time;
+};
+
+int set_gpio(struct device_node *gpio_node, int num);
+
+int set_gpio(struct device_node *gpio_node, int num)
+{
+ int ret = 0;
+ unsigned int gpio_num, gpio_dir, gpio_dout, pre_mdelay_time, post_mdelay_time;
+
+ ret = of_property_read_u32(gpio_node, "pre_mdelay_time", &pre_mdelay_time);
+ if(ret == -EINVAL || ret == -ENODATA)
+ {
+ printk("no value or no node");
+ }
+ else if(ret < 0)
+ {
+ printk("GPIO_INIT:READ ERROR: %d", ret);
+ return ret;
+ }
+ else
+ {
+ mdelay(pre_mdelay_time);
+ }
+
+ //get the gpio num
+ ret = of_property_read_u32(gpio_node, "gpio_num", &gpio_num);
+ if(ret == -EINVAL || ret == -ENODATA)
+ {
+ printk("no value or no node");
+ return 0;
+ }
+ else if(ret < 0)
+ {
+ printk("GPIO_INIT:READ ERROR: %d", ret);
+ return ret;
+ }
+
+ printk("GPIO_INIT: the gpio_num is %u", gpio_num);
+ //end of get gpio num
+
+//set gpio dir
+ ret = of_property_read_u32(gpio_node, "gpio_dir", &gpio_dir);
+ if(ret == -EINVAL || ret == -ENODATA)
+ {
+ printk("no value or no node");
+ return ret;
+ }
+ else if(ret < 0)
+ {
+ printk("GPIO_INIT:READ ERROR: %d", ret);
+ return ret;
+ }
+ if(gpio_dir == 0)
+ {
+ printk("GPIO_INIT: gpio_dir is 0, input");
+ gpio_direction_input(gpio_num);
+ }
+ else if (gpio_dir == 1)
+ {
+ //set gpio dout
+ printk("GPIO_INIT: gpio_dir is 1, output");
+ ret = of_property_read_u32(gpio_node, "gpio_dout", &gpio_dout);
+ if(ret == -EINVAL || ret == -ENODATA)
+ {
+ printk("no value or no node");;
+ }
+ else if(ret < 0)
+ {
+ printk("GPIO_INIT:READ ERROR: %d", ret);
+ return ret;
+ }
+ else
+ {
+ printk("GPIO_INIT: the gpio_dout is %u", gpio_dout);
+ if(gpio_dout == 0 || gpio_dout == 1)
+ {
+ ret = gpio_direction_output(gpio_num, gpio_dout);
+ if(ret == 0)
+ {
+ printk("GPIO_INIT: modify successfully");
+ }
+ else
+ {
+ printk("GPIO_INIT: SET REEOR %d", ret);
+ return ret;
+ }
+ }
+ else
+ {
+ printk("GPIO_INIT: dout: %u out of the range 0-1\n", gpio_dout);
+ }
+ }
+ }
+ else
+ {
+ printk("GPIO_INIT: gpio_dir: %u out of the range 0-1\n", gpio_dir);
+ }
+
+ ret = of_property_read_u32(gpio_node, "post_mdelay_time", &post_mdelay_time);
+ if(ret == -EINVAL || ret == -ENODATA)
+ {
+ printk("no value or no node");
+ }
+ else if(ret < 0)
+ {
+ printk("GPIO_INIT:READ ERROR: %d", ret);
+ return ret;
+ }
+ else
+ {
+ mdelay(post_mdelay_time);
+ }
+
+ return ret;
+}
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atconfig/atcmd_stream_proc.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atconfig/atcmd_stream_proc.c
index 925ee0c..9c412c9 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atconfig/atcmd_stream_proc.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atconfig/atcmd_stream_proc.c
@@ -28,18 +28,18 @@
char *at_str = NULL;
int at_fd = 0;
- at_print(AT_ERR,"$$$$$sync_atcmd_stream index=%s\n",index);
+ at_print(AT_DEBUG,"$$$$$sync_atcmd_stream index=%s\n",index);
snprintf(nvname, sizeof(nvname), "atcmd_stream%d", atoi(index));
sc_cfg_get(nvname, nvvalue, NV_MAX_VAL_LEN);
- at_print(AT_ERR,"$$$$$sync_atcmd_stream nv=%s nvlen=%d\n",nvvalue, strlen(nvvalue));
+ at_print(AT_DEBUG,"$$$$$sync_atcmd_stream nv=%s nvlen=%d\n",nvvalue, strlen(nvvalue));
at_str = malloc(SOC_MSG_MAX_LEN);
if(at_str == NULL){softap_assert("");}
sprintf(at_str,"%s:%s",nvname, nvvalue);
- at_print(AT_ERR,"$$$$$sync_atcmd_stream len=%d\n",strlen(at_str));
+ at_print(AT_DEBUG,"$$$$$sync_atcmd_stream len=%d\n",strlen(at_str));
at_fd = at_context_get_fd_by_pos(position);
at_socmsg_write(at_fd, MODULE_ID_AT_CTL,MODULE_ID_AT_CTL, MSG_CMD_SYNC_ATCMD_STREAM, strlen(at_str), at_str);
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atconfig/ps_normal.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atconfig/ps_normal.c
index e0c8800..3a9f5b7 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atconfig/ps_normal.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atconfig/ps_normal.c
@@ -1206,7 +1206,7 @@
{
T_zAt_SignalBarInfo signalBarInfo = {0};
normal_getsignalbarinfo(&signalBarInfo, ZAT_SIGNALBAR_TYPE_LTE);
- printf("atBase_CalcLteSignalBar: %d <= sigbar0 <= %d, %d <= sigbar1 <= %d, %d <= sigbar2 <= %d, %d <= sigbar3 <= %d,%d <= sigbar4 <= %d, %d <= sigbar5 <= %d,!\n", \
+ at_print(AT_DEBUG,"atBase_CalcLteSignalBar: %d <= sigbar0 <= %d, %d <= sigbar1 <= %d, %d <= sigbar2 <= %d, %d <= sigbar3 <= %d,%d <= sigbar4 <= %d, %d <= sigbar5 <= %d,!\n", \
signalBarInfo.signalbar0_low, signalBarInfo.signalbar0_high, signalBarInfo.signalbar1_low, signalBarInfo.signalbar1_high,signalBarInfo.signalbar2_low, \
signalBarInfo.signalbar2_high,signalBarInfo.signalbar3_low,signalBarInfo.signalbar3_high,signalBarInfo.signalbar4_low, signalBarInfo.signalbar4_high, \
signalBarInfo.signalbar5_low, signalBarInfo.signalbar5_high);
@@ -1253,7 +1253,7 @@
{
T_zAt_SignalBarInfo signalBarInfo = {0};
normal_getsignalbarinfo(&signalBarInfo, ZAT_SIGNALBAR_TYPE_TDS);
- printf("atBase_CalcTdSignalBar: %d <= sigbar0 <= %d, %d <= sigbar1 <= %d, %d <= sigbar2 <= %d, %d <= sigbar3 <= %d,%d <= sigbar4 <= %d, %d <= sigbar5 <= %d!\n", \
+ at_print(AT_DEBUG,"atBase_CalcTdSignalBar: %d <= sigbar0 <= %d, %d <= sigbar1 <= %d, %d <= sigbar2 <= %d, %d <= sigbar3 <= %d,%d <= sigbar4 <= %d, %d <= sigbar5 <= %d!\n", \
signalBarInfo.signalbar0_low, signalBarInfo.signalbar0_high, signalBarInfo.signalbar1_low, signalBarInfo.signalbar1_high,signalBarInfo.signalbar2_low, \
signalBarInfo.signalbar2_high,signalBarInfo.signalbar3_low,signalBarInfo.signalbar3_high,signalBarInfo.signalbar4_low, signalBarInfo.signalbar4_high, \
signalBarInfo.signalbar5_low, signalBarInfo.signalbar5_high);
@@ -1301,7 +1301,7 @@
T_zAt_SignalBarInfo signalBarInfo = {0};
normal_getsignalbarinfo(&signalBarInfo, ZAT_SIGNALBAR_TYPE_GSM);
- printf("atBase_CalcOtherSignalBar: %d <= sigbar0 <= %d, %d <= sigbar1 <= %d, %d <= sigbar2 <= %d, %d <= sigbar3 <= %d,%d <= sigbar4 <= %d, %d <= sigbar5 <= %d,!\n", \
+ at_print(AT_DEBUG,"atBase_CalcOtherSignalBar: %d <= sigbar0 <= %d, %d <= sigbar1 <= %d, %d <= sigbar2 <= %d, %d <= sigbar3 <= %d,%d <= sigbar4 <= %d, %d <= sigbar5 <= %d,!\n", \
signalBarInfo.signalbar0_low, signalBarInfo.signalbar0_high, signalBarInfo.signalbar1_low, signalBarInfo.signalbar1_high,signalBarInfo.signalbar2_low, \
signalBarInfo.signalbar2_high,signalBarInfo.signalbar3_low,signalBarInfo.signalbar3_high,signalBarInfo.signalbar4_low, signalBarInfo.signalbar4_high, \
signalBarInfo.signalbar5_low, signalBarInfo.signalbar5_high);
@@ -1360,7 +1360,7 @@
char netType[30] = {0};
char strRssi[30] = { 0 };
long csq = 0;
- at_print(AT_DEBUG,"normal_calcsignalbar!\n");
+ //at_print(AT_DEBUG,"normal_calcsignalbar!\n");
UINT32 signalbar = 0;
char oldSignalbar[10] = {0};
char newSignalbar[10] = {0};
@@ -2203,19 +2203,19 @@
&&0 == strcmp("modem_init_complete",modemState))
{
sc_cfg_set(NV_PIN_PUK_PROCESS, "end");
- printf("pin_puk_process = end --- modem_init_complete");
+ at_print(AT_DEBUG,"pin_puk_process = end --- modem_init_complete");
}
/*web pin¡¢pukÂëÑéÖ¤¶¯×÷½áÊøºó£¬·¢ZAT_SYSCONFIGREAD_CMD*/
else if(strcmp(pinProcess,"begin") == 0)
{
sc_cfg_set(NV_PIN_PUK_PROCESS, "end");
- printf("pin_puk_process = end");
+ at_print(AT_DEBUG,"pin_puk_process = end");
}
/*web pinÂë¹ÜÀí¶¯×÷´¥·¢ZrapºóÎÞÏÂÒ»ÌõAT£¬½«ATÃüÁîÔ´¸³ÖµÎªATMIAN*/
if(strcmp(pinManage,"begin") == 0)
{
- printf("pin_manage_process = end");
+ at_print(AT_DEBUG,"pin_manage_process = end");
sc_cfg_set(NV_PIN_MANAGE_PROCESS, "end");
}
}
@@ -4507,7 +4507,7 @@
char versionmode[2] = {0};
void *p[6] = {&tAtRes.stat, tAtRes.lac, tAtRes.rac, &tAtRes.act, tAtRes.ci, &tAtRes.subact};
- at_print(AT_DEBUG,"cgreg_auto_act at_paras=%s!\n",at_paras);
+ //at_print(AT_DEBUG,"cgreg_auto_act at_paras=%s!\n",at_paras);
parse_param2("%d,%s,%s,%d,%s,%d", at_paras, p);
at_print(AT_DEBUG,"cgreg_auto_act stat=%d,lac=%s,rac=%s,act=%d,ci=%s,subact=%d!\n",
tAtRes.stat, tAtRes.lac, tAtRes.rac, tAtRes.act, tAtRes.ci, tAtRes.subact);
@@ -5212,7 +5212,7 @@
{
snprintf(convertDataStr+strlen(convertDataStr),AT_USSD_DATA_TO_WEB_LEN,"%04x",dataStr[iDataLen]);
}
- printf("%s\n",convertDataStr);
+ at_print(AT_DEBUG,"%s\n",convertDataStr);
}
VOID atBase_Convert8BitToUCS2(const CHAR *dataStr,CHAR *convertDataStr,UINT16 dataLen)
@@ -5234,7 +5234,7 @@
snprintf(convertDataStr+strlen(convertDataStr),AT_USSD_DATA_TO_WEB_LEN,"%c",dataStr[iDataLen]);
}
}
- printf("%s\n",convertDataStr);
+ at_print(AT_DEBUG,"%s\n",convertDataStr);
}
@@ -5263,7 +5263,7 @@
}
else
{
- printf("DCS Reported can't be processed!!!!\n");
+ at_print(AT_DEBUG,"DCS Reported can't be processed!!!!\n");
return FALSE;
}
}
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atconfig/ps_pdp.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atconfig/ps_pdp.c
index ff164db..4f3ab13 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atconfig/ps_pdp.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atconfig/ps_pdp.c
@@ -2053,7 +2053,7 @@
cur_cid = pdpDeactReq.c_id;
- at_print(AT_ERR,"pdp_deact_func: source is %x, g_defcid_msg.modid is %x, cid is %d\n",p_msg->src_id, g_defcid_mng.modid, cur_cid);
+ at_print(AT_DEBUG,"pdp_deact_func: source is %x, g_defcid_msg.modid is %x, cid is %d\n",p_msg->src_id, g_defcid_mng.modid, cur_cid);
if(context->source == MODULE_ID_PPPD)
{
//¶ÔÓÚPCÖն˷¢ÆðµÄppp terminate£¬ÔÚÐÉÌÍê³Éºó£¬ppp֪ͨat_ctl·¢ÆðpdpÈ¥¼¤»î
@@ -3486,7 +3486,7 @@
at_print(AT_DEBUG,"@@@@@@@@@@@@@start_pdp_auto_dial g_pdp_set_info=0x%p, auto_connect is %s!\n",g_defcid_mng.set_info, auto_reconnect);
if((0 == check_is_fd(g_defcid_mng.modid)) && 0 == strcmp(auto_reconnect,"1"))
{
- at_print(AT_DEBUG,"@@@@@@@@@@@@@start_pdp_auto_dial: apn is %s, modid is %x!\n", g_defcid_mng.set_info->comm_info.apn, g_defcid_mng.modid);
+ //at_print(AT_DEBUG,"@@@@@@@@@@@@@start_pdp_auto_dial: apn is %s, modid is %x!\n", g_defcid_mng.set_info->comm_info.apn, g_defcid_mng.modid);
//ÊÕµ½×¤Íø³É¹¦ºó£¬ÉèÖÃÒ»¸ö5s¶¨Ê±Æ÷£¬³¬Ê±ºó½øÐÐpdp²¦ºÅÇëÇó
if(0 == strcmp(reconnect_type,"simple"))
{
@@ -3559,7 +3559,7 @@
int cid,bearid;
char apn[256]= {0};
void *p[3] = {&cid, &bearid, apn};
- at_print(AT_ERR,"@@!!@@cgcontrdp_auto_act at_paras=%s!\n",at_paras);
+ //at_print(AT_ERR,"@@!!@@cgcontrdp_auto_act at_paras=%s!\n",at_paras);
ret = parse_param("%d,%d,%255s", at_paras, p);
if (ret != AT_PARSE_OK)
return AT_END;
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atconfig/ps_sms.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atconfig/ps_sms.c
index 55bd76b..6ec91ab 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atconfig/ps_sms.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atconfig/ps_sms.c
@@ -545,7 +545,7 @@
tZmglRsp.length = tSmsPara.length;
sscanf(at_str,"%399s", tZmglRsp.pdu);
waiting_pdu = FALSE;
- printf("[at-sms] pdu data_len:%d, str:%s!\n", strlen(tZmglRsp.pdu),tZmglRsp.pdu);
+ at_print(AT_DEBUG,"[at-sms] pdu data_len:%d, str:%s!\n", (int)strlen(tZmglRsp.pdu),tZmglRsp.pdu);
#if (APP_OS_TYPE == APP_OS_LINUX)//corem£¬ÐèÒªÓÅ»¯£¬ÐèÒªÔö¼ÓÅжÏÊÇ·ñ´æÔÚsmsÄ£¿é
ipc_send_message(MODULE_ID_AT_CTL, MODULE_ID_SMS, MSG_CMD_ZMGL_IND, sizeof(T_zSms_SmsInd), (unsigned char *)&tZmglRsp,0);
#endif
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_com.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_com.c
index 45cb788..4abdeb0 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_com.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_com.c
@@ -815,7 +815,7 @@
memcpy(volte_msg.msg_data, buf+snd_len, next_len);
volte_msg.msg_len = next_len;
ret = ipc_send_message(MODULE_ID_AT_CTL, MODULE_ID_VOLTE, MSG_CMD_FD1_ATCTL_TO_VOLTE, sizeof(VOLTE_MSG_DATA), (unsigned char *)&volte_msg, IPC_NOWAIT);
- at_print(AT_ERR,"====>FD1_ATCTL_TO_VOLTE+%d str=%s\n", snd_len, buf+snd_len);
+ at_print(AT_DEBUG,"====>FD1_ATCTL_TO_VOLTE+%d str=%s\n", snd_len, buf+snd_len);
snd_len = snd_len + next_len;
}
}
@@ -840,7 +840,7 @@
memcpy(volte_msg.msg_data, buf+snd_len, next_len);
volte_msg.msg_len = next_len;
ret = ipc_send_message(MODULE_ID_AT_CTL, MODULE_ID_VOLTE, MSG_CMD_FD2_ATCTL_TO_VOLTE, sizeof(VOLTE_MSG_DATA), (unsigned char *)&volte_msg, IPC_NOWAIT);
- at_print(AT_ERR,"====>FD2_ATCTL_TO_VOLTE+%d str=%s\n", snd_len, buf+snd_len);
+ at_print(AT_DEBUG,"====>FD2_ATCTL_TO_VOLTE+%d str=%s\n", snd_len, buf+snd_len);
snd_len = snd_len + next_len;
}
}
@@ -951,7 +951,7 @@
sockfd = socket(PF_UNIX, SOCK_STREAM, 0);
if(sockfd < 0)
{
- printf("socket failed : %s!\r\n", strerror(errno));
+ at_print(AT_DEBUG,"socket failed : %s!\r\n", strerror(errno));
return -1;
}
addr.sun_family = AF_UNIX;
@@ -961,7 +961,7 @@
ret = connect(sockfd, (struct sockaddr *)&addr, len);
if(ret < 0)
{
- printf("connect failed : %s!\r\n", strerror(errno));
+ at_print(AT_DEBUG,"connect failed : %s!\r\n", strerror(errno));
close(sockfd);
sockfd = -1;
return -1;
@@ -986,7 +986,7 @@
goto send_again;
else
{
- printf("unix_send_proc: send failed: errno=%d, %s\r\n", errno, strerror(errno));
+ at_print(AT_DEBUG,"unix_send_proc: send failed: errno=%d, %s\r\n", errno, strerror(errno));
close(sockfd);
sockfd = -1;
return -1;
@@ -994,7 +994,7 @@
}
else if(len == 0)
{
- printf("unix_send_proc: send 0 data errno=%d, %s \n", errno, strerror(errno));
+ at_print(AT_DEBUG,"unix_send_proc: send 0 data errno=%d, %s \n", errno, strerror(errno));
}
#endif
return 0;
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_context.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_context.c
index 43b3d40..c87c8d2 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_context.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_context.c
@@ -299,7 +299,7 @@
}
}
if((strstr(port_name,"/dev/ttyGS1") == NULL) && (strstr(cap_port_name, "/dev/ttyGS1") != NULL)){
- /*g_farps_fd2 = at_open("/dev/armps_rpmsgch31",O_RDWR);
+ g_farps_fd2 = at_open("/dev/armps_rpmsgch31",O_RDWR);
at_print(AT_ERR,"init open armps_rpmsgch31 => fd: %d er_no: %d\n", g_farps_fd2, errno);
if(g_farps_fd2 >= 0){
channel_config(g_farps_fd2);
@@ -307,7 +307,7 @@
at_close(g_farps_fd2);
g_farps_fd2=-1;
}
- }*/
+ }
}
at_portmng_set_state_proc("/dev/ptmx",1,0);
#endif
@@ -480,7 +480,7 @@
{
struct at_channel_info* node = at_channel_head[position];
struct at_channel_info* tmp_node = NULL;
- at_print(AT_ERR,"context_get_free_chninfo_node \n");
+ //at_print(AT_ERR,"context_get_free_chninfo_node \n");
for(;node; node = node->next)
{
if((context_type == AT_CLIENT || context_type == AT_FWD_DOWN) && (node->reserved == 1))
@@ -809,7 +809,7 @@
{
struct at_context * context = NULL;
struct at_channel_info * at_channel = at_context_find_chn_by_fd(at_fd);
- at_print(AT_ERR, "at_context_alloc_ctx_by_fd \n");
+ //at_print(AT_ERR, "at_context_alloc_ctx_by_fd \n");
if(context_type != AT_FWD_UP&&context_type != AT_SERVER)
{
softap_assert("api only support up and server, now context_type is %d",context_type);
@@ -826,7 +826,7 @@
at_print(AT_ERR,"ERR: work_state err ,work_state is %d, context type is %d\n",at_channel->work_state,context_type);
}
at_channel->work_state |= (1<<context_type);
- at_print(AT_ERR,"at_context_alloc_ctx_by_fd\n");
+ //at_print(AT_ERR,"at_context_alloc_ctx_by_fd\n");
context = context_alloc_at_context(at_channel,context_type);
return context;
}
@@ -877,7 +877,7 @@
free(context->app_param);
//Çå¿Õ¶ÔӦͨµÀÉϵÄλͼ
at_chann->work_state ^= (1<<context->context_type);
- at_print(AT_DEBUG,"at_context_free_ctx at_fd = %d state = %d \n",at_chann->at_fd,at_chann->work_state);
+ //at_print(AT_DEBUG,"at_context_free_ctx at_fd = %d state = %d \n",at_chann->at_fd,at_chann->work_state);
ret = context_del_at_context(context);
//at_fdСÓÚ0£¬Ôò˵Ã÷µ±Ç°atͨµÀÒѾ¹Ø±Õ£¬ÐèÒª½«Í¨µÀÉÏÏÂÎÄÒ²Êͷŵô
if(at_chann->at_fd < 0)
@@ -1258,7 +1258,7 @@
//if(left_len == 0)
//ret = len;
- at_print(AT_ERR,"at_write fd=%d,len=%d,ret=%d,data=%s \n",at_fd,len,ret,get_small_str(data));
+ //at_print(AT_DEBUG,"at_write fd=%d,len=%d,ret=%d,data=%s \n",at_fd,len,ret,get_small_str(data));
return ret;
}
@@ -1343,7 +1343,7 @@
{
MSG_BUF stMsg = {0};
- at_print(AT_ERR,"Enter resend_rcv_atstr, fd:%d str:%s!!!\n", at_fd, at_str);
+ at_print(AT_DEBUG,"Enter resend_rcv_atstr, fd:%d str:%s!!!\n", at_fd, at_str);
if(at_fd >= MODULE_ID_ATCTL_TO_VOLTE && at_fd < MODULE_ID_ATCTL_TO_VOLTE+VOLTE_PTY1_MAX)
{
@@ -1413,7 +1413,7 @@
MSG_BUF stMsg = {0};
at_msg.at_fd = at_fd;
- at_print(AT_ERR,"Enter delay_resend_atstr, at_str:%s!!!\n", at_str);
+ at_print(AT_DEBUG,"Enter delay_resend_atstr, at_str:%s!!!\n", at_str);
//zdm ÕâÀïÊÇÓÉÓÚatÃüÁî½âÎöÍê³Éºó£¬ÒѾ½«\r\nÈ¥³ý£¬Èç¹ûatͨµÀ²»×ãʱ£¬ÐèÒª½«atÃüÁî
//ÖØе±×ö´ÓatͨµÀ¶ÁÈ¡µ½µÄatÃüÁî·¢¸øÖ÷Ï̴߳¦Àí£¬Òò´ËÐèÒª½«\r\nÖØÐÂÌí¼ÓÉÏ
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_ctl.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_ctl.c
index d490308..602efd9 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_ctl.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_ctl.c
@@ -341,7 +341,7 @@
struct at_context *context = NULL;
struct app_clt_ops_t *ext_nod = NULL;
int is_bl_to_volte = 0;
- at_print(AT_ERR,"rcv_clt_req_msg_proc \n");
+ //at_print(AT_ERR,"rcv_clt_req_msg_proc \n");
/* ÅжÏÊÇ·ñΪͬһ¸öÄ£¿é·¢ËÍÀ´µÄÁ¬ÐøÁ½ÌõÒ»ÑùµÄÇëÇóÏûÏ¢£¬Èç¹ûÊÇ£¬ÔòÈ¡Ïû¸Ã´Î²Ù×÷*/
if(1 == at_context_clt_abort_handle(msg_buf))
return 1;
@@ -407,7 +407,7 @@
struct at_context *context = NULL;
if(msg_buf->usMsgCmd != ATCTL_RCV_AT_STR_MSG)//¶ÔÓÚÀ´×Ô×ÓÏ̵߳ÄatÃüÁîÏûÏ¢£¬²»´òÓ¡
- at_print(AT_ERR,"rcv_msg_proc recv usMsgCmd = 0x%x, source is 0x%x\n",msg_buf->usMsgCmd, msg_buf->src_id);
+ at_print(AT_DEBUG,"rcv_msg_proc recv usMsgCmd = 0x%x, source is 0x%x\n",msg_buf->usMsgCmd, msg_buf->src_id);
switch (msg_buf->usMsgCmd)
{
case ATCTL_RCV_AT_STR_MSG:/* atͨµÀÏûÏ¢´¦Àí¡£À´×Ôat_ctl×ÓÏ̵߳ÄÏûÏ¢*/
@@ -498,8 +498,8 @@
int volte_req_fd = volte_req->at_fd;
if(volte_req_fd >= 1 && volte_req_fd <= VOLTE_PTY1_MAX)
{
- at_print(AT_ERR,"====>FD1_VOLTE_TO_ATCTL fd=%d\n", volte_req_fd);
- at_print(AT_ERR,"====>FD1_VOLTE_TO_ATCTL str=%s\n", volte_req->msg_data);
+ at_print(AT_DEBUG,"====>FD1_VOLTE_TO_ATCTL fd=%d,str=%s\n", volte_req_fd,volte_req->msg_data);
+ //at_print(AT_ERR,"====>FD1_VOLTE_TO_ATCTL str=%s\n", volte_req->msg_data);
save_monitor_at_buf(MODULE_ID_ATCTL_TO_VOLTE+volte_req_fd-1, (char *)volte_req->msg_data, volte_req->msg_len, AT_RECV_TYPE);
rcv_at_str_proc(MODULE_ID_ATCTL_TO_VOLTE+volte_req_fd-1, (char *)volte_req->msg_data, volte_req->msg_len);
}
@@ -512,8 +512,8 @@
int volte_req_fd = volte_req->at_fd;
if(volte_req_fd >= 1 && volte_req_fd <= VOLTE_PTY2_MAX)
{
- at_print(AT_ERR,"====>FD2_VOLTE_TO_ATCTL fd=%d\n", volte_req_fd);
- at_print(AT_ERR,"====>FD2_VOLTE_TO_ATCTL str=%s\n", volte_req->msg_data);
+ at_print(AT_DEBUG,"====>FD2_VOLTE_TO_ATCTL fd=%d, str=%s\n", volte_req_fd, volte_req->msg_data);
+ //at_print(AT_ERR,"====>FD2_VOLTE_TO_ATCTL str=%s\n", volte_req->msg_data);
save_monitor_at_buf(MODULE_ID_VOLTE_TO_ATCTL+volte_req_fd-1, (char *)volte_req->msg_data, volte_req->msg_len, AT_RECV_TYPE);
rcv_at_str_proc(MODULE_ID_VOLTE_TO_ATCTL+volte_req_fd-1, (char *)volte_req->msg_data, volte_req->msg_len);
}
@@ -572,7 +572,7 @@
#ifdef _USE_BL
case MSG_CMD_MODESET_REQ:
{
- at_print(AT_ERR,"recv MSG_CMD_MODESET_REQ\n");
+ at_print(AT_DEBUG,"recv MSG_CMD_MODESET_REQ\n");
zmode_msg_act(msg_buf);
break;
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_netdog.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_netdog.c
index 6d8b9c1..a29cbdb 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_netdog.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_netdog.c
@@ -88,7 +88,7 @@
static void at_context_print(struct at_context * ct_node)
{
struct list_head * entry = NULL;
- at_print(AT_ERR,"ch=%p type=%d src=%x msgid=%x para=%p fwdct=%p tick=%ld\n",ct_node->at_channel
+ at_print(AT_DEBUG,"ch=%p type=%d src=%x msgid=%x para=%p fwdct=%p tick=%ld\n",ct_node->at_channel
,ct_node->context_type,ct_node->source,ct_node->msg_id,ct_node->app_param,ct_node->fwd_context,ct_node->cur_tick);
at_print(AT_ERR,"prefix=%s\n",ct_node->at_cmd_prefix);
list_for_each(entry,&g_appclt_list)
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_rcvmsg.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_rcvmsg.c
index 7ca7391..fd00d5e 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_rcvmsg.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_rcvmsg.c
@@ -382,7 +382,7 @@
struct ser_ops_t *rcv_req_node = NULL;
struct at_channel_info *new_chan = NULL;
void * res_msg = NULL;
- at_print(AT_ERR, "ext_req_to_app \n");
+ //at_print(AT_ERR, "ext_req_to_app \n");
//¶Ô·ÇµçÐÅÀàÀ©Õ¹ATÇëÇóµÄÆ¥Åä´¦Àí
list_for_each_entry(rcv_req_node,&g_ser_list,list)
{
@@ -420,7 +420,7 @@
softap_assert("exception");
if(rcv_req_node->module_id)
{
- at_print(AT_ERR, "ext_req_to_app 2\n");
+ //at_print(AT_ERR, "ext_req_to_app 2\n");
//¶ÔÓÚ·þÎñ¶ËÕ¼ÓõÄatͨµÀ£¬¾ßÓжÀÕ¼ÐÔ£¬½öÔÚatͨµÀÒѾ¹Ø±Õʱ£¬ÉêÇëÉÏÏÂÎIJŻáʧ°Ü£¬Òò´ËÊÍ·ÅÄÚ´æºó£¬Ö±½Ó·µ»Ø¼´¿É£¬ÎÞÐèÔÙ·¢ËÍÏûÏ¢
context = at_context_alloc_ctx_by_fd(at_fd,AT_SERVER);
if(NULL == context)
@@ -559,7 +559,7 @@
struct at_context *up_context;
struct at_context *down_context;
int down_position = 0;
- at_print(AT_ERR, "fwd_req_at_proc \n");
+ //at_print(AT_ERR, "fwd_req_at_proc \n");
//ÉÏÓÎÓÖÊÕµ½ÇëÇóÀàATÃüÁת·¢¸øÏÂÓÎ
context = at_context_find_ctx_by_fd_type(at_fd, AT_FWD_UP); // kw 3
if(context)
@@ -725,7 +725,7 @@
int msgtype = get_msgtype(at_str);
int ret = AT_END;
- at_print(AT_ERR, "rcvmsg_rsp_at_fwd_down context->prefix = %s \n" ,context->at_cmd_prefix);
+ at_print(AT_DEBUG, "rcvmsg_rsp_at_fwd_down context->prefix = %s \n" ,context->at_cmd_prefix);
/* ¶ÔÓÚת·¢ÏÂÓÎÊÕµ½µÄÓ¦´ð´¦Àí,Ö»ÓÐPDP¼¤»îµÄת·¢ÐèÒª¼à¿Ø£¬Ò»°ãµÄATÃüÁîת·¢ÎÞÐè¼à¿Ø,Ö±½Óת·¢Í¸´«¸øÉÏÓÎλÖÃ*/
if(context->at_proc != NULL)
{
@@ -768,7 +768,7 @@
int res_msglen = 0;
struct app_clt_ops_t *clt_nod = NULL;
- at_print(AT_ERR, "rcvmsg_rsp_at_client context->prefix = %s \n" ,context->at_cmd_prefix);
+ at_print(AT_DEBUG, "rcvmsg_rsp_at_client context->prefix = %s \n" ,context->at_cmd_prefix);
//оƬÈÏÖ¤ÅжϷÖÖ§
if(atcmd_stream_rep_proc(context, at_str))
@@ -892,12 +892,12 @@
if(at_strstr(PsmIndAtCmdPrefix, temp_prefix))
{
set_fwd_fd(BROADCAST_FWD);
- at_print(AT_ERR,"[XXX]set_fwd_fd 111\n");
+ at_print(AT_DEBUG,"[XXX]set_fwd_fd 111\n");
}
else
{
set_fwd_fd(BROADCAST_VOLTE);
- at_print(AT_ERR,"[XXX]set_fwd_fd 222\n");
+ at_print(AT_DEBUG,"[XXX]set_fwd_fd 222\n");
}
}
else if(strlen(FwIndAtCmdPrefix) != 0)
@@ -905,18 +905,18 @@
if(at_strstr(FwIndAtCmdPrefix, temp_prefix))
{
set_fwd_fd(BROADCAST_FWD);
- at_print(AT_ERR,"[XXX]set_fwd_fd 333\n");
+ at_print(AT_DEBUG,"[XXX]set_fwd_fd 333\n");
}
else
{
set_fwd_fd(BROADCAST_VOLTE);
- at_print(AT_ERR,"[XXX]set_fwd_fd 444\n");
+ at_print(AT_DEBUG,"[XXX]set_fwd_fd 444\n");
}
}
else
{
set_fwd_fd(BROADCAST_FWD);
- at_print(AT_ERR,"[XXX]set_fwd_fd 555\n");
+ at_print(AT_DEBUG,"[XXX]set_fwd_fd 555\n");
}
}
/* ½«VOLTEµÄÖ÷¶¯Éϱ¨·¢Ë͸øFAR_PS*/
@@ -927,12 +927,12 @@
if(at_strstr(PsmIndAtCmdPrefix, temp_prefix))
{
set_fwd_fd(BROADCAST_FARPS);
- at_print(AT_ERR,"[XXX]set_fwd_fd 666\n");
+ at_print(AT_DEBUG,"[XXX]set_fwd_fd 666\n");
}
else
{
set_fwd_fd(0);
- at_print(AT_ERR,"[XXX]set_fwd_fd 777\n");
+ at_print(AT_DEBUG,"[XXX]set_fwd_fd 777\n");
}
}
else if(strlen(FwIndAtCmdPrefix) != 0)
@@ -940,25 +940,25 @@
if(at_strstr(FwIndAtCmdPrefix, temp_prefix))
{
set_fwd_fd(BROADCAST_FARPS);
- at_print(AT_ERR,"[XXX]set_fwd_fd 888\n");
+ at_print(AT_DEBUG,"[XXX]set_fwd_fd 888\n");
}
else
{
set_fwd_fd(0);
- at_print(AT_ERR,"[XXX]set_fwd_fd 999\n");
+ at_print(AT_DEBUG,"[XXX]set_fwd_fd 999\n");
}
}
else
{
set_fwd_fd(BROADCAST_FARPS);
- at_print(AT_ERR,"[XXX]set_fwd_fd AAA\n");
+ at_print(AT_DEBUG,"[XXX]set_fwd_fd AAA\n");
}
}
//fd²»ÊÇÕæʵµÄͨµÀ£¨½«ÏûÏ¢Ô´×÷Ϊfd£©ÉÏÊÕµ½µÄÖ÷¶¯Éϱ¨²»²ÎÓë¹ýÂË
else if(check_is_fd(at_fd) == 0 && position == NEAR_PS)
{
set_fwd_fd(BROADCAST_FARPS);
- at_print(AT_ERR,"[XXX]set_fwd_fd BBB\n");
+ at_print(AT_DEBUG,"[XXX]set_fwd_fd BBB\n");
}
}
@@ -979,7 +979,7 @@
if( (prefix_len >0 && at_cmd_prefix != NULL && 0 == at_strncmp(context->at_cmd_prefix,(char*)at_cmd_prefix, prefix_len))
|| (prefix_len >0 && at_cmd_prefix != NULL && 0==strncmp("> ",at_cmd_prefix, prefix_len)))
{
- at_print(AT_ERR,"receive client inform str = %s, fd = %d\n", at_str, at_fd);
+ at_print(AT_ERR,"receive client inform str = %s, fd = %d\n", get_small_str(at_str), at_fd);
//оƬÈÏÖ¤ÅжϷÖÖ§
if(atcmd_stream_inform_proc(context, at_str))
return 0;
@@ -1010,8 +1010,8 @@
*/
if( (prefix_len >0 && at_cmd_prefix != NULL && 0 == at_strncmp(fwd_context->at_cmd_prefix, (char*)at_cmd_prefix, prefix_len))
||(prefix_len >0 && at_cmd_prefix != NULL && 0==strncmp("> ",at_cmd_prefix, prefix_len)) )
- {
- at_print(AT_ERR,"receive fwd_down inform str = %s, fd = %d\n", at_str, at_fd);
+ {
+ at_print(AT_ERR,"receive fwd_down inform str = %s, fd = %d\n", get_small_str(at_str), at_fd);
set_fwd_fd(fwd_context->fwd_context->at_channel->at_fd);
if(strstr(at_str,"> ") != NULL)
{
@@ -1030,7 +1030,7 @@
/* Ò»°ãÖ÷¶¯Éϱ¨£¬½ö´¦Àíg_auto_fdͨµÀµÄÖ÷¶¯Éϱ¨ºÍVOLTEµÄÖ÷¶¯Éϱ¨£¬g_auto_fdĬÈÏÑ¡ÔñµÚÒ»¸ö´ò¿ªµÄNEAR_PSλÖõÄatͨµÀ*/
if(g_auto_fd == at_fd || position == POSITION_VOLTE || position == FAR_PS)
{
- at_print(AT_ERR,"receive auto report str = %s, fd = %d, g_auto_fd = %d, position = %d\n", at_str, at_fd, g_auto_fd, position);
+ at_print(AT_DEBUG,"receive auto report str = %s, fd = %d, g_auto_fd = %d, position = %d\n", get_small_str(at_str), at_fd, g_auto_fd, position);
list_for_each_entry(entry,&g_inform_list,list)
{
@@ -1061,7 +1061,7 @@
//ÏûÏ¢·¢ËÍʧ°Ü£¬Ö±½Ó·µ»ØERROR²¢ÊÍ·ÅͨµÀÉÏÏÂÎÄ
if(at_cmd_paras && 0 != ipc_send_message2(MODULE_ID_AT_CTL, entry0->module_id, entry0->req_msg_id, strlen(at_cmd_paras)+1, at_cmd_paras,0))
{
- at_print(AT_ERR,"inform_act at_cmd_prefix0 ipc err\n");
+ at_print(AT_DEBUG,"inform_act at_cmd_prefix0 ipc err\n");
}
}
}
@@ -1180,7 +1180,7 @@
if(fwd_fd != 0 && whole_at_type != at_str_type)
return 0;
- at_print(AT_ERR,"at_rcvmsg_handle AT_TYPE_REQUEST str=%s, at_fd = %d, at_cmd_paras: %s, prefix_len: %d, paras_len: %d\n",at_str, at_fd,(char *)at_cmd_paras, prefix_len, paras_len);
+ at_print(AT_DEBUG,"at_rcvmsg_handle AT_TYPE_REQUEST str=%s, at_fd = %d, at_cmd_paras: %s, prefix_len: %d, paras_len: %d\n",at_str, at_fd,(char *)at_cmd_paras, prefix_len, paras_len);
//µ±Ç°×º³¤¶È´óÓÚǰ׺×î´ó±£´æ³¤¶Èʱ£¬±¨´í add by zpr 210115
if(prefix_len >= AT_CMD_PREFIX)
{
@@ -1194,14 +1194,14 @@
}
else if(at_str_type == AT_TYPE_RESPONSE)//ÏìÓ¦ÀàÃüÁî´¦Àí
{
- at_print(AT_ERR,"at_rcvmsg_handle AT_TYPE_RESPONSE str=%s, at_fd = %d, at_cmd_paras: %s, prefix_len: %d, paras_len: %d\n",at_str, at_fd,(char *)at_cmd_paras, prefix_len, paras_len);
+ at_print(AT_DEBUG,"at_rcvmsg_handle AT_TYPE_RESPONSE str=%s, at_fd = %d, at_cmd_paras: %s, prefix_len: %d, paras_len: %d\n",at_str, at_fd,(char *)at_cmd_paras, prefix_len, paras_len);
return rcv_at_rsp_handle(at_fd, at_str, at_cmd_prefix, prefix_len, at_cmd_paras, paras_len);
}
else if(at_str_type == AT_TYPE_INFORM)//Öмä½á¹ûÃüÁîºÍÖ÷¶¯Éϱ¨´¦Àí
return rcv_at_inform_handle(at_fd, at_str, at_cmd_prefix, prefix_len, at_cmd_paras, paras_len);
else if(at_str_type == AT_TYPE_PDU)//PDU´¦Àí
{
- at_print(AT_ERR,"at_rcvmsg_handle AT_TYPE_PDU at_fd = %d, prefix_len: %d, paras_len: %d\n", at_fd, prefix_len, paras_len);
+ at_print(AT_DEBUG,"at_rcvmsg_handle AT_TYPE_PDU at_fd = %d, prefix_len: %d, paras_len: %d\n", at_fd, prefix_len, paras_len);
if(at_cmd_paras)
return rcv_sms_pdu_handle(at_fd, at_str, at_cmd_prefix, prefix_len, at_cmd_paras, paras_len);
}
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_timeout.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_timeout.c
index 9d6910b..0f2ceef 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_timeout.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/at_ctl/src/atctrl/at_timeout.c
@@ -263,7 +263,7 @@
if(list_empty(head))
{
- at_print(AT_DEBUG,"cache_msg_proc is empty\n");
+ //at_print(AT_DEBUG,"cache_msg_proc is empty\n");
return;
}
else
@@ -279,7 +279,7 @@
pnext = pnext->next;
list_del(temp);
msg_buf = &(((struct req_waitmsg *)temp)->msg_buf);
- at_print(AT_ERR,"cache_msg_proc proc\n");
+ at_print(AT_DEBUG,"cache_msg_proc proc\n");
rcv_msg_proc(msg_buf);
free(temp);
}
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/nv-rpc-daemon/main.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/nv-rpc-daemon/main.c
index eaf4468..b047701 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/nv-rpc-daemon/main.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/platform/nv-rpc-daemon/main.c
@@ -171,7 +171,7 @@
msgSnd.msgType = MSG_TYPE_NV;
msgSnd.pid = g_pid;
//printf("apnv_cap msgsnd to nvserver pid:%d\n", msgSnd.pid);
- //if (strcmp(msgSnd.key, "zcat_mode")) jb.qi add for nv wakeup debug on 20231220
+ if (strcmp(msgSnd.key, "zcat_mode"))
print_nv_info(&msgSnd);
retry1:
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/atchannel.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/atchannel.c
index c6f1ea1..ba8261f 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/atchannel.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/atchannel.c
@@ -248,7 +248,7 @@
pthread_mutex_lock(&chn->s_atchnmutex);
- RLOGD("processLine line:%s", line);
+ //RLOGD("processLine line:%s", line);
if (sp_response == NULL) {
RLOGD("processLine (sp_response == NULL)");
/* no command pending */
@@ -363,7 +363,7 @@
if (list_empty(&atchnctx.at_recv_list)) {
if (pthread_cond_wait(&atchnctx.at_recv_cond, &atchnctx.at_recv_lock) == ETIMEDOUT) {
pthread_mutex_unlock(&atchnctx.at_recv_lock);
- RLOGD("%s %d", __FUNCTION__, __LINE__);
+ //RLOGD("%s %d", __FUNCTION__, __LINE__);
goto again;
}
}
@@ -375,10 +375,11 @@
AT_DUMP("<< ", p_read, count);
channel = at_get_channel_by_name(node->name);
+#if 0
if (NULL != channel) {
RLOGD("%s %d %s %s", __FUNCTION__, __LINE__, node->name, p_read);
}
-
+#endif
*chn = channel;
list_del(&node->list);
@@ -393,8 +394,8 @@
/* a full line in the buffer. Place a \0 over the \r and return */
ret = s_ATBuffer;
-
- RLOGD("RILAT< %s\n", ret);
+ if(0 != strncmp(ret, "+ZEMSCIQ", strlen("+ZEMSCIQ")))
+ RLOGD("RILAT< %s\n", ret);
return ret;
}
@@ -663,7 +664,7 @@
goto error;
}
- RLOGD("at_send_command_full_nolock %d", __LINE__);
+ //RLOGD("at_send_command_full_nolock %d", __LINE__);
channel->s_type = type;
channel->s_responsePrefix = responsePrefix;
channel->s_smsPDU = smspdu;
@@ -695,7 +696,7 @@
goto error;
}
}
- RLOGD("at_send_command_full_nolock %d", __LINE__);
+ //RLOGD("at_send_command_full_nolock %d", __LINE__);
if (pp_outResponse == NULL) {
at_response_free(channel->sp_response);
} else {
@@ -714,7 +715,7 @@
err = 0;
error:
clearPendingCommand(channel);
- RLOGD("at_send_command_full_nolock %d", __LINE__);
+ //RLOGD("at_send_command_full_nolock %d", __LINE__);
return err;
}
@@ -1074,7 +1075,7 @@
channel = ctx->atchninfo[i];
if (0 == channel->state) {
channel->state = 1;
- RLOGD("at_get_free_channel %s", channel->name);
+ //RLOGD("at_get_free_channel %s", channel->name);
return channel;
}
}
@@ -1089,7 +1090,7 @@
for (i = 0; i < ZXIC_ATCHN_SUM; i++) {
if (channel == ctx->atchninfo[i]) {
- RLOGD("at_release_channel %s", channel->name);
+ //RLOGD("at_release_channel %s", channel->name);
channel->state = 0;
clearPendingCommand(channel);
return;
@@ -1124,11 +1125,11 @@
curlen = strlen(p_read);
strncpy(&channel->store_cmd[channel->store_cmd_len], p_read, curlen);
channel->store_cmd_len += curlen;
- RLOGD("read_cb %d curlen:%d", __LINE__, curlen);
+ //RLOGD("read_cb %d curlen:%d", __LINE__, curlen);
return 0;
} else if (0 < channel->store_cmd_len) {
curlen = strlen(p_read);
- RLOGD("read_cb %d curlen:%d", __LINE__, curlen);
+ //RLOGD("read_cb %d curlen:%d", __LINE__, curlen);
strncpy(&channel->store_cmd[channel->store_cmd_len], p_read, curlen);
channel->store_cmd_len += curlen;
@@ -1142,7 +1143,7 @@
p_eol = findNextEOL(channel->store_cmd);
#endif
- RLOGD("read_cb curlen:%d", strnlen(channel->store_cmd, MAX_AT_RESPONSE));
+ //RLOGD("read_cb curlen:%d", strnlen(channel->store_cmd, MAX_AT_RESPONSE));
}
while (NULL != p_eol) {
@@ -1167,7 +1168,7 @@
node->data[curlen] = '\0';
node->size = curlen;
strncpy(node->name, channel->name, sizeof(node->name));
- RLOGD("read_cb curlen:%d node->data: %s", curlen, node->data);
+ //RLOGD("read_cb curlen:%d node->data: %s", curlen, node->data);
pthread_mutex_lock(&atchnctx.at_recv_lock);
list_add_tail(&node->list, &atchnctx.at_recv_list);
pthread_mutex_unlock(&atchnctx.at_recv_lock);
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/reference-ril.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/reference-ril.c
index f9a0f6c..42920a6 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/reference-ril.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/reference-ril.c
@@ -266,7 +266,7 @@
if (NULL != pinfo) {
- RLOGD("request info: --request %d --servicetype %d --datatype %d", pinfo->request, pinfo->servicetype, pinfo->type);
+ //RLOGD("request info: --request %d --servicetype %d --datatype %d", pinfo->request, pinfo->servicetype, pinfo->type);
requestProc(pinfo->request, pinfo->data, pinfo->datalen, pinfo->t);
} else {
RLOGE("ril_ref_dequeue_dispatch: request invalid!");
@@ -1481,7 +1481,7 @@
INIT_LIST_HEAD(&tmp_list);
while (!s_closed) {
- RLOGI("%s waiting request", workq->name);
+ //RLOGI("%s waiting request", workq->name);
pthread_mutex_lock(&workq->mutex);
if (list_empty(&workq->req_queue)) {
if (pthread_cond_wait(&workq->cond, &workq->mutex) == ETIMEDOUT) {
@@ -1493,7 +1493,7 @@
list_del_init(&workq->req_queue);
pthread_mutex_unlock(&workq->mutex);
- RLOGI("%s processing request", workq->name);
+ //RLOGI("%s processing request", workq->name);
ril_ref_dequeue_dispatch(&tmp_list);
}
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_cc.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_cc.c
index f183951..8a3565c 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_cc.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_cc.c
@@ -201,7 +201,7 @@
if (1 == onoff) {
if (0 != alsa_voice_open(mode)) {
- RLOGD("cc_voice_open_at alsa_voice_open\n");
+ RLOGE("cc_voice_open_at alsa_voice_open fail\n");
return -1;
}
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_mm.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_mm.c
index 65d35d5..3549d02 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_mm.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_mm.c
@@ -466,10 +466,10 @@
pZeminfo = alloca(strlen(at_paras) / 2);
hexStr2ByteArr(at_paras, pZeminfo);
pEmInfo_Ind = (T_zEM_EmInfo_Ind*)pZeminfo;
- RLOGD("requestGetCellInfoList bVersion=%d\n", pEmInfo_Ind->bVersion);
- RLOGD("requestGetCellInfoList bRatType=0x%x\n", pEmInfo_Ind->bRatType);
- RLOGD("requestGetCellInfoList bSrcIndex=%d\n", pEmInfo_Ind->bSrcIndex);
- RLOGD("requestGetCellInfoList bDesIndex=%d\n", pEmInfo_Ind->bDesIndex);
+ RLOGD("requestGetCellInfoList bVersion=%d,bRatType=0x%x\n", pEmInfo_Ind->bVersion,pEmInfo_Ind->bRatType);
+ //RLOGD("requestGetCellInfoList bRatType=0x%x\n", pEmInfo_Ind->bRatType);
+ //RLOGD("requestGetCellInfoList bSrcIndex=%d\n", pEmInfo_Ind->bSrcIndex);
+ //RLOGD("requestGetCellInfoList bDesIndex=%d\n", pEmInfo_Ind->bDesIndex);
memset(ci, 0, sizeof(ci));
@@ -559,15 +559,15 @@
ci[0].registered = 1;
ci[0].timeStamp = curTime;
- RLOGD("parseCellInfo wcdma bMCC1:%d, bMCC2:%d, bMCC3:%d", pNasInfo->tPlmn.bMCC1, pNasInfo->tPlmn.bMCC2, pNasInfo->tPlmn.bMCC3);
- RLOGD("parseCellInfo wcdma bMNC1:%d, bMNC2:%d", pNasInfo->tPlmn.bMNC1, pNasInfo->tPlmn.bMNC2);
+ //RLOGD("parseCellInfo wcdma bMCC1:%d, bMCC2:%d, bMCC3:%d", pNasInfo->tPlmn.bMCC1, pNasInfo->tPlmn.bMCC2, pNasInfo->tPlmn.bMCC3);
+ //RLOGD("parseCellInfo wcdma bMNC1:%d, bMNC2:%d", pNasInfo->tPlmn.bMNC1, pNasInfo->tPlmn.bMNC2);
snprintf(smcc, 4, "%d%d%d", pNasInfo->tPlmn.bMCC1, pNasInfo->tPlmn.bMCC2, pNasInfo->tPlmn.bMCC3);
smcc[3] = '\0';
snprintf(smnc, 3, "%d%d", pNasInfo->tPlmn.bMNC1, pNasInfo->tPlmn.bMNC2);
smnc[2] = '\0';
- RLOGD("parseCellInfo wcdma smcc:%s, smnc:%s", smcc, smnc);
+ //RLOGD("parseCellInfo wcdma smcc:%s, smnc:%s", smcc, smnc);
pwcdma->cellIdentityWcdma.mcc = atoi(smcc);
pwcdma->cellIdentityWcdma.mnc = atoi(smnc);
@@ -604,7 +604,7 @@
pwcdma->signalStrengthWcdma.bitErrorRate = twcdmaEmInfo->uWcellMeasInfo.tNotDchInfo.tFddSCellReselInfo.tScellInfo.bEcNo;
}
- RLOGD("parseCellInfo wcdma psc: %d, signalStrength:%d, bitErrorRate:%d", pwcdma->cellIdentityWcdma.psc, pwcdma->signalStrengthWcdma.signalStrength, pwcdma->signalStrengthWcdma.bitErrorRate);
+ //RLOGD("parseCellInfo wcdma psc: %d, signalStrength:%d, bitErrorRate:%d", pwcdma->cellIdentityWcdma.psc, pwcdma->signalStrengthWcdma.signalStrength, pwcdma->signalStrengthWcdma.bitErrorRate);
} else if (pEmInfo_Ind->bRatType == 1) {
ci[0].cellInfoType = RIL_CELL_INFO_TYPE_TD_SCDMA;
ci[0].registered = 1;
@@ -733,7 +733,7 @@
* so available operator count should be num_of_left_parentheses - 2
*/
availableOptNumber = (lparen > 1) ? (lparen - 2) : 0;
- RLOGD("%s: available operator number:%d", __FUNCTION__, availableOptNumber);
+ //RLOGD("%s: available operator number:%d", __FUNCTION__, availableOptNumber);
result = alloca(availableOptNumber * AVAILABLE_NETWORKS_ITEM_NUM * sizeof(char *));
getAvailableNetworksResult(availableOptNumber, result, line);
RIL_onRequestComplete(token, RIL_E_SUCCESS, result, sizeof(char *) * availableOptNumber * AVAILABLE_NETWORKS_ITEM_NUM);
@@ -1063,7 +1063,7 @@
ATResponse *response = NULL;
RLOGD("ril_request_radio_reset()");
- RLOGD("ril_request_radio_reset: send AT+CFUN=0");
+ //RLOGD("ril_request_radio_reset: send AT+CFUN=0");
err = at_send_command_timeout("AT+CFUN=0", &response, TIMEOUT_CFUN);
DO_MM_RESPONSE_ERROR_JDUGE;
@@ -1071,7 +1071,7 @@
at_response_free(response);
- RLOGD("ril_request_radio_reset: send AT+CFUN=1");
+ //RLOGD("ril_request_radio_reset: send AT+CFUN=1");
err = at_send_command_timeout("AT+CFUN=1", &response, TIMEOUT_CFUN);
if ((err < 0 || response->success == 0) && (isRadioOn() != 1)) {
@@ -1103,7 +1103,7 @@
value = atoi(strTemp);
RLOGD("init_sys_mode: value=%d, sys_mode=%d", value, getCurNwMode());
if (value != getCurNwMode()) {
- RLOGD("init_sys_mode: RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED");
+ //RLOGD("init_sys_mode: RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED");
setCurNwMode(value);
RIL_onUnsolicitedResponse(RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED, NULL, 0);
}
@@ -1133,7 +1133,7 @@
RLOGD("handle_mode: value=%d, sys_mode=%d", value, getCurNwMode());
if (value != getCurNwMode()) {
- RLOGD("handle_mode: RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED");
+ //RLOGD("handle_mode: RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED");
setCurNwMode(value);
RIL_onUnsolicitedResponse(RIL_UNSOL_RESPONSE_VOICE_NETWORK_STATE_CHANGED, NULL, 0);
}
@@ -1401,8 +1401,8 @@
result.GW_SignalStrength.bitErrorRate = ber;
- RLOGD("ril_request_signal_strength result.GW_SignalStrength.signalStrength = %d",
- result.GW_SignalStrength.signalStrength);
+ //RLOGD("ril_request_signal_strength result.GW_SignalStrength.signalStrength = %d",
+ // result.GW_SignalStrength.signalStrength);
}
RIL_onRequestComplete(token, RIL_E_SUCCESS, &result, sizeof(result));
goto exit;
@@ -1551,7 +1551,7 @@
/*Valid values are (0-49, 255)*/
response[20] = ecno;
- RLOGD("requestSignalStrength %d %d %d %d",response[17],response[18],response[19],response[20]);
+ //RLOGD("requestSignalStrength %d %d %d %d",response[17],response[18],response[19],response[20]);
#endif
}
@@ -1956,17 +1956,17 @@
RLOGD("ril_request_radio_power(): onOff=%d, currentState=%d", onOff, currentState);
if (onOff == 4) {
- RLOGD("onOff=%d, currentState=%d --> AT+CFUN=4", onOff, currentState);
+ //RLOGD("onOff=%d, currentState=%d --> AT+CFUN=4", onOff, currentState);
err = at_send_command_timeout("AT+CFUN=4", &response, TIMEOUT_CFUN);
DO_MM_RESPONSE_ERROR_JDUGE;
setRadioStateOff();
} else if (onOff == 0) {
- RLOGD("onOff=%d, currentState=%d --> AT+CFUN=4", onOff, currentState);
+ //RLOGD("onOff=%d, currentState=%d --> AT+CFUN=4", onOff, currentState);
err = at_send_command_timeout("AT+CFUN=4", &response, TIMEOUT_CFUN);
DO_MM_RESPONSE_ERROR_JDUGE;
setRadioStateOff();
} else if (onOff == 1) {
- RLOGD("onOff=%d, currentState=%d --> AT+CFUN=1", onOff, currentState);
+ //RLOGD("onOff=%d, currentState=%d --> AT+CFUN=1", onOff, currentState);
err = at_send_command_timeout("AT+CFUN=1", &response, TIMEOUT_CFUN);
if ((err < 0 || response->success == 0) && (isRadioOn() != 1)) {
goto error;
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_sim.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_sim.c
index 5d79fda..4d11dc0 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_sim.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_sim.c
@@ -300,7 +300,7 @@
static void onSimInitReady(void *param)
{
sSimStatus = SIM_READY;
- RLOGI("[%s]: set sSimStatus=%d", __FUNCTION__, sSimStatus);
+ //RLOGI("[%s]: set sSimStatus=%d", __FUNCTION__, sSimStatus);
int status = getRadioState();
if ((status != RADIO_STATE_OFF) && (status != RADIO_STATE_UNAVAILABLE) && (status != RADIO_STATE_SIM_READY)) {
@@ -1077,7 +1077,7 @@
RIL_onRequestComplete(token, RIL_E_GENERIC_FAILURE, NULL, 0);
//20140604 zouxiaojie add for sim error protect
RIL_onUnsolicitedResponse(RIL_UNSOL_STK_SESSION_END, NULL, 0);
- RLOGD("error RIL_UNSOL_STK_SESSION_END send");
+ //RLOGD("error RIL_UNSOL_STK_SESSION_END send");
exit:
at_response_free(response);
}
@@ -1160,7 +1160,7 @@
if (err < 0) {
goto error;
}
- RLOGD("%s: result=%s", __FUNCTION__, result);
+ //RLOGD("%s: result=%s", __FUNCTION__, result);
RIL_onRequestComplete(token, RIL_E_SUCCESS, result, sizeof(char *));
goto exit;
}
@@ -1199,7 +1199,7 @@
at_response_free(response);
- RLOGD("ril_request_simcard_reset: send AT+CFUN=5");
+ //RLOGD("ril_request_simcard_reset: send AT+CFUN=5");
err = at_send_command_timeout("AT+CFUN=5", &response, TIMEOUT_CFUN);
if (err < 0 || response->success == 0) {
goto error;
@@ -1209,7 +1209,7 @@
at_response_free(response);
- RLOGD("ril_request_simcard_reset: send AT+ZUINIT=0,1,0,0");
+ //RLOGD("ril_request_simcard_reset: send AT+ZUINIT=0,1,0,0");
err = at_send_command_singleline("AT+ZUINIT=0,1,0,0", "+ZUINIT:", &response);
if (err < 0 || response->success == 0 || response->p_intermediates == NULL) {
@@ -1248,7 +1248,7 @@
goto error;
case 30: //init sucess
- RLOGD("ril_request_simcard_reset: success!");
+ //RLOGD("ril_request_simcard_reset: success!");
RIL_onRequestComplete(token, RIL_E_SUCCESS, NULL, 0);
goto exit;
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_ss.c b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_ss.c
index f8c9e20..9c4e043 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_ss.c
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/ril_ss.c
Binary files differ
diff --git a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/zxic_log.h b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/zxic_log.h
index d6673dc..a7cfac7 100755
--- a/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/zxic_log.h
+++ b/cap/zx297520v3/zxic_code/zxic_source/zxic_app_open/sdk/ril/reference-ril/zxic_log.h
@@ -11,7 +11,7 @@
//zxic_log_append_slog(mod, prio, "%s %d "fmt"\n", __FUNCTION__, __LINE__, ##__VA_ARGS__);
#define ril_log_slog(mod,prio,fmt,...) do { \
- zxic_log_append_slog(mod, prio, fmt"\n", ##__VA_ARGS__); \
+ slog(mod, prio, fmt"\n", ##__VA_ARGS__); \
} while(0)
#define RLOGD(...) do {ril_log_slog(RIL_PRINT,SLOG_DEBUG,__VA_ARGS__);}while(0)