Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc

code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c

@@ -326,11 +326,6 @@ SF_ST_MMC_DEV *SF_StrgCheckWorkableDev(void)
         }
 	}
 	
-	for(int i = 0; i < 2; i++)
-	{
-		sf_mmc_dev[i]->dev_type = workable_dev;
-	}
-
 	if(workable_dev == MMC_DEV_NO)
 	{
 		//MLOGD("Strg Check, No dev can use\n");
@@ -338,13 +333,13 @@ SF_ST_MMC_DEV *SF_StrgCheckWorkableDev(void)
 	}
 	else
 	{
+		sf_mmc_dev[workable_dev]->dev_type = workable_dev;
 		//MLOGD("Strg Check, workable_dev = %d\n", workable_dev);
 		SF_SetMMCDev(sf_mmc_dev[workable_dev]);
 		return sf_mmc_dev[workable_dev];
 	}
 }
 
-#if 1
 static int sfStrgOnActionSendCurrentDev(SF_ST_MMC_DEV *pMMCDev)
 {
 	SF_MESSAGE_BUF_S stMessageBuf = {0};
@@ -356,7 +351,6 @@ static int sfStrgOnActionSendCurrentDev(SF_ST_MMC_DEV *pMMCDev)
 	MLOGD("sf sys strg update current dev!\n");
 	return 0;
 }
-#endif
 
 static void* mmc_monitoring_thread(void *arg)
 {

code/application/source/cardv/SrcCode/System/SysStrg_Exe.c

@@ -807,6 +807,48 @@ INT32 System_OnStrgSetActDrive(VControl *pCtrl, UINT32 paramNum, UINT32 *paramAr
 	return NVTEVT_CONSUME;
 }
 
+int search_str_in_file(char *path, char *str)
+{
+    FILE *fp = NULL;
+    UINT32 u32ize = 0;
+    int found = 0;
+    char *pStrSrc = NULL;
+
+    fp = fopen(path, "r");
+    if (fp) {
+        fseek(fp, 0, SEEK_END);
+        u32ize = ftell(fp); // take file size
+        fseek(fp, 0, SEEK_SET); // move to position zero
+        pStrSrc = (char *)malloc(u32ize * sizeof(char));
+
+        if (pStrSrc) {
+            fread(pStrSrc, 1, u32ize, fp);
+            if (strstr(pStrSrc, str)) {
+                found = 1;
+            }
+            free(pStrSrc);
+        }
+
+        fclose(fp);
+        fp = NULL;
+        pStrSrc = NULL;
+        u32ize = 0;
+    }
+
+    return found;
+}
+
+int System_check_mmcblk0p1(void)
+{
+    SysMain_system("ls /dev/mmcblk0p1 > /tmp/lsdev.txt");
+    vos_util_delay_ms(100);
+    if (search_str_in_file("/tmp/lsdev.txt", "/dev/mmcblk0p1")) {
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
 INT32 System_OnStrgInsert(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
 {
 	UINT32 strg_id = paramArray[0];
@@ -853,6 +895,31 @@ INT32 System_OnStrgInsert(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
     //SysMain_system("df"); //only for debug, the "/mnt/sd" path must be existed.
     #endif
 
+	/* wait mmcblk */
+    if(strg_id == STRG_ID_SD){
+
+        UINT32 count = 0 , delay = 50, timeout = 60;
+
+        while(count++ < timeout)
+        {
+            if (System_check_mmcblk0p1()){
+                break;
+            }
+            else{
+                vos_util_delay_ms(delay);
+            }
+        }
+
+        if(System_check_mmcblk0p1()){
+            /* hotplug */
+            if(count != 1)
+                vos_util_delay_ms(50);
+        }
+        else{
+            DBG_ERR("mmcblk0p1 not found!\n");
+        }
+    }
+
 	if(strg_id == STRG_ID_SD){
 		DX_HANDLE pStrgDev = (DX_HANDLE)sdio_getStorageObject(STRG_OBJ_FAT1);
 		if (GxStrg_OpenDevice(strg_id, pStrgDev) != TRUE) {

code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c

@@ -3854,7 +3854,7 @@ INT32 PhotoExe_OnCallback(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
 		DBG_IND("[cb]NVTEVT_ALGMSG_JPGOK\r\n");
 
 		// add picture count 1
-		UI_SetData(FL_TakePictCnt, UI_GetData(FL_TakePictCnt) + 1);
+		//UI_SetData(FL_TakePictCnt, UI_GetData(FL_TakePictCnt) + 1);
 		localInfo->IsJPGok = TRUE;
 #if (FS_FUNC == ENABLE)
 		localInfo->isFolderFull = UIStorageCheck(STORAGE_CHECK_FOLDER_FULL, NULL);

code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c

@@ -502,28 +502,25 @@ void Load_MenuInfo(void)
 	if(Check_OTA() == TRUE){
 		DBG_DUMP("OTA success, reset system param\n");
 
-        #if HUNTING_CAMERA_MCU == ENABLE
+        // #if HUNTING_CAMERA_MCU == ENABLE
-        if(sf_get_ui_para_flag())
+        // if(sf_get_ui_para_flag())
-        {
+        // {
-            if(!sf_is_usb_flag())
+        //     if(!sf_is_usb_flag())
-            {
+        //     {
-                sf_mcu_reg_set(SF_MCU_SOFT_UPDATE, 0);
+        //         sf_mcu_reg_set(SF_MCU_SOFT_UPDATE, 0);
-            }
+        //     }
-            memcpy(&origInfo, &currentInfo, sizeof(currentInfo));
+        //     memcpy(&origInfo, &currentInfo, sizeof(currentInfo));
-            memcpy(&origInfo_check, &currentInfo, sizeof(currentInfo));
+        //     memcpy(&origInfo_check, &currentInfo, sizeof(currentInfo));
-           return;
+        //    return;
-        }
+        // }
-        #endif
+        // #endif
 
 		SysResetFlag();
 		
 		#if HUNTING_CAMERA_MCU == ENABLE
         sf_power_on_para_check_init();
-        if(sf_is_usb_flag())
+        Save_MenuInfo();
-        {
+        if(!sf_is_usb_flag())
-            Save_MenuInfo();
-        }
-        else
         {
             sf_mcu_reg_set(SF_MCU_SOFT_UPDATE, 0);
         }
@@ -1132,9 +1129,9 @@ EXIT:
 				sum);
 				
 		#if HUNTING_CAMERA_MCU == ENABLE
-        //origInfo = currentInfo;
+        memcpy(&origInfo, &currentInfo, sizeof(currentInfo));
-        //origInfo_check = currentInfo;
+        memcpy(&origInfo_check, &currentInfo, sizeof(currentInfo));
-        //sf_share_mem_customer_down(0);
+        sf_share_mem_customer_down(0);
 		#endif
     }
     else{

code/application/source/sf_app/code/source/app/sf_common.c

@@ -712,9 +712,9 @@ static SINT32 sf_app_process_cmd_SD(SF_MESSAGE_BUF_S *pMessageBuf)
 	{
 		sfStrgDevSdHandler(pMessageBuf->arg1, pMessageBuf->arg2, pMessageBuf->arg3);
 	}
-	//else if(pMessageBuf->arg2 == MMC_DEV_EMMC)
+	else if(pMessageBuf->arg2 == MMC_DEV_EMMC)
 	{
-		//sfStrgDevEmmcHandler(pMessageBuf->arg1, pMessageBuf->arg2, pMessageBuf->arg3);
+		sfStrgDevEmmcHandler(pMessageBuf->arg1, pMessageBuf->arg2, pMessageBuf->arg3);
 	}
 	
 	switch(pMessageBuf->arg1)

code/application/source/sf_app/code/source/app/sf_device.c

@@ -649,9 +649,11 @@ BOOL sf_load_bt_ko(void)
 {
     BOOL ret2 = TRUE;
     int ret = 0;
+    char cmd[70] = {'\0'};
     MLOGI("start.\n");
-
+    snprintf(cmd, sizeof(cmd), "insmod %s/kernel/drivers/bluetooth/rtk_btusb.ko", driver_path_prefix);
-    ret = system("modprobe rtk_btusb");
+    ret = system(cmd);
+    //ret = system("modprobe rtk_btusb");
     if(0 != ret)
     {
         ret2 = FALSE;

configs/Linux/cfg_565_HUNTING_EVB_LINUX_4G_S550/make_post.sh

@@ -103,6 +103,7 @@ MV_KO_LIST=(\
 /lib/modules/$KERVER/kernel/drivers/usb/class/cdc-wdm.ko \
 /lib/modules/$KERVER/kernel/drivers/net/usb/qmi_wwan.ko \
 /lib/modules/$KERVER/extra/fs/exfat/exfat.ko \
+/lib/modules/$KERVER/kernel/drivers/bluetooth/rtk_btusb.ko \
 )
 
 

rtos/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c

@@ -3395,7 +3395,7 @@ INT32 PhotoExe_OnCallback(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
 		DBG_IND("[cb]NVTEVT_ALGMSG_JPGOK\r\n");
 
 		// add picture count 1
-		UI_SetData(FL_TakePictCnt, UI_GetData(FL_TakePictCnt) + 1);
+		//UI_SetData(FL_TakePictCnt, UI_GetData(FL_TakePictCnt) + 1);
 		localInfo->IsJPGok = TRUE;
 #if (FS_FUNC == ENABLE)
 		localInfo->isFolderFull = UIStorageCheck(STORAGE_CHECK_FOLDER_FULL, NULL);