diff --git a/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c b/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c index 0bb5a243e..192db1708 100755 --- a/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c +++ b/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c @@ -61,7 +61,7 @@ void sf_dev_flag_init(void) T_CFLG cflg; if ((ret |= vos_flag_create(&sf_dev_flag_id, &cflg, "sf_dev_flag_id")) != E_OK) { - SYS_SLOGE("sf_dev_flag_id fail\r\n"); + MLOGI("sf_dev_flag_id fail\r\n"); } vos_flag_clr(sf_dev_flag_id, (FLGPTN)-1); } @@ -84,7 +84,7 @@ int sf_dev_flag_wait_done_timeout(DEV_FLAG_INIT boot_init, int timeout_ms) ret = vos_flag_wait_timeout(&flgptn, sf_dev_flag_id, (FLGPTN)(1 << boot_init), TWF_ANDW, vos_util_msec_to_tick(timeout_ms)); if(unlikely(ret != E_OK)){ - printf("wait(%lu) init timeout(%ld ms)!\n", boot_init, timeout_ms); + printf("wait(%d) init sf_dev_flag_wait_done_timeout(%ld ms)!\n", boot_init, timeout_ms); } return ret; @@ -153,7 +153,7 @@ void SF_StrgUnInit(void) int SF_GetMMCDevHandle(MMC_DEV_TYPE dev_type) { - if(sf_mmc_dev != NULL) { + if(sf_mmc_dev[dev_type] != NULL) { return sf_mmc_dev[dev_type]->dcf_handle; } return 0; @@ -240,7 +240,7 @@ static int SF_StrgNodeCheck(const char *devName) void SF_StrgRegister(SF_MESSAGE_BUF_S *pMessageBuf) { MLOGD("[dev_id:%d, evt:%d]\n",pMessageBuf->arg2, pMessageBuf->arg1); - UIMenuStoreInfo *puiPara = sf_ui_para_get(); + // UIMenuStoreInfo *puiPara = sf_ui_para_get(); if(pMessageBuf->arg2 == MMC_DEV_SD) { @@ -286,18 +286,18 @@ void SF_StrgRegister(SF_MESSAGE_BUF_S *pMessageBuf) } } - for(int i = 0; i < MMC_DEV_MAX_NUM; i++) - { - MLOGD("node:%d, mount:%d, loop:%d\n", - sf_mmc_dev[i]->node, sf_mmc_dev[i]->moumted_state, puiPara->SdLoopSwitch); - } + // for(int i = 0; i < MMC_DEV_MAX_NUM; i++) + // { + // MLOGD("node:%d, mount:%d, loop:%d\n", + // sf_mmc_dev[i]->node, sf_mmc_dev[i]->moumted_state, puiPara->SdLoopSwitch); + // } } SF_ST_MMC_DEV *SF_StrgCheckWorkableDev(void) { MMC_DEV_TYPE workable_dev = MMC_DEV_NO; UIMenuStoreInfo *puiPara = sf_ui_para_get(); - //MLOGD("sf mmc check workable dev start!!!\n"); + // MLOGD("sf mmc check workable dev start!!!\n"); if((sf_mmc_dev[MMC_DEV_SD]->node == MMC_DEV_NODE_STATE_NO_EXIST) && (sf_mmc_dev[MMC_DEV_EMMC]->node == MMC_DEV_NODE_STATE_NO_EXIST)) @@ -455,7 +455,7 @@ static void* mmc_monitoring_thread(void *arg) int sf_mmc_dev_check_start(void) { - SF_StrgInit();// 初始化sf_mmc设备Obj + //SF_StrgInit();// 初始化sf_mmc设备Obj sf_dev_flag_init(); int ret = pthread_create(&MMCMonitorTskCfg.TskId, NULL, mmc_monitoring_thread, NULL); if(ret != SF_SUCCESS) diff --git a/code/application/source/cardv/SrcCode/System/SysStrg_CB.c b/code/application/source/cardv/SrcCode/System/SysStrg_CB.c index 7d16ca1ed..d56ca4284 100755 --- a/code/application/source/cardv/SrcCode/System/SysStrg_CB.c +++ b/code/application/source/cardv/SrcCode/System/SysStrg_CB.c @@ -178,7 +178,7 @@ void Strg_CB(UINT32 event, UINT32 param1, UINT32 param2) stMessageBuf.arg3 = param2; stMessageBuf.cmdId = CMD_SD; sf_com_message_send_to_app(&stMessageBuf); - printf("strg_cb send MOUNT! dev_id = %d\n", param1); + // printf("strg_cb send MOUNT! dev_id = %d\n", param1); #if USE_MMC_DEV_CHECK SF_StrgRegister(&stMessageBuf); #endif diff --git a/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c b/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c index c2db86c67..9d4a38f4c 100644 --- a/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c +++ b/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c @@ -332,9 +332,9 @@ void sf_log_confgs(void) { #if (LOGFILE_FUNC==ENABLE) UIMenuStoreInfo *puiPara = sf_ui_para_get(); - DBG_WRN("sf_log_confgs s\n"); if(((puiPara->DebugMode) || (puiPara->AutoLogSwitch)) && (!sf_is_usb_flag()) && (SxTimer_GetFuncActive(SX_TIMER_DET_SYSTEM_ERROR_ID) == 0)) { + DBG_WRN("sf_log_confgs s\n"); { LOGFILE_OPEN logOpenParm = {0}; LOGFILE_CFG cfg = {0}; @@ -637,6 +637,7 @@ static BOOL FileSys_DetBusy(void) void Card_DetInsert(void) { + // DBG_WRN("Card_DetInsert\r\n"); GxStrg_Det(0, 0); #if 0 //FS_MULTI_STRG_FUNC @@ -1077,7 +1078,7 @@ INT32 System_OnStrgInsert(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) DCF_HANDLE handle = DCF_Open(&dcfParm); - DBG_WRN("DCF_Open(strg id = %lu, name = %s, handle = %lu, drive = %c)\n", strg_id, System_Get_Strg_Name(strg_id), handle, dcfParm.Drive); + // DBG_DUMP("(strg id = %lu, name = %s, handle = %lu, drive = %c)\n", strg_id, System_Get_Strg_Name(strg_id), handle, dcfParm.Drive); /***************************************************************** * update strg mapping table *****************************************************************/ @@ -1087,12 +1088,12 @@ INT32 System_OnStrgInsert(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) * init dcf act handle with sd card *****************************************************************/ if(strg_id == STRG_ID_SD){ - DBG_WRN("sd act\n"); + // DBG_WRN("sd act\n"); System_Set_Storage_Act_Drive(g_strg_mapping_table[strg_id].drive); //DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, SF_SD_DCF_FILE_NAME); } else if(strg_id == STRG_ID_EMMC){ - DBG_WRN("emmc act\n"); + // DBG_WRN("emmc act\n"); //DCF_SetFileFreeChars(DCF_FILE_TYPE_ANYFORMAT, SF_EMMC_DCF_FILE_NAME); System_Set_Storage_Act_Drive(g_strg_mapping_table[strg_id].drive); } @@ -1116,7 +1117,7 @@ INT32 System_OnStrgInsert(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) ************************************************/ else if(strg_id == STRG_ID_EMMC){ DCF_HANDLE handle = g_strg_mapping_table[strg_id].dcf_hdl; - DBG_WRN("DCF_ScanObjEx(strg id = %lu, name = %s, dcf handle = %d)\n", strg_id, System_Get_Strg_Name(strg_id), handle); + // DBG_WRN("DCF_ScanObjEx(strg id = %lu, name = %s, dcf handle = %d)\n", strg_id, System_Get_Strg_Name(strg_id), handle); DCF_ScanObjEx(handle); } diff --git a/code/application/source/cardv/SrcCode/System/app-main.c b/code/application/source/cardv/SrcCode/System/app-main.c index 9b8000eb4..05a9c2602 100755 --- a/code/application/source/cardv/SrcCode/System/app-main.c +++ b/code/application/source/cardv/SrcCode/System/app-main.c @@ -27,16 +27,16 @@ static void insmod_system(void) static void insmod_capture(void) { - vos_perf_list_mark(__func__, __LINE__, 0); + // vos_perf_list_mark(__func__, __LINE__, 0); - vos_perf_list_mark(__func__, __LINE__, 1); + // vos_perf_list_mark(__func__, __LINE__, 1); } static void insmod_display(void) { - vos_perf_list_mark(__func__, __LINE__, 0); + // vos_perf_list_mark(__func__, __LINE__, 0); - vos_perf_list_mark(__func__, __LINE__, 1); + // vos_perf_list_mark(__func__, __LINE__, 1); } static void insmod_storage(void) @@ -48,9 +48,9 @@ static void insmod_storage(void) static void insmod_encoder(void) { - vos_perf_list_mark(__func__, __LINE__, 0); + // vos_perf_list_mark(__func__, __LINE__, 0); - vos_perf_list_mark(__func__, __LINE__, 1); + // vos_perf_list_mark(__func__, __LINE__, 1); } static void insmod_others(void)