diff --git a/rtos/code/driver/na51089/source/mcu/sf_sd_common.c b/rtos/code/driver/na51089/source/mcu/sf_sd_common.c index d264d48a8..3bbeaebec 100755 --- a/rtos/code/driver/na51089/source/mcu/sf_sd_common.c +++ b/rtos/code/driver/na51089/source/mcu/sf_sd_common.c @@ -66,6 +66,7 @@ UINT32 sf_check_card_full(void) //UIMenuStoreInfo *puiPara = sf_ui_para_get(); if(!sf_in_card_exist()) { + IsCardFull = TRUE; return 1; } @@ -95,7 +96,7 @@ UINT32 sf_check_card_full(void) BOOL sf_is_emmc_full(void) { - //printf("[%s]:%d IsCardFull:%d\n", __FUNCTION__, __LINE__, IsCardFull); + //printf("[%s]:%d IsEmmcFull:%d\n", __FUNCTION__, __LINE__, IsEmmcFull); return IsEmmcFull; } @@ -113,7 +114,7 @@ UINT32 sf_check_emmc_full(void) ret = TRUE; //if(0 == puiPara->SdLoopSwitch) { - IsCardFull = TRUE; + IsEmmcFull = TRUE; } //printf("%s:%d sd card is full diskFree=%lu",__FUNCTION__,__LINE__,diskFree); } @@ -178,7 +179,7 @@ void SF_RtosStrgUnInit(void) DBG_WRN("SF_RtosStrgUnInit!\n"); } -static UINT32 sf_rtos_mmc_dev_space_check_full(MMC_DEV_TYPE mmc_dev) +UINT32 sf_rtos_mmc_dev_space_check_full(MMC_DEV_TYPE mmc_dev) { UINT64 diskFree = 0; UINT32 ret = 0; @@ -249,14 +250,14 @@ SF_RTOS_ST_MMC_DEV *SF_RtosStrgCheckWorkableDev(void) { MMC_DEV_TYPE workable_dev = MMC_DEV_NO; - if((sf_rtos_mmc_dev[MMC_DEV_SD]->moumted_state == MMC_DEV_MOUNT_STATE_UNMOUNTED) && - (sf_rtos_mmc_dev[MMC_DEV_EMMC]->moumted_state == MMC_DEV_MOUNT_STATE_UNMOUNTED)) - { - workable_dev = MMC_DEV_NO; - } + if((sf_rtos_mmc_dev[MMC_DEV_SD]->moumted_state == MMC_DEV_MOUNT_STATE_UNMOUNTED) && + (sf_rtos_mmc_dev[MMC_DEV_EMMC]->moumted_state == MMC_DEV_MOUNT_STATE_UNMOUNTED)) + { + workable_dev = MMC_DEV_NO; + } else if(sf_rtos_mmc_dev[MMC_DEV_SD]->moumted_state == MMC_DEV_MOUNT_STATE_UNMOUNTED) { - if(!sf_rtos_mmc_dev_space_check_full(MMC_DEV_EMMC)) + if(!sf_is_emmc_full()) { workable_dev = MMC_DEV_EMMC; } @@ -270,7 +271,7 @@ SF_RTOS_ST_MMC_DEV *SF_RtosStrgCheckWorkableDev(void) } else if(sf_rtos_mmc_dev[MMC_DEV_EMMC]->moumted_state == MMC_DEV_MOUNT_STATE_UNMOUNTED) { - if(!sf_rtos_mmc_dev_space_check_full(MMC_DEV_SD)) + if(!sf_is_card_full()) { workable_dev = MMC_DEV_SD; } @@ -284,16 +285,16 @@ SF_RTOS_ST_MMC_DEV *SF_RtosStrgCheckWorkableDev(void) } else { - if(!sf_rtos_mmc_dev_space_check_full(MMC_DEV_EMMC) && - !sf_rtos_mmc_dev_space_check_full(MMC_DEV_SD)) + if(!sf_is_emmc_full() && + !sf_is_card_full()) { workable_dev = MMC_DEV_EMMC; } - else if(!sf_rtos_mmc_dev_space_check_full(MMC_DEV_EMMC)) + else if(!sf_is_emmc_full()) { workable_dev = MMC_DEV_EMMC; } - else if(!sf_rtos_mmc_dev_space_check_full(MMC_DEV_SD)) + else if(!sf_is_card_full()) { workable_dev = MMC_DEV_SD; }