增加获取指定mmc设备dcf_handle接口
This commit is contained in:
		
							parent
							
								
									c8e3665f3b
								
							
						
					
					
						commit
						f3f13e5879
					
				| 
						 | 
				
			
			@ -201,8 +201,6 @@ ${PREFIX}/lib/modules/$KERVER/hdal/kdrv_videoout/fbdev/nvt_fb.ko
 | 
			
		|||
#insmod ${PREFIX}/lib/modules/$KERVER/hdal/comm/usb2dev/nvt_usb2dev.ko
 | 
			
		||||
#fi
 | 
			
		||||
 | 
			
		||||
mount /dev/mmcblk1p1 /mnt/sd2
 | 
			
		||||
 | 
			
		||||
if [ -f /usr/bin/isp_demon ]; then
 | 
			
		||||
    /usr/bin/isp_demon
 | 
			
		||||
else
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -81,6 +81,11 @@ void SF_StrgUnInit(void)
 | 
			
		|||
	pMMCDev = NULL;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int SF_GetMMCDevHandle(MMC_DEV_TYPE dev_type)
 | 
			
		||||
{
 | 
			
		||||
	return sf_mmc_dev[dev_type]->dcf_handle;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void SF_StrgSetDcfHandle(UINT32 strg_id, UINT32 handle)
 | 
			
		||||
{
 | 
			
		||||
	sf_mmc_dev[strg_id]->dcf_handle = handle;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -87,7 +87,7 @@ SF_ST_MMC_DEV *SF_StrgCheckWorkableDev(void);
 | 
			
		|||
void SF_SetMMCDev(SF_ST_MMC_DEV *pDev);
 | 
			
		||||
SF_ST_MMC_DEV *SF_GetMMCDev(void);
 | 
			
		||||
int sf_mmc_dev_check_start(void);
 | 
			
		||||
 | 
			
		||||
int SF_GetMMCDevHandle(MMC_DEV_TYPE dev_type);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -54,7 +54,7 @@ void Strg_CB(UINT32 event, UINT32 param1, UINT32 param2)
 | 
			
		|||
    SF_MESSAGE_BUF_S stMessageBuf = {0};
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	DBG_IND("Strg_CB: strg_id = %d, status = %d\n", param1, param2);
 | 
			
		||||
	printf("Strg_CB: strg_id = %d, status = %d\n", param1, param2);
 | 
			
		||||
	switch (event) {
 | 
			
		||||
// part-1
 | 
			
		||||
	case SYSTEM_CB_CONFIG:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -766,12 +766,40 @@ UINT32 PhotoExe_GetFreePicNum(void)
 | 
			
		|||
UINT32 PhotoExe_GetTotalPicNum(void)
 | 
			
		||||
{
 | 
			
		||||
 | 
			
		||||
	UINT64              uiSpace;
 | 
			
		||||
	UINT64              uiSpace = 0;
 | 
			
		||||
	UINT32              totalImgNum;
 | 
			
		||||
	UINT32              reserveSize = 0x80000; //  500KB
 | 
			
		||||
	UINT32              CaptureSize;
 | 
			
		||||
	UINT32              size;
 | 
			
		||||
#if USE_MMC_DEV_CHECK
 | 
			
		||||
 | 
			
		||||
	SF_ST_MMC_DEV *mmc_dev = SF_GetMMCDev();
 | 
			
		||||
	if(mmc_dev == NULL)
 | 
			
		||||
	{
 | 
			
		||||
		DBG_ERR("No MMC_Dev Can use!\n");
 | 
			
		||||
		return 0;
 | 
			
		||||
	}
 | 
			
		||||
	if(mmc_dev->dcf_handle < 0)
 | 
			
		||||
	{
 | 
			
		||||
		DBG_ERR("dcf_handle err!\n");
 | 
			
		||||
		return 0;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if USE_MMC_DEV_CHECK
 | 
			
		||||
 | 
			
		||||
	if(mmc_dev->dev_type == MMC_DEV_SD)
 | 
			
		||||
	{
 | 
			
		||||
		uiSpace = FileSys_GetDiskInfoEx('A', FST_INFO_DISK_SIZE);
 | 
			
		||||
	}
 | 
			
		||||
	else if(mmc_dev->dev_type == MMC_DEV_EMMC)
 | 
			
		||||
	{
 | 
			
		||||
		uiSpace = FileSys_GetDiskInfoEx('B', FST_INFO_DISK_SIZE);
 | 
			
		||||
	}
 | 
			
		||||
#else
 | 
			
		||||
	uiSpace = FileSys_GetDiskInfo(FST_INFO_DISK_SIZE);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
	//DBG_IND("[cap]Free Space = %d KB\r\n", uiSpace / 1024);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,6 +14,8 @@
 | 
			
		|||
#define __DBGFLT__          "*" //*=All, [mark]=CustomClass
 | 
			
		||||
#include <kwrap/debug.h>
 | 
			
		||||
 | 
			
		||||
#include "SF_SysStrgMng.h"
 | 
			
		||||
 | 
			
		||||
PHOTO_TASK_DATA gPhotoData = { 0 };
 | 
			
		||||
 | 
			
		||||
static UINT32 g_uiFreePicNum        = 0;
 | 
			
		||||
| 
						 | 
				
			
			@ -28,7 +30,29 @@ CHAR *Get_FreePicNumString(UINT32 uiValue)
 | 
			
		|||
		return 0;
 | 
			
		||||
	}
 | 
			
		||||
	unsigned long fileCount = 0;
 | 
			
		||||
#if USE_MMC_DEV_CHECK
 | 
			
		||||
 | 
			
		||||
	SF_ST_MMC_DEV *mmc_dev = SF_GetMMCDev();
 | 
			
		||||
	if(mmc_dev == NULL)
 | 
			
		||||
	{
 | 
			
		||||
		DBG_ERR("No MMC_Dev Can use!\n");
 | 
			
		||||
		return NULL;
 | 
			
		||||
	}
 | 
			
		||||
	if(mmc_dev->dcf_handle < 0)
 | 
			
		||||
	{
 | 
			
		||||
		DBG_ERR("dcf_handle err!\n");
 | 
			
		||||
		return NULL;
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if USE_MMC_DEV_CHECK
 | 
			
		||||
	if(mmc_dev->dev_type != MMC_DEV_NO)
 | 
			
		||||
	{
 | 
			
		||||
		fileCount = DCF_GetDBInfoEx(mmc_dev->dcf_handle, DCF_INFO_TOL_FILE_COUNT);
 | 
			
		||||
	}
 | 
			
		||||
#else
 | 
			
		||||
	fileCount = DCF_GetDBInfo(DCF_INFO_TOL_FILE_COUNT);
 | 
			
		||||
#endif
 | 
			
		||||
	snprintf(g_cFreePicNumStr, sizeof(g_cFreePicNumStr), "%05ld/%05ld", fileCount, uiValue);
 | 
			
		||||
	return g_cFreePicNumStr;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue
	
	Block a user