1.emmc检测
This commit is contained in:
parent
13c9931f12
commit
cb00e6c4fa
|
@ -130,18 +130,14 @@ static UINT32 SF_StrgSpaceCheckFull(MMC_DEV_TYPE mmc_dev)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
/*check disk free size*/
|
/*check disk free size*/
|
||||||
if(mmc_dev == MMC_DEV_SD)
|
if((mmc_dev == MMC_DEV_SD) && (sf_in_card_exist() == TRUE))
|
||||||
{
|
{
|
||||||
if(sf_in_card_exist())
|
diskFree = FileSys_GetDiskInfoEx('A', FST_INFO_FREE_SPACE);
|
||||||
{
|
|
||||||
diskFree = FileSys_GetDiskInfoEx('A', FST_INFO_FREE_SPACE);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else if((mmc_dev == MMC_DEV_EMMC) && (sf_in_emmc_exist()))
|
||||||
{
|
{
|
||||||
diskFree = FileSys_GetDiskInfoEx('B', FST_INFO_FREE_SPACE);
|
diskFree = FileSys_GetDiskInfoEx('B', FST_INFO_FREE_SPACE);
|
||||||
}
|
}
|
||||||
|
|
||||||
diskFree = diskFree/1024/1024;
|
diskFree = diskFree/1024/1024;
|
||||||
|
|
||||||
if(diskFree < MIN_DISK_FREE_SIZE_MB) /* 30MB */
|
if(diskFree < MIN_DISK_FREE_SIZE_MB) /* 30MB */
|
||||||
|
|
|
@ -721,14 +721,11 @@ UINT32 PhotoExe_GetFreePicNum(void)
|
||||||
//uiFreeSpace = FileSys_GetDiskInfo(FST_INFO_FREE_SPACE);
|
//uiFreeSpace = FileSys_GetDiskInfo(FST_INFO_FREE_SPACE);
|
||||||
#if USE_MMC_DEV_CHECK
|
#if USE_MMC_DEV_CHECK
|
||||||
|
|
||||||
if(mmc_dev->dev_type == MMC_DEV_SD)
|
if((mmc_dev->dev_type == MMC_DEV_SD) && (sf_in_card_exist() == TRUE))
|
||||||
{
|
{
|
||||||
if(sf_in_card_exist() == TRUE)
|
uiFreeSpace = FileSys_GetDiskInfoEx('A', FST_INFO_FREE_SPACE);
|
||||||
{
|
|
||||||
uiFreeSpace = FileSys_GetDiskInfoEx('A', FST_INFO_FREE_SPACE);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else if(mmc_dev->dev_type == MMC_DEV_EMMC)
|
else if((mmc_dev->dev_type == MMC_DEV_EMMC) && (sf_in_emmc_exist()))
|
||||||
{
|
{
|
||||||
uiFreeSpace = FileSys_GetDiskInfoEx('B', FST_INFO_FREE_SPACE);
|
uiFreeSpace = FileSys_GetDiskInfoEx('B', FST_INFO_FREE_SPACE);
|
||||||
}
|
}
|
||||||
|
@ -792,14 +789,11 @@ UINT32 PhotoExe_GetTotalPicNum(void)
|
||||||
|
|
||||||
#if USE_MMC_DEV_CHECK
|
#if USE_MMC_DEV_CHECK
|
||||||
|
|
||||||
if(mmc_dev->dev_type == MMC_DEV_SD)
|
if((mmc_dev->dev_type == MMC_DEV_SD) && (sf_in_card_exist() == TRUE))
|
||||||
{
|
{
|
||||||
if(sf_in_card_exist() == TRUE)
|
uiSpace = FileSys_GetDiskInfoEx('A', FST_INFO_DISK_SIZE);
|
||||||
{
|
|
||||||
uiSpace = FileSys_GetDiskInfoEx('A', FST_INFO_DISK_SIZE);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else if(mmc_dev->dev_type == MMC_DEV_EMMC)
|
else if((mmc_dev->dev_type == MMC_DEV_EMMC) && (sf_in_emmc_exist()))
|
||||||
{
|
{
|
||||||
uiSpace = FileSys_GetDiskInfoEx('B', FST_INFO_DISK_SIZE);
|
uiSpace = FileSys_GetDiskInfoEx('B', FST_INFO_DISK_SIZE);
|
||||||
}
|
}
|
||||||
|
|
|
@ -740,8 +740,8 @@ static void update_sd_emmc_status(void)
|
||||||
|
|
||||||
UINT64 diskSizeSd = 0;
|
UINT64 diskSizeSd = 0;
|
||||||
UINT64 diskFreeSd = 0;
|
UINT64 diskFreeSd = 0;
|
||||||
UINT64 diskSizeEmmc = FileSys_GetDiskInfoEx('B', FST_INFO_DISK_SIZE);
|
UINT64 diskSizeEmmc = 0;
|
||||||
UINT64 diskFreeEmmc = FileSys_GetDiskInfoEx('B', FST_INFO_FREE_SPACE);
|
UINT64 diskFreeEmmc = 0;
|
||||||
char * textLabel;
|
char * textLabel;
|
||||||
char * textLabelError;
|
char * textLabelError;
|
||||||
UINT16 idLeft;
|
UINT16 idLeft;
|
||||||
|
@ -749,7 +749,11 @@ static void update_sd_emmc_status(void)
|
||||||
BOOL setWarning = false;
|
BOOL setWarning = false;
|
||||||
BOOL showError = true;
|
BOOL showError = true;
|
||||||
|
|
||||||
|
if(sf_in_emmc_exist())
|
||||||
|
{
|
||||||
|
diskSizeEmmc = FileSys_GetDiskInfoEx('B', FST_INFO_DISK_SIZE);
|
||||||
|
diskFreeEmmc = FileSys_GetDiskInfoEx('B', FST_INFO_FREE_SPACE);
|
||||||
|
}
|
||||||
lv_obj_set_hidden(label_7_scr_uiflowphoto, showError);
|
lv_obj_set_hidden(label_7_scr_uiflowphoto, showError);
|
||||||
//lv_obj_set_pos(label_7_scr_uiflowphoto, 65, 171);
|
//lv_obj_set_pos(label_7_scr_uiflowphoto, 65, 171);
|
||||||
lv_label_set_text(label_7_scr_uiflowphoto, "");
|
lv_label_set_text(label_7_scr_uiflowphoto, "");
|
||||||
|
@ -805,8 +809,12 @@ static void update_sd_emmc_status(void)
|
||||||
|
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
diskSizeSd = FileSys_GetDiskInfoEx('A', FST_INFO_DISK_SIZE);
|
if(sf_in_card_exist() == TRUE)
|
||||||
diskFreeSd = FileSys_GetDiskInfoEx('A', FST_INFO_FREE_SPACE);
|
{
|
||||||
|
diskSizeSd = FileSys_GetDiskInfoEx('A', FST_INFO_DISK_SIZE);
|
||||||
|
diskFreeSd = FileSys_GetDiskInfoEx('A', FST_INFO_FREE_SPACE);
|
||||||
|
}
|
||||||
|
|
||||||
//printf("[%s]sd card disk size: %lld,free size: %lld\n", __FUNCTION__, diskSizeSd, diskFreeSd);
|
//printf("[%s]sd card disk size: %lld,free size: %lld\n", __FUNCTION__, diskSizeSd, diskFreeSd);
|
||||||
//printf("[%s]emmc card disk size: %lld,free size: %lld\n", __FUNCTION__, diskSizeEmmc, diskFreeEmmc);
|
//printf("[%s]emmc card disk size: %lld,free size: %lld\n", __FUNCTION__, diskSizeEmmc, diskFreeEmmc);
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ typedef BOOL (*SF_CALLBACK_SD_CMD)(void);
|
||||||
void sf_sd_exist_reg_cb(SF_CALLBACK_SD_CMD fpCB);
|
void sf_sd_exist_reg_cb(SF_CALLBACK_SD_CMD fpCB);
|
||||||
|
|
||||||
BOOL sf_in_card_exist(void);
|
BOOL sf_in_card_exist(void);
|
||||||
|
SINT32 sf_in_emmc_exist(void);
|
||||||
void sf_set_card_statu(UINT32 val);
|
void sf_set_card_statu(UINT32 val);
|
||||||
UINT32 sf_get_card_statu(void);
|
UINT32 sf_get_card_statu(void);
|
||||||
|
|
||||||
|
|
|
@ -68,6 +68,13 @@ BOOL sf_in_card_exist(void)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SINT32 sf_in_emmc_exist(void)
|
||||||
|
{
|
||||||
|
if (access("/dev/mmcblk1p1", F_OK) == SUCCESS) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
void sf_set_card_statu(UINT32 val)
|
void sf_set_card_statu(UINT32 val)
|
||||||
{
|
{
|
||||||
formatSD = val;
|
formatSD = val;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user