[Feature][ZXW-33]merge ZXW 0428 version
Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
diff --git a/ap/app/zte_comm/zte_watchdog/watchdog.c b/ap/app/zte_comm/zte_watchdog/watchdog.c
index 931a5bd..2b0ac1d 100755
--- a/ap/app/zte_comm/zte_watchdog/watchdog.c
+++ b/ap/app/zte_comm/zte_watchdog/watchdog.c
@@ -40,10 +40,10 @@
{
int msgid = 0;
if ((msgid = msgget(MODULE_ID_WDT, IPC_CREAT | 0600)) == -1) {
- slog(MMI_PRINT, SLOG_ERR, "ZTE_WDT [error]:Create MODULE_ID_WDT queue faild! msgid=%d\n", msgid);
+ slog(MMI_PRINT, SLOG_ERR, "WDT [error]:Create MODULE_ID_WDT queue faild! msgid=%d\n", msgid);
return -1;
}
- slog(MMI_PRINT, SLOG_DEBUG, "ZTE_WDT Creating mmi message queue success! MODULE_ID_WDT=0x%x\n", msgid);
+ slog(MMI_PRINT, SLOG_DEBUG, "WDT Creating mmi message queue success! MODULE_ID_WDT=0x%x\n", msgid);
return msgid;
}
@@ -57,10 +57,10 @@
}
iRet = msgrcv(msgQueueId, pstMsg, msgSize, MsgType, MSG_NOERROR);
- slog(MMI_PRINT, SLOG_ERR, "ZTE_WDT wdt_RecvMsgFromQueue : iRet : %ld, pstMsg->src_id:%ld, pstMsg->usMsgCmd:%ld \n", iRet, pstMsg->src_id, pstMsg->usMsgCmd);
+ slog(MMI_PRINT, SLOG_ERR, "WDT wdt_RecvMsgFromQueue : iRet : %ld, pstMsg->src_id:%ld, pstMsg->usMsgCmd:%ld \n", iRet, pstMsg->src_id, pstMsg->usMsgCmd);
if (iRet <= 0) {
- slog(MMI_PRINT, SLOG_ERR, "ZTE_WDT wdt_RecvMsgFromQueue Failed : iRet : %ld, pstMsg->src_id:%ld, pstMsg->usMsgCmd:%ld \n", iRet, pstMsg->src_id, pstMsg->usMsgCmd);
+ slog(MMI_PRINT, SLOG_ERR, "WDT wdt_RecvMsgFromQueue Failed : iRet : %ld, pstMsg->src_id:%ld, pstMsg->usMsgCmd:%ld \n", iRet, pstMsg->src_id, pstMsg->usMsgCmd);
return -1;
} else {
return 0;
@@ -74,12 +74,12 @@
return -1;
}
if ((pstMsg->usMsgCmd != MSG_CMD_MMICHECK_TIP_INFO) && (pstMsg->usMsgCmd != MSG_CMD_MMIGET_WIFI_DATA)) {
- slog(MMI_PRINT, SLOG_ERR, "ZTE_WDT wdt_ProcMsg msg:src_id = 0x%04x,lMsgType = %d,usMsgCmd = 0x%08x,usDataLen = %d,data = %s\n", pstMsg->src_id, pstMsg->lMsgType, pstMsg->usMsgCmd, pstMsg->usDataLen, pstMsg->aucDataBuf);
+ slog(MMI_PRINT, SLOG_ERR, "WDT wdt_ProcMsg msg:src_id = 0x%04x,lMsgType = %d,usMsgCmd = 0x%08x,usDataLen = %d,data = %s\n", pstMsg->src_id, pstMsg->lMsgType, pstMsg->usMsgCmd, pstMsg->usDataLen, pstMsg->aucDataBuf);
}
switch (pstMsg->usMsgCmd) {
case RTC_MSG_ALARM_ELAPSED:
//οغÍι¹·
- slog(MMI_PRINT, SLOG_ERR, "ZTE_WDT RTC_MSG_ALARM_ELAPSED\n");
+ slog(MMI_PRINT, SLOG_ERR, "WDT RTC_MSG_ALARM_ELAPSED\n");
set_wake_lock(WDT_GET_POWER_LOCK_ID);
wdt_feet();
wdt_temp_check_process();
@@ -111,7 +111,7 @@
{
//pthread_t handlemsg_thread;
- slog(MMI_PRINT, SLOG_ERR, "ZTE_WDT start wdt_creatMsgThread\n");
+ slog(MMI_PRINT, SLOG_ERR, "WDT start wdt_creatMsgThread\n");
long MsgType = 0;
MSG_BUF Msg;
@@ -175,7 +175,7 @@
}
sc_cfg_get("watchdog_app", nv_value, sizeof(nv_value));
- slog(MMI_PRINT, SLOG_ERR, "ZTE_WDT watchdog_app = %s\n", nv_value);
+ slog(MMI_PRINT, SLOG_ERR, "WDT watchdog_app = %s\n", nv_value);
if (strcmp(nv_value, "1") == 0) {
g_watchdog_flag = 1;
@@ -195,17 +195,17 @@
loglevel_init();
//zdm½«nvÉèÖÃת»»³ÉÈ«¾Ö±äÁ¿½øÐй¦ÄÜ¿ØÖÆ
- slog(MMI_PRINT, SLOG_ERR, "ZTE_WDT ######START######\n");
+ slog(MMI_PRINT, SLOG_ERR, "WDT ######START######\n");
if ((g_wdt_msgQue_Id = wdt_create_msg_queue()) == -1) {
- slog(MMI_PRINT, SLOG_ERR, "ZTE_WDT create g_mmi_msgQue_Id failed!!!\n");
+ slog(MMI_PRINT, SLOG_ERR, "WDT create g_mmi_msgQue_Id failed!!!\n");
assert(0);
}
get_nv();
if (!g_watchdog_flag && !g_temp_protect_wd) {
- slog(MMI_PRINT, SLOG_ERR, "ZTE_WDT ######END######\n");
+ slog(MMI_PRINT, SLOG_ERR, "WDT ######END######\n");
return -1;
}
if (g_watchdog_flag) {
@@ -213,7 +213,7 @@
wdt_rtc_add(WDT_INTERVAL_TIME);
} else {
if (pthread_create(&temp_check_thread, NULL, &wdt_creatTempCheckThread, NULL) == -1) {
- slog(MMI_PRINT, SLOG_ERR, "ZTE_WDT temp_check_thread creat error\n");
+ slog(MMI_PRINT, SLOG_ERR, "WDT temp_check_thread creat error\n");
return -1;
}
}