Merge "[Feature][ZXW-301]Optimize CPU usage in debug mode"
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/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/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)