From 69411a2ec05512b454f474d5fbd4175658f8787e Mon Sep 17 00:00:00 2001
From: payton <payton@willfine.com>
Date: Fri, 19 Jan 2024 18:36:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=97=A0emmc=E6=9C=89sd?=
 =?UTF-8?q?=E5=8D=A1=E6=97=B6WiFi=E5=8D=A1=E6=AD=BB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cardv/SrcCode/System/SF_SysStrgMng.c      |  3 +-
 .../cardv/SrcCode/System/SF_SysStrgMng.h      | 37 ++++++++++---------
 .../sf_app/code/source/storeMng/sf_storeMng.c | 17 ++++++++-
 .../sf_app/code/source/wifi/sf_wifi_svr.c     |  2 +-
 4 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c b/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c
index 3e5b66c3e..f790f63cc 100755
--- a/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c
+++ b/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c
@@ -85,7 +85,7 @@ void SF_StrgInit(void) {
         sf_mmc_dev[i]->space_state = MMC_DEV_SPACE_STATE_ENOUGH;
         sf_mmc_dev[i]->loop_state = MMC_DEV_LOOP_STATE_OFF;
     }
-
+    sf_strg_dev_init();
 	pMMCDev = (SF_ST_MMC_DEV *)malloc(sizeof(SF_ST_MMC_DEV));
 }
 
@@ -365,6 +365,7 @@ static int sfStrgOnActionSendCurrentDev(SF_ST_MMC_DEV *pMMCDev)
 	stMessageBuf.arg2 = pMMCDev->dev_type;
 	stMessageBuf.arg3 = pMMCDev->moumted_state;
 	stMessageBuf.cmdId = CMD_SD;
+    sf_strg_dev_register(pMMCDev->dev_type, pMMCDev->moumted_state);
 	sf_com_message_send_to_app(&stMessageBuf);
 	MLOGD("sf sys strg update current dev!\n");
 	return 0;
diff --git a/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.h b/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.h
index f254c6b40..06671823a 100755
--- a/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.h
+++ b/code/application/source/cardv/SrcCode/System/SF_SysStrgMng.h
@@ -21,6 +21,7 @@
 #define _SF_SYS_STRG_MNG_H_
 #include "sf_type.h"
 #include "sf_param_common.h"
+#include "sf_storeMng.h"
 
 #define MMC_DEV_MAX_NUM (2)
 
@@ -35,26 +36,26 @@
 #define USE_MMC_DEV_CHECK	(1)
 
 
-typedef enum
-{
-	MMC_DEV_SD = 0,
-	MMC_DEV_EMMC = 1,
-	MMC_DEV_NO = 2,
-}MMC_DEV_TYPE;
+// typedef enum
+// {
+// 	MMC_DEV_SD = 0,
+// 	MMC_DEV_EMMC = 1,
+// 	MMC_DEV_NO = 2,
+// }MMC_DEV_TYPE;
 
-typedef enum
-{
-	MMC_DEV_NODE_STATE_NO = 0,
-	MMC_DEV_NODE_STATE_EXIST = 1,
-	MMC_DEV_NODE_STATE_NO_EXIST = 2,
-}MMC_DEV_NODE_STATE;
+// typedef enum
+// {
+// 	MMC_DEV_NODE_STATE_NO = 0,
+// 	MMC_DEV_NODE_STATE_EXIST = 1,
+// 	MMC_DEV_NODE_STATE_NO_EXIST = 2,
+// }MMC_DEV_NODE_STATE;
 
-typedef enum
-{
-	MMC_DEV_MOUNT_STATE_NO = 0,
-	MMC_DEV_MOUNT_STATE_MOUNTED = 1,
-	MMC_DEV_MOUNT_STATE_UNMOUNTED = 2,
-}MMC_DEV_MOUNT_STATE;
+// typedef enum
+// {
+// 	MMC_DEV_MOUNT_STATE_NO = 0,
+// 	MMC_DEV_MOUNT_STATE_MOUNTED = 1,
+// 	MMC_DEV_MOUNT_STATE_UNMOUNTED = 2,
+// }MMC_DEV_MOUNT_STATE;
 
 typedef enum
 {
diff --git a/code/application/source/sf_app/code/source/storeMng/sf_storeMng.c b/code/application/source/sf_app/code/source/storeMng/sf_storeMng.c
index 8def81ef8..981e48e05 100644
--- a/code/application/source/sf_app/code/source/storeMng/sf_storeMng.c
+++ b/code/application/source/sf_app/code/source/storeMng/sf_storeMng.c
@@ -54,8 +54,21 @@ void sf_strg_dev_uninit(void)
 
 void sf_strg_dev_register(SINT32 dev_id, SINT32 mounted)
 {
-	sf_strg_dev->dev_type = dev_id;
-	sf_strg_dev->moumted_state = mounted;
+    MLOGD("dev_id:%d mounted:%d\n",dev_id, mounted);
+    if(sf_strg_dev != NULL)
+    {
+        sf_strg_dev->dev_type = dev_id;
+        sf_strg_dev->moumted_state = mounted;
+    }
+    else {
+        MLOGE("dev_id:%d mounted:%d\n",dev_id, mounted);
+        sf_strg_dev = (SF_STRG_DEV *)malloc(sizeof(SF_STRG_DEV));
+        if(sf_strg_dev != NULL)
+        {
+            sf_strg_dev->dev_type = dev_id;
+            sf_strg_dev->moumted_state = mounted;
+        }
+    }
 }
 
 MMC_DEV_TYPE sf_get_strg_dev(void)
diff --git a/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c b/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c
index 30564096b..3a15f9661 100755
--- a/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c
+++ b/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c
@@ -2106,7 +2106,7 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8  *pAppData, UINT16 dataLen)
                     case WIFI_CONTROL_CAMERA_SHOOT:
                         MLOGI("[WIFI_SET_CAMERA_SHOOT] shoot:%d\n",pMsgStruct->msgBuf.ctrlShoot.shoot);
                         
-						if((FALSE == sf_get_send_statu()) && (System_GetState(SYS_STATE_CARD)  == CARD_INSERTED) && (TRUE == sf_is_preview()) && (pMsgStruct->msgBuf.ctrlShoot.shoot <= 3))
+						if((FALSE == sf_get_send_statu()) && (TRUE == sf_is_preview()) && (pMsgStruct->msgBuf.ctrlShoot.shoot <= 3))
                         {
 							if((puiPara->CamMode != 1) && (pMsgStruct->msgBuf.ctrlShoot.shoot < 3))
 							{