[Feature][ZXW-241]merge P56U01 version
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I7985538dde6951dd824c36149bf9a1e3ca23c734
diff --git a/cp/ps/plat/inc/oss/ramdump.h b/cp/ps/plat/inc/oss/ramdump.h
old mode 100644
new mode 100755
index a83ffda..0acfba7
--- a/cp/ps/plat/inc/oss/ramdump.h
+++ b/cp/ps/plat/inc/oss/ramdump.h
@@ -26,6 +26,7 @@
/*******************************************************************************
* ºê¶¨Òå *
*******************************************************************************/
+#define RAMDUMP_CLEAR_PRIO_FLAG (0x7)
/*******************************************************************************
* Êý¾ÝÀàÐͶ¨Òå *
@@ -39,7 +40,10 @@
RAMDUMP_FLAG_NEED_COPY = 0x01, /* Copy destination address */
RAMDUMP_FLAG_HAS_EXTERNAL = 0x02, /* External address */
RAMDUMP_FLAG_HAS_CALLBACK = 0x04, /* Callback funtion */
-};
+ RAMDUMP_FLAG_LEVEL_HIGH = 0x08, /* High prior level */
+ RAMDUMP_FLAG_LEVEL_MEDIUM = 0x10, /* Medium prior level */
+ RAMDUMP_FLAG_LEVEL_LOW = 0x20, /* Low prior level */
+ };
/*******************************************************************************
* È«¾Ö±äÁ¿ÉùÃ÷ *
diff --git a/cp/ps/plat/src/oss/osa/linux/src/linux_kernel.c b/cp/ps/plat/src/oss/osa/linux/src/linux_kernel.c
index 7d5728b..60ade21 100755
--- a/cp/ps/plat/src/oss/osa/linux/src/linux_kernel.c
+++ b/cp/ps/plat/src/oss/osa/linux/src/linux_kernel.c
@@ -2885,7 +2885,7 @@
for_each_processex(task) {
integer = (unsigned int)task->ac_cpupercent;
decimal = (unsigned int)((task->ac_cpupercent - integer) * 100);
- snprintf(percent, sizeof(percent), "%u.%u", integer, decimal);
+ snprintf(percent, sizeof(percent), "%u.%02u", integer, decimal);
snprintf(buf + cnt*SCHED_STAT_STR_LEN, SCHED_STAT_STR_LEN,
"%-16s %16d %16llu %16s %16d %16u %16s\n",
&task->comm[0],
@@ -2912,10 +2912,11 @@
if(task->ac_cpupercent > 0){
integer = (unsigned int)task->ac_cpupercent;
decimal = (unsigned int)((task->ac_cpupercent - integer) * 100);
- snprintf(percent, sizeof(percent), "%u.%u", integer, decimal);
+ snprintf(percent, sizeof(percent), "%u.%02u", integer, decimal);
snprintf(buf + cnt*SCHED_STAT_STR_LEN, SCHED_STAT_STR_LEN,
- "%-16s %16llu %16s %16d %16u %16s\n",
+ "%-16s %16d %16llu %16s %16d %16u %16s\n",
&task->comm[0],
+ task->pid,
(unsigned long long)task->se.sum_exec_runtime,
linux_thread_sched_policy[task->policy],
task->prio, task->rt_priority, percent);
diff --git a/cp/ps/plat/src/oss/sup/src/ramdump_client.c b/cp/ps/plat/src/oss/sup/src/ramdump_client.c
old mode 100644
new mode 100755
index 399c9ce..78f55d4
--- a/cp/ps/plat/src/oss/sup/src/ramdump_client.c
+++ b/cp/ps/plat/src/oss/sup/src/ramdump_client.c
@@ -256,7 +256,7 @@
ramdump_client_ram_conf[i_entry].vir = ram_virt;
ramdump_client_ram_conf[i_entry].flag = ram_flag;
- switch (ram_flag)
+ switch (ram_flag & RAMDUMP_CLEAR_PRIO_FLAG)
{
case RAMDUMP_FLAG_NEED_COPY:
ramdump_client_ram_conf[i_entry].copy = ram_extra;
@@ -329,7 +329,7 @@
(unsigned long)ramdump_client_errno_log,
RAMDUMP_ERROR_LOG_SIZE,
0,
- 0,
+ RAMDUMP_FLAG_LEVEL_MEDIUM,
0);
/* generate dump name prefix */
memset(bin_name, 0, sizeof(bin_name));
@@ -343,7 +343,7 @@
(unsigned long)ramdump_client_cmm_buf,
RAMDUMP_CMM_SIZE,
0,
- 0,
+ RAMDUMP_FLAG_LEVEL_MEDIUM,
0);
OSS_PRINTF("Ramdump client init success!\n");
diff --git a/cp/ps/plat/src/oss/sup/src/ramdump_client_tos_adapt.c b/cp/ps/plat/src/oss/sup/src/ramdump_client_tos_adapt.c
old mode 100644
new mode 100755
index ecb44c5..07ff150
--- a/cp/ps/plat/src/oss/sup/src/ramdump_client_tos_adapt.c
+++ b/cp/ps/plat/src/oss/sup/src/ramdump_client_tos_adapt.c
@@ -120,7 +120,7 @@
regionInfo->baseForSelf,
regionInfo->size,
0,
- RAMDUMP_FLAG_NEED_COPY,
+ RAMDUMP_FLAG_NEED_COPY|RAMDUMP_FLAG_LEVEL_MEDIUM,
regionInfo->baseForCopy);
else if (regionInfo->baseForServer != 0 &&
regionInfo->baseForServer != regionInfo->baseForSelf)
@@ -129,7 +129,7 @@
regionInfo->baseForSelf,
regionInfo->size,
0,
- RAMDUMP_FLAG_HAS_EXTERNAL,
+ RAMDUMP_FLAG_HAS_EXTERNAL|RAMDUMP_FLAG_LEVEL_MEDIUM,
regionInfo->baseForServer);
else
ramdump_ram_conf_table_add(
@@ -137,7 +137,7 @@
regionInfo->baseForSelf,
regionInfo->size,
0,
- RAMDUMP_FLAG_NONE,
+ RAMDUMP_FLAG_LEVEL_MEDIUM,
0);
}
diff --git a/cp/ps/plat/src/oss/sup/src/sup_nvm.c b/cp/ps/plat/src/oss/sup/src/sup_nvm.c
index 2bcd830..0eab97f 100755
--- a/cp/ps/plat/src/oss/sup/src/sup_nvm.c
+++ b/cp/ps/plat/src/oss/sup/src/sup_nvm.c
@@ -798,6 +798,40 @@
}
/**************************************************************************
+* º¯ÊýÃû³Æ£º Nvram_FsClear
+* ¹¦ÄÜÃèÊö£º Çå¿ÕÎļþ
+* ²ÎÊý˵Ã÷£º (IN)
+* file_name: ÎļþÃû
+* (OUT)
+* ·µ »Ø Öµ£º ³É¹¦·µ»ØZOSS_SUCCESS, ·ñÔò·µ»ØZOSS_ERROR
+* ÆäËü˵Ã÷£º
+**************************************************************************/
+static UINT32 Nvram_FsClear(const CHAR *file_name)
+{
+ SINT32 ret = 0;
+ SINT32 fd = 0;
+ mm_segment_t old_fs = get_fs();;
+
+ if (file_name == NULL)
+ return ZOSS_ERROR;
+
+ set_fs(KERNEL_DS);
+ fd = CPPS_KO_FUNC(sys_open)(file_name, O_SYNC | O_RDWR | O_CREAT | O_TRUNC, 0600);
+ if(fd < 0)
+ {
+ printk("cpnv open %s fail,errno = %d\n", file_name, fd);
+ set_fs(old_fs);
+ return ZOSS_ERROR;
+ }
+
+ CPPS_KO_FUNC(sys_fsync)(fd);
+ CPPS_KO_FUNC(sys_close)(fd);
+ set_fs(old_fs);
+
+ return ZOSS_SUCCESS;
+}
+
+/**************************************************************************
* º¯ÊýÃû³Æ£º Nvram_FsWrite
* ¹¦ÄÜÃèÊö£º дNVÊý¾Ýµ½Îļþ
* ²ÎÊý˵Ã÷£º (IN)
@@ -819,7 +853,7 @@
return ZOSS_ERROR;
set_fs(KERNEL_DS);
- fd = CPPS_KO_FUNC(sys_open)(part_name, O_SYNC | O_RDWR | O_CREAT , 0);
+ fd = CPPS_KO_FUNC(sys_open)(part_name, O_SYNC | O_RDWR | O_CREAT , 0600);
if(fd < 0)
{
printk("cpnv open %s fail,errno = %d\n", part_name, fd);
@@ -911,7 +945,11 @@
if(!pBuf)
return ZOSS_ERROR;
- ret = Nvram_FsWrite(pDstFile, 0, len, pBuf);
+ ret = Nvram_FsClear(pDstFile);
+ if (ret == ZOSS_SUCCESS)
+ {
+ ret = Nvram_FsWrite(pDstFile, 0, len, pBuf);
+ }
zOss_Free(pBuf);
@@ -1044,7 +1082,7 @@
SINT32 fd = 0;
SINT32 ret = 0;
- fd = CPPS_KO_FUNC(sys_open)(pFile, O_SYNC | O_RDWR | O_CREAT | O_TRUNC, 0);
+ fd = CPPS_KO_FUNC(sys_open)(pFile, O_SYNC | O_RDWR | O_CREAT | O_TRUNC, 0600);
if(fd < 0)
{
printk("cpnv11 open %s fail,errno = %d\n", pFile, fd);
diff --git a/cp/ps/plat/src/oss/sup/src/sup_shell_thread.c b/cp/ps/plat/src/oss/sup/src/sup_shell_thread.c
index de1ef8b..56174f5 100755
--- a/cp/ps/plat/src/oss/sup/src/sup_shell_thread.c
+++ b/cp/ps/plat/src/oss/sup/src/sup_shell_thread.c
@@ -85,10 +85,10 @@
static VOID Shell_ThreadSetFlagUse(const CHAR *cmd)
{
zOss_AssertExN(cmd != NULL);
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\tÓ÷¨:%s m", cmd);
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\tmȡֵ[0-1]");
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\t m = 0±íʾ¹Ø±Õ¼Ç¼Ïß³Ìcpuʱ¼ä¿ª¹Ø");
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\t m = 1±íʾ´ò¿ª¼Ç¼Ïß³Ìcpuʱ¼ä¿ª¹Ø");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_NORMAL, "\tÓ÷¨:%s m", cmd);
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_NORMAL, "\tmȡֵ[0-1]");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_NORMAL, "\t m = 0±íʾ¹Ø±Õ¼Ç¼Ïß³Ìcpuʱ¼ä¿ª¹Ø");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_NORMAL, "\t m = 1±íʾ´ò¿ª¼Ç¼Ïß³Ìcpuʱ¼ä¿ª¹Ø");
}
static VOID Shell_PrintSysCPU(VOID)
@@ -140,14 +140,14 @@
if(NULL == gShell_UpdataCpuTimerId)
{
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_ABNORMAL, "\t¼Ç¼Ïß³ÌCPUʱ¼ä¿ª¹Øδ´ò¿ª£¬´Ë¹¦ÄܽûÓÃ");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_ABNORMAL, "\t¼Ç¼Ïß³ÌCPUʱ¼ä¿ª¹Øδ´ò¿ª£¬´Ë¹¦ÄܽûÓÃ");
return;
}
ret = zOss_StopTimer(gShell_UpdataCpuTimerId); /* ÏÈÍ£Ö¹¶¨Ê±Æ÷ */
if(ZOSS_ERROR == ret)
{
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_ABNORMAL, "\tË¢ÐÂʱ¼äÉèÖÃʧ°Ü");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_ABNORMAL, "\tË¢ÐÂʱ¼äÉèÖÃʧ°Ü");
return;
}
@@ -156,11 +156,11 @@
ret = zOss_StartTimer(gShell_UpdataCpuTimerId, freshTime, Shell_UpdateCpuTimerCallBack, 0); /* Æô¶¯¶¨Ê±Æ÷ */
if(ZOSS_ERROR == ret)
{
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_ABNORMAL, "\tË¢ÐÂʱ¼äÉèÖÃʧ°Ü");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_ABNORMAL, "\tË¢ÐÂʱ¼äÉèÖÃʧ°Ü");
}
else
{
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\tË¢ÐÂʱ¼äÉèÖóɹ¦");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_NORMAL, "\tË¢ÐÂʱ¼äÉèÖóɹ¦");
}
}
@@ -425,7 +425,7 @@
{
zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\tÓ÷¨:%s Ïß³ÌID [time]", CmdMsg->cmd);
zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\tÏß³ÌID¿ÉÒÔ10½øÖÆÊýºÍ16½øÖÆÊý(ǰ׺0x»ò0X)");
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\t timeΪ¿ÉÑ¡ÏÉèÖÃÏÔʾµÄË¢ÐÂʱ¼ä(µ¥Î»:Ãë)£¬·¶Î§[2~10]£¬Èô²»´øtimeÔòֹͣˢÐÂ");
+ zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\t timeΪ¿ÉÑ¡ÏÉèÖÃÏÔʾµÄË¢ÐÂʱ¼ä(µ¥Î»:Ãë)£¬·¶Î§[1~10]£¬Èô²»´øtimeÔòֹͣˢÐÂ");
return;
}
else if(1 == CmdMsg->paraCount || 2 == CmdMsg->paraCount)
@@ -463,7 +463,7 @@
}
freshTime = strtoul((char *)CmdMsg->para[1], (char **)NULL, 0);
- if (freshTime < 2 || freshTime > 10)
+ if (freshTime < 1 || freshTime > 10)
{
zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_ABNORMAL, "\t²ÎÊý´íÎó");
return;
@@ -501,16 +501,16 @@
if (FALSE == gOsa_SwapTimeFlag)
{
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_ABNORMAL, "\t¼Ç¼Ïß³ÌCPUʱ¼ä¿ª¹Øδ´ò¿ª£¬´Ë¹¦ÄܽûÓÃ");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_ABNORMAL, "\t¼Ç¼Ïß³ÌCPUʱ¼ä¿ª¹Øδ´ò¿ª£¬´Ë¹¦ÄܽûÓÃ");
return;
}
if (1 == CmdMsg->paraCount && 0 == strcmp((char *)CmdMsg->para[0], "help"))
{
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\tÓ÷¨:%s live/lazy/all time1 [time2]", CmdMsg->cmd);
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\t live:Ö»ÏÔʾ»î¶¯µÄỊ̈߳¬lazy:Ö»ÏÔʾ²»»î¶¯µÄỊ̈߳¬all:ÏÔʾËùÓÐÏß³Ì");
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\t time1ÉèÖÃij¶Îʱ¼äÄÚÏß³ÌÖ´ÐÐÇé¿ö(µ¥Î»:Ãë)£¬·¶Î§[0~10](oseƽ̨Î޸ù¦ÄÜ,ÉèÖÃΪ0), 0±íʾȫ²¿Ê±¼äÄÚµÄÏß³ÌÖ´ÐÐÇé¿ö");
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\t time2Ϊ¿ÉÑ¡ÏÉèÖÃÏÔʾµÄË¢ÐÂʱ¼ä(µ¥Î»:Ãë,µ±time1Ϊ0ʱÓÐЧ)£¬·¶Î§[2~10]£¬Èô²»´øtime2ÔòֹͣˢÐÂ");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_NORMAL, "\tÓ÷¨:%s live/lazy/all time1 [time2]", CmdMsg->cmd);
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_NORMAL, "\t live:Ö»ÏÔʾ»î¶¯µÄỊ̈߳¬lazy:Ö»ÏÔʾ²»»î¶¯µÄỊ̈߳¬all:ÏÔʾËùÓÐÏß³Ì");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_NORMAL, "\t time1ÉèÖÃij¶Îʱ¼äÄÚÏß³ÌÖ´ÐÐÇé¿ö(µ¥Î»:Ãë)£¬·¶Î§[0~10](oseƽ̨Î޸ù¦ÄÜ,ÉèÖÃΪ0), 0±íʾȫ²¿Ê±¼äÄÚµÄÏß³ÌÖ´ÐÐÇé¿ö");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_NORMAL, "\t time2Ϊ¿ÉÑ¡ÏÉèÖÃÏÔʾµÄË¢ÐÂʱ¼ä(µ¥Î»:Ãë,µ±time1Ϊ0ʱÓÐЧ)£¬·¶Î§[1~10]£¬Èô²»´øtime2ÔòֹͣˢÐÂ");
return;
}
else if (2 == CmdMsg->paraCount || 3 == CmdMsg->paraCount)
@@ -529,13 +529,13 @@
}
else
{
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_ABNORMAL, "\t²ÎÊý´íÎó");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_ABNORMAL, "\t²ÎÊý´íÎó");
return;
}
if (-1 == Shell_StrisNumber(CmdMsg->para[1]))
{
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\t²ÎÊý´íÎó");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_NORMAL, "\t²ÎÊý´íÎó");
return;
}
timeLen = strtoul((char *)CmdMsg->para[1], (char **)NULL, 0);
@@ -546,7 +546,7 @@
}
else if (0 != timeLen)
{
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_ABNORMAL, "\t²ÎÊý´íÎó");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_ABNORMAL, "\t²ÎÊý´íÎó");
return;
}
@@ -577,13 +577,13 @@
if (0 != timeLen || -1 == Shell_StrisNumber(CmdMsg->para[2]))
{
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\t²ÎÊý´íÎó");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_NORMAL, "\t²ÎÊý´íÎó");
return;
}
freshTime = strtoul((char *)CmdMsg->para[2], (char **)NULL, 0);
- if (freshTime < 2 || freshTime > 10)
+ if (freshTime < 1 || freshTime > 10)
{
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_ABNORMAL, "\t²ÎÊý´íÎó");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_ABNORMAL, "\t²ÎÊý´íÎó");
return;
}
if (NULL != gShell_FreshCpuTimerId)
@@ -605,7 +605,7 @@
}
else
{
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_ABNORMAL, "\t²ÎÊý´íÎó");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_ABNORMAL, "\t²ÎÊý´íÎó");
}
}
@@ -616,7 +616,7 @@
if(FALSE == gOsa_SwapTimeFlag)
{
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_ABNORMAL, "\t¼Ç¼Ïß³ÌCPUʱ¼ä¿ª¹Øδ´ò¿ª£¬´Ë¹¦ÄܽûÓÃ");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_ABNORMAL, "\t¼Ç¼Ïß³ÌCPUʱ¼ä¿ª¹Øδ´ò¿ª£¬´Ë¹¦ÄܽûÓÃ");
return;
}
@@ -624,14 +624,14 @@
{
if (0 == strcmp((char *)CmdMsg->para[0], "help"))
{
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\tÓ÷¨:%s time", CmdMsg->cmd);
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\t time:Ë¢ÐÂʱ¼äÒªÇóÔÚ[2-10]ÃëÖ®¼ä");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_NORMAL, "\tÓ÷¨:%s time", CmdMsg->cmd);
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_NORMAL, "\t time:Ë¢ÐÂʱ¼äÒªÇóÔÚ[1-10]ÃëÖ®¼ä");
return;
}
else if (0 == Shell_StrisNumber(CmdMsg->para[0]))
{
new_time = strtoul((char *)CmdMsg->para[0], NULL, 0);
- if (new_time >= 2 && new_time <= 10)
+ if (new_time >= 1 && new_time <= 10)
{
Shell_SetCpuUpdateTime(new_time);
return;
@@ -639,7 +639,7 @@
}
}
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_ABNORMAL, "\tÊäÈëhelp²éѯÓ÷¨");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_ABNORMAL, "\tÊäÈëhelp²éѯÓ÷¨");
}
@@ -688,18 +688,18 @@
gShell_UpdataCpuTimerId = zOss_CreateTimer("Shell_UpdateCpuTimer", Shell_UpdateCpuTimerCallBack, 0, TRUE);
if (NULL == gShell_UpdataCpuTimerId)
{
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_ABNORMAL, "\t´ò¿ª¼Ç¼Ïß³Ìcpuʱ¼ä¿ª¹Øʧ°Ü");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_ABNORMAL, "\t´ò¿ª¼Ç¼Ïß³Ìcpuʱ¼ä¿ª¹Øʧ°Ü");
return;
}
if (ZOSS_ERROR == zOss_StartTimer(gShell_UpdataCpuTimerId, freshTime, Shell_UpdateCpuTimerCallBack, 0))
{
zOss_KillTimer(gShell_UpdataCpuTimerId);
gShell_UpdataCpuTimerId = NULL;
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_ABNORMAL, "\t´ò¿ª¼Ç¼Ïß³Ìcpuʱ¼ä¿ª¹Øʧ°Ü");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_ABNORMAL, "\t´ò¿ª¼Ç¼Ïß³Ìcpuʱ¼ä¿ª¹Øʧ°Ü");
}
else
{
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\t³É¹¦´ò¿ª¼Ç¼Ïß³Ìcpuʱ¼ä¿ª¹Ø");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_NORMAL, "\t³É¹¦´ò¿ª¼Ç¼Ïß³Ìcpuʱ¼ä¿ª¹Ø");
}
}
@@ -767,7 +767,7 @@
}
zOss_Free(taskIdArray);
#endif
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\t³É¹¦¹Ø±Õ¼Ç¼Ïß³Ìcpuʱ¼ä¿ª¹Ø");
+ zOss_Printf(SUBMDL_SCHE, PRINT_LEVEL_NORMAL, "\t³É¹¦¹Ø±Õ¼Ç¼Ïß³Ìcpuʱ¼ä¿ª¹Ø");
}
}
@@ -801,7 +801,7 @@
if (0 == strcmp((char *)CmdMsg->para[0], "help"))
{
zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\tÓ÷¨:%s [time]", CmdMsg->cmd);
- zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\t timeΪ¿ÉÑ¡ÏÉèÖÃÏÔʾµÄË¢ÐÂʱ¼ä(µ¥Î»:Ãë)£¬·¶Î§[2~10]£¬Èô²»´øtimeÔòֹͣˢÐÂ");
+ zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_NORMAL, "\t timeΪ¿ÉÑ¡ÏÉèÖÃÏÔʾµÄË¢ÐÂʱ¼ä(µ¥Î»:Ãë)£¬·¶Î§[1~10]£¬Èô²»´øtimeÔòֹͣˢÐÂ");
break;
}
@@ -811,7 +811,7 @@
break;
}
freshTime = strtoul((char *)CmdMsg->para[0], (char **)NULL, 0);
- if (freshTime < 2 || freshTime > 10)
+ if (freshTime < 1 || freshTime > 10)
{
zOss_Printf(SUBMDL_TEST, PRINT_LEVEL_ABNORMAL, "\t²ÎÊý´íÎó");
break;