[Feature][ZXW-76]merged P48U04 base code
Change-Id: Ia14632a24eb4e8ddf720d8f53f2fe3a1b52a0a8e
diff --git a/ap/lib/libatext/ext_dev_func.c b/ap/lib/libatext/ext_dev_func.c
index 24cbc83..3b442e4 100755
--- a/ap/lib/libatext/ext_dev_func.c
+++ b/ap/lib/libatext/ext_dev_func.c
@@ -329,7 +329,6 @@
int ate_req_rcv_act(char *at_paras,int at_fd,struct at_context *context)
{
int32_t setResult = 0;
- char strAtReplyCmd[AT_CMD_MAX] = {0};
if(atoi(at_paras) == 0 || atoi(at_paras) == 1)
{
@@ -347,9 +346,8 @@
setResult = vFnPortEchoType(at_fd, OPENECHO);
if(setResult != 0)
- {
- sprintf(strAtReplyCmd,"\r\nERROR: %d\r\n", setResult);
- at_write(at_fd, strAtReplyCmd, strlen(strAtReplyCmd));
+ {
+ at_write(at_fd, "\r\nERROR\r\n", strlen("\r\nERROR\r\n"));
}
else
{
diff --git a/ap/lib/libatext/ext_locknet.c b/ap/lib/libatext/ext_locknet.c
index efe68a0..d4372b8 100755
--- a/ap/lib/libatext/ext_locknet.c
+++ b/ap/lib/libatext/ext_locknet.c
@@ -3,74 +3,122 @@
int ext_LocklistAuth_func(char *at_paras, void ** res_msg)
{
- ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKLISTAUTH_REQ,strlen(at_paras), (unsigned char *)at_paras,0);
- return AT_CONTINUE;
+ if(0 == ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKLISTAUTH_REQ,strlen(at_paras), (unsigned char *)at_paras,0))
+ return AT_CONTINUE;
+ else{
+ *res_msg = at_err_build(ATERR_PROC_FAILED);
+ return AT_END;
+ }
}
int ext_LocknetList_set_func(char *at_paras, void ** res_msg)
{
- ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETLIST_SET_REQ,strlen(at_paras), (unsigned char *)at_paras,0);
+ if(0 == ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETLIST_SET_REQ,strlen(at_paras), (unsigned char *)at_paras,0))
return AT_CONTINUE;
+ else{
+ *res_msg = at_err_build(ATERR_PROC_FAILED);
+ return AT_END;
+ }
}
int ext_LocknetKey_func(char *at_paras, void ** res_msg)
{
- ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETKEY_REQ,strlen(at_paras), (unsigned char *)at_paras,0);
+ if(0 == ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETKEY_REQ,strlen(at_paras), (unsigned char *)at_paras,0))
return AT_CONTINUE;
+ else{
+ *res_msg = at_err_build(ATERR_PROC_FAILED);
+ return AT_END;
+ }
}
int ext_LocknetAmtStatus_get_func(char *at_paras, void ** res_msg)
{
- ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETAMTSTATUS_GET_REQ, 0, NULL,0);
+ if(0 == ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETAMTSTATUS_GET_REQ, 0, NULL,0))
return AT_CONTINUE;
+ else{
+ *res_msg = at_err_build(ATERR_PROC_FAILED);
+ return AT_END;
+ }
}
int ext_LocknetDigest_get_func(char *at_paras, void ** res_msg)
{
- ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETDIGEST_GET_REQ, 0, NULL,0);
+ if(0 == ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETDIGEST_GET_REQ, 0, NULL,0))
return AT_CONTINUE;
+ else{
+ *res_msg = at_err_build(ATERR_PROC_FAILED);
+ return AT_END;
+ }
}
int ext_LocknetSign_set_func(char *at_paras, void ** res_msg)
{
- ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETSIGN_SET_REQ,strlen(at_paras), (unsigned char *)at_paras,0);
+ if(0 == ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETSIGN_SET_REQ,strlen(at_paras), (unsigned char *)at_paras,0))
return AT_CONTINUE;
+ else{
+ *res_msg = at_err_build(ATERR_PROC_FAILED);
+ return AT_END;
+ }
}
int ext_LocknetLevel_get_func(char *at_paras, void ** res_msg)
{
- ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETLEVEL_GET_REQ, 0, NULL,0);
+ if(0 == ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETLEVEL_GET_REQ, 0, NULL,0))
return AT_CONTINUE;
+ else{
+ *res_msg = at_err_build(ATERR_PROC_FAILED);
+ return AT_END;
+ }
}
int ext_LocknetList_get_func(char *at_paras, void ** res_msg)
{
- ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETLIST_GET_REQ,strlen(at_paras), (unsigned char *)at_paras,0);
+ if(0 == ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETLIST_GET_REQ,strlen(at_paras), (unsigned char *)at_paras,0))
return AT_CONTINUE;
+ else{
+ *res_msg = at_err_build(ATERR_PROC_FAILED);
+ return AT_END;
+ }
}
int ext_LocknetAuth_func(char *at_paras, void ** res_msg)
{
- ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETAUTH_REQ, 0, NULL,0);
+ if(0 == ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETAUTH_REQ, 0, NULL,0))
return AT_CONTINUE;
+ else{
+ *res_msg = at_err_build(ATERR_PROC_FAILED);
+ return AT_END;
+ }
}
int ext_LocknetUnlockTimes_get_func(char *at_paras, void ** res_msg)
{
- ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETUNLOCKTIMES_GET_REQ, 0, NULL,0);
+ if(0 == ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETUNLOCKTIMES_GET_REQ, 0, NULL,0))
return AT_CONTINUE;
+ else{
+ *res_msg = at_err_build(ATERR_PROC_FAILED);
+ return AT_END;
+ }
}
int ext_LocknetStatus_get_func(char *at_paras, void ** res_msg)
{
- ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETSTATUS_GET_REQ, 0, NULL,0);
+ if(0 == ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETSTATUS_GET_REQ, 0, NULL,0))
return AT_CONTINUE;
+ else{
+ *res_msg = at_err_build(ATERR_PROC_FAILED);
+ return AT_END;
+ }
}
int ext_LocknetUnlock_func(char *at_paras, void ** res_msg)
{
- ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETUNLOCK_REQ,strlen(at_paras), (unsigned char *)at_paras,0);
+ if(0 == ipc_send_message(MODULE_ID_AT_CTL,MODULE_ID_LOCKNET,MSG_CMD_LOCKNETUNLOCK_REQ,strlen(at_paras), (unsigned char *)at_paras,0))
return AT_CONTINUE;
+ else{
+ *res_msg = at_err_build(ATERR_PROC_FAILED);
+ return AT_END;
+ }
}
//ÊÕµ½zudryÖ÷¶¯Éϱ¨ÃüÁîºó£¬Ï·¢AT+ZSCHPLMN=1ʹmodemÔÊÐíËÑÍø(¸ÃÃüÁîÊÇÔÚËøÍø¹¦ÄÜÖÐʹÓÃ)