[Feature][ZXW-33]merge ZXW 0428 version
Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
diff --git a/ap/app/zte_comm/zte_mmi/mmi.c b/ap/app/zte_comm/zte_mmi/mmi.c
index 0d60a75..042a157 100755
--- a/ap/app/zte_comm/zte_mmi/mmi.c
+++ b/ap/app/zte_comm/zte_mmi/mmi.c
@@ -115,7 +115,7 @@
{
if (taskInfoItem->get_taskinfo_fun == NULL || taskInfoItem->taskinfo == NULL ||
taskInfoItem->get_ledinfo_fun == NULL || taskInfoItem->ledinfo == NULL) {
- //slog(MMI_PRINT,SLOG_DEBUG,"ZTE_MMI mmi_show_led parameter null!!!\n");
+ //slog(MMI_PRINT,SLOG_DEBUG,"MMI mmi_show_led parameter null!!!\n");
return;
}
if (taskInfoItem->get_taskinfo_fun((UINT32)taskInfoItem->taskinfo) == MMI_SUCCESS) { //e64
@@ -129,7 +129,7 @@
{
if (taskInfoItem->get_taskinfo_fun == NULL || taskInfoItem->taskinfo == NULL ||
taskInfoItem->get_lcdinfo_fun == NULL) {
- slog(MMI_PRINT, SLOG_ERR, "ZTE_MMI mmi_show_lcd parameter null!!!");
+ slog(MMI_PRINT, SLOG_ERR, "MMI mmi_show_lcd parameter null!!!");
return;
}
#ifdef MMI_DEBUG_MAINCONTROL
@@ -161,7 +161,7 @@
#ifndef DISABLE_LCD
if (g_showMode == MMI_MODE_LCD || g_showMode == MMI_MODE_ALL) {
while ((ret = mmi_GetSemaphore(&g_mmi_init_sem_id, MMI_WAIT_FOREVER)) != MMI_SUCCESS) {
- slog(MMI_PRINT, SLOG_DEBUG, "zte_mmi g_mmi_update_sem_id get failed ret = %d,errno=%d\n", ret, errno);
+ slog(MMI_PRINT, SLOG_DEBUG, "mmi g_mmi_update_sem_id get failed ret = %d,errno=%d\n", ret, errno);
continue;
}
mmi_DeleteSemaphore(&g_mmi_init_sem_id);
@@ -170,7 +170,7 @@
while (1) {
if ((ret = mmi_GetSemaphore(&g_mmi_update_sem_id, MMI_WAIT_FOREVER)) != MMI_SUCCESS) {//kw 3
- slog(MMI_PRINT, SLOG_DEBUG, "zte_mmi mmi_mainControllerEntry failed ret = %d,errno=%d\n", ret, errno);
+ slog(MMI_PRINT, SLOG_DEBUG, "mmi mmi_mainControllerEntry failed ret = %d,errno=%d\n", ret, errno);
continue;
}
for (i = 0; i < sizeof(g_zMMITaskInfoTab) / sizeof(T_zMMITaskInfoItem); ++ i) { //warning539
@@ -282,7 +282,7 @@
}
//kw 3, kw bug???
//if ((pstMsg->usMsgCmd != MSG_CMD_MMICHECK_TIP_INFO) && (pstMsg->usMsgCmd != MSG_CMD_MMIGET_WIFI_DATA)) {
- slog(MMI_PRINT, SLOG_DEBUG, "ZTE_MMI Mmi_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_DEBUG, "MMI Mmi_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 MSG_CMD_CHANNEL_NETWORK_MODE:
@@ -589,7 +589,7 @@
***********************************************************************************/
static int mmi_showmode_init()
{
- slog(MMI_PRINT, SLOG_DEBUG, "ZTE_MMI mmi_showmode_init \n");
+ slog(MMI_PRINT, SLOG_DEBUG, "MMI mmi_showmode_init \n");
if (g_showMode == MMI_MODE_LED || g_showMode == MMI_MODE_ALL) {
mmi_initLed();
}
@@ -611,7 +611,7 @@
pthread_t mmi_handlemsg_thread;
//´´½¨MMIÏûÏ¢¶ÓÁÐ
if ((g_mmi_msgQue_Id = mmi_create_msg_queue()) == -1) {
- slog(MMI_PRINT, SLOG_ERR, "ZTE_MMI create g_mmi_msgQue_Id failed!!!\n");
+ slog(MMI_PRINT, SLOG_ERR, "MMI create g_mmi_msgQue_Id failed!!!\n");
MMI_ASSERT(0);
}
pthread_mutex_init(&g_mmi_lcdmode_mutex, NULL);
@@ -623,12 +623,12 @@
sem_init(&g_mmi_traffic_warn_sem_id, 0, 0);
sem_init(&g_mmi_poweroff_sem_id, 0, 0); //ÓÃÓڹػúʱ±£Ö¤LCDÆÁ²¥Íê¹Ø»ú¶¯»ºóÃðƽ»òLEDµÆ¶¼ÁÁÖ®ºóÔÙÃðµÆ
- slog(MMI_PRINT, SLOG_DEBUG, "ZTE_MMI start set_mmi_active\n");
+ slog(MMI_PRINT, SLOG_DEBUG, "MMI start set_mmi_active\n");
set_wake_lock(MMI_MAIN_LOCK_ID);
//´´½¨MMI ´¦ÀíÏûÏ¢Ïß³Ì
if (pthread_create(&mmi_handlemsg_thread, NULL, &mmi_handleMsgEntry, NULL) == -1) {
- slog(MMI_PRINT, SLOG_ERR, "ZTE_MMI pthread_create handle msg error\n");
+ slog(MMI_PRINT, SLOG_ERR, "MMI pthread_create handle msg error\n");
return ;
}
mmi_showmode_init();
@@ -637,7 +637,7 @@
mmi_task_init();
mmi_set_poweron_show();
- slog(MMI_PRINT, SLOG_NORMAL, "ZTE_MMI main Register finish!!\n");
+ slog(MMI_PRINT, SLOG_NORMAL, "MMI main Register finish!!\n");
//´´½¨MMIÖ÷¿ØÏß³Ì
mmi_mainControllerEntry(NULL);
@@ -653,7 +653,7 @@
pthread_t mmi_handlemsg_thread;
//´´½¨MMIÏûÏ¢¶ÓÁÐ
if ((g_mmi_msgQue_Id = mmi_create_msg_queue()) == -1) {
- slog(MMI_PRINT, SLOG_ERR, "ZTE_MMI create g_mmi_msgQue_Id failed!!!\n");
+ slog(MMI_PRINT, SLOG_ERR, "MMI create g_mmi_msgQue_Id failed!!!\n");
MMI_ASSERT(0);
}
@@ -671,7 +671,7 @@
//´´½¨MMI ´¦ÀíÏûÏ¢Ïß³Ì
if (pthread_create(&mmi_handlemsg_thread, NULL, &mmi_handleMsgEntry, NULL) == -1) {
- slog(MMI_PRINT, SLOG_ERR, "ZTE_MMI pthread_create handle msg error\n");
+ slog(MMI_PRINT, SLOG_ERR, "MMI pthread_create handle msg error\n");
return ;
}
@@ -691,7 +691,7 @@
int res = pthread_create(&mmi_offchg_mainctrl_thread, NULL, &mmi_mainControllerEntry, NULL);
if (res != 0) {
- slog(MMI_PRINT, SLOG_ERR, "ZTE_MMI pthread_create main control error\n");
+ slog(MMI_PRINT, SLOG_ERR, "MMI pthread_create main control error\n");
assert(0);
}
}
@@ -709,7 +709,7 @@
ret_fd = open(LCD_PATH, O_RDWR);
if (ret_fd == -1)
{
- slog(MMI_PRINT, SLOG_ERR,"ZTE_MMI mmi_file_operate open file fail: %s!\n", LCD_PATH);
+ slog(MMI_PRINT, SLOG_ERR,"MMI mmi_file_operate open file fail: %s!\n", LCD_PATH);
}
else
{
@@ -839,17 +839,17 @@
mmi_BatLedOffOpt();//¹ØbootµãµÄµÆ
#ifdef DISABLE_LCD
if (g_showMode != MMI_MODE_LED) {
- slog(MMI_PRINT, SLOG_ERR, "ZTE_MMI MIN only support LED \n");
+ slog(MMI_PRINT, SLOG_ERR, "MMI MIN only support LED \n");
return -1;
}
#endif
if (argc >= 2) {
- slog(MMI_PRINT, SLOG_DEBUG, "ZTE_MMI ###POWER OFF CHARGER START####\n");
+ slog(MMI_PRINT, SLOG_DEBUG, "MMI ###POWER OFF CHARGER START####\n");
g_mmi_power_mode = 0;
zMmi_PowerOffChargerEntry();
} else {
- slog(MMI_PRINT, SLOG_DEBUG, "ZTE_MMI ######START######\n");
+ slog(MMI_PRINT, SLOG_DEBUG, "MMI ######START######\n");
g_mmi_power_mode = 1;
mmi_powerOnLcdEntry();
}