[Feature][task-view-306]merge P56U08(patch6) 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: I8e809511ac30c97228dd110c304b4a08f4af36d7
diff --git a/cp/ps/plat/inc/oss/oss_sup.h b/cp/ps/plat/inc/oss/oss_sup.h
index 686c318..313ccd4 100755
--- a/cp/ps/plat/inc/oss/oss_sup.h
+++ b/cp/ps/plat/inc/oss/oss_sup.h
@@ -462,7 +462,7 @@
VOID zOss_RamPrintf(VOID);
/* ά²â */
-UINT32 zOss_DebugInfoRecord(UINT32 id, const VOID *pFormat, ...);
+UINT32 zOss_DebugInfoRecord(char *id, const VOID *pFormat, ...);
/* shellÄ£¿é */
UINT32 zOss_AddShellCmd(const CHAR *cmd_name, const Shell_Func func, const CHAR *description);
diff --git a/cp/ps/plat/src/oss/sup/src/sup_except.c b/cp/ps/plat/src/oss/sup/src/sup_except.c
index fd355b2..8c87a48 100755
--- a/cp/ps/plat/src/oss/sup/src/sup_except.c
+++ b/cp/ps/plat/src/oss/sup/src/sup_except.c
@@ -371,7 +371,7 @@
* ·µ »Ø Öµ£º ³É¹¦: дÈ볤¶È; ʧ°Ü: ZOSS_ERROR
* ÆäËü˵Ã÷£º
**************************************************************************/
-UINT32 zOss_DebugInfoRecord(UINT32 id, const VOID *pFormat, ...)
+UINT32 zOss_DebugInfoRecord(char *id, const VOID *pFormat, ...)
{
#ifdef _OS_WIN
return ZOSS_ERROR;
@@ -387,7 +387,7 @@
#endif
}
#else
-UINT32 zOss_DebugInfoRecord(UINT32 id, const VOID *pFormat, ...)
+UINT32 zOss_DebugInfoRecord(char *id, const VOID *pFormat, ...)
{
return ZOSS_SUCCESS;
}