修改获取可用存储设备接口

This commit is contained in:
sober.song 2023-12-30 16:59:16 +08:00
parent f47a6c0b0b
commit 50ad347fc8
5 changed files with 8 additions and 9 deletions

View File

@ -317,12 +317,12 @@ SF_ST_MMC_DEV *SF_StrgCheckWorkableDev(void)
if(workable_dev == MMC_DEV_NO) if(workable_dev == MMC_DEV_NO)
{ {
MLOGD("Strg Check, No dev can use\n"); //MLOGD("Strg Check, No dev can use\n");
return NULL; return NULL;
} }
else else
{ {
MLOGD("Strg Check, workable_dev = %d\n", workable_dev); //MLOGD("Strg Check, workable_dev = %d\n", workable_dev);
SF_SetMMCDev(sf_mmc_dev[workable_dev]); SF_SetMMCDev(sf_mmc_dev[workable_dev]);
return sf_mmc_dev[workable_dev]; return sf_mmc_dev[workable_dev];
} }
@ -342,9 +342,8 @@ static void* mmc_monitoring_thread(void *arg)
int sf_mmc_dev_check_start(void) int sf_mmc_dev_check_start(void)
{ {
#if USE_MMC_DEV_CHECK
SF_StrgInit();// 初始化sf_mmc设备Obj SF_StrgInit();// 初始化sf_mmc设备Obj
#endif
int ret = pthread_create(&MMCMonitorTskCfg.TskId, NULL, mmc_monitoring_thread, NULL); int ret = pthread_create(&MMCMonitorTskCfg.TskId, NULL, mmc_monitoring_thread, NULL);
if(ret != SF_SUCCESS) if(ret != SF_SUCCESS)
{ {
@ -352,7 +351,7 @@ int sf_mmc_dev_check_start(void)
return ret; return ret;
} }
MMCMonitorTskCfg.IsRun = 1; MMCMonitorTskCfg.IsRun = 1;
MLOGD("00 mmc_dev check create success!\n"); MLOGD("mmc_dev check create success!\n");
return 0; return 0;
} }

View File

@ -760,7 +760,7 @@ INT32 System_Set_Storage_Act_Drive(char drive)
DCF_HANDLE System_Get_DCF_Handle(void) DCF_HANDLE System_Get_DCF_Handle(void)
{ {
#if USE_MMC_DEV_CHECK #if USE_MMC_DEV_CHECK
SF_ST_MMC_DEV *mmc_dev = SF_StrgCheckWorkableDev(); SF_ST_MMC_DEV *mmc_dev = SF_GetMMCDev();
if(mmc_dev == NULL) if(mmc_dev == NULL)
{ {
DBG_ERR("No MMC_Dev Can use!\n"); DBG_ERR("No MMC_Dev Can use!\n");

View File

@ -701,7 +701,7 @@ UINT32 PhotoExe_GetFreePicNum(void)
UINT32 size; UINT32 size;
#if USE_MMC_DEV_CHECK #if USE_MMC_DEV_CHECK
SF_ST_MMC_DEV *mmc_dev = SF_StrgCheckWorkableDev(); SF_ST_MMC_DEV *mmc_dev = SF_GetMMCDev();
if(mmc_dev == NULL) if(mmc_dev == NULL)
{ {
DBG_ERR("No MMC_Dev Can use!\n"); DBG_ERR("No MMC_Dev Can use!\n");

View File

@ -40,7 +40,7 @@
#include "SF_SysStrgMng.h" #include "SF_SysStrgMng.h"
#if USE_MMC_DEV_CHECK #if USE_MMC_DEV_CHECK
SF_ST_MMC_DEV *mmc_dev = NULL; static SF_ST_MMC_DEV *mmc_dev = NULL;
#endif #endif
void UIStorageCheck_AllSize(UINT64 *uiTotal, UINT64 *uiRemain) void UIStorageCheck_AllSize(UINT64 *uiTotal, UINT64 *uiRemain)
{ {

View File

@ -673,7 +673,7 @@ static void update_gps_status(void)
int get_storage_type(void) int get_storage_type(void)
{ {
return MMC_DEV_SD; return MMC_DEV_SD;
SF_ST_MMC_DEV *mmc_dev = SF_StrgCheckWorkableDev(); SF_ST_MMC_DEV *mmc_dev = SF_GetMMCDev();
if (NULL == mmc_dev) if (NULL == mmc_dev)
{ {
DBG_ERR("SF_StrgCheckWorkableDev return null.\n"); DBG_ERR("SF_StrgCheckWorkableDev return null.\n");