payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改无emmc有sd卡时WiFi卡死问题

Browse Source
This commit is contained in:
payton 2024-01-19 18:36:16 +08:00
parent e0212e4146
commit 69411a2ec0
4 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/application/source/cardv/SrcCode/System/SF_SysStrgMng.c
View File

@ -85,7 +85,7 @@ void SF_StrgInit(void) {
sf_mmc_dev[i]->space_state = MMC_DEV_SPACE_STATE_ENOUGH; sf_mmc_dev[i]->space_state = MMC_DEV_SPACE_STATE_ENOUGH;
sf_mmc_dev[i]->loop_state = MMC_DEV_LOOP_STATE_OFF; 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)); 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.arg2 = pMMCDev->dev_type;
stMessageBuf.arg3 = pMMCDev->moumted_state; stMessageBuf.arg3 = pMMCDev->moumted_state;
stMessageBuf.cmdId = CMD_SD; stMessageBuf.cmdId = CMD_SD;
sf_strg_dev_register(pMMCDev->dev_type, pMMCDev->moumted_state);
sf_com_message_send_to_app(&stMessageBuf); sf_com_message_send_to_app(&stMessageBuf);
MLOGD("sf sys strg update current dev!\n"); MLOGD("sf sys strg update current dev!\n");
return 0; return 0;

37
code/application/source/cardv/SrcCode/System/SF_SysStrgMng.h
View File

@ -21,6 +21,7 @@
#define _SF_SYS_STRG_MNG_H_ #define _SF_SYS_STRG_MNG_H_
#include "sf_type.h" #include "sf_type.h"
#include "sf_param_common.h" #include "sf_param_common.h"
#include "sf_storeMng.h"
#define MMC_DEV_MAX_NUM (2) #define MMC_DEV_MAX_NUM (2)
@ -35,26 +36,26 @@
#define USE_MMC_DEV_CHECK (1) #define USE_MMC_DEV_CHECK (1)
typedef enum // typedef enum
{ // {
MMC_DEV_SD = 0, // MMC_DEV_SD = 0,
MMC_DEV_EMMC = 1, // MMC_DEV_EMMC = 1,
MMC_DEV_NO = 2, // MMC_DEV_NO = 2,
}MMC_DEV_TYPE; // }MMC_DEV_TYPE;
typedef enum // typedef enum
{ // {
MMC_DEV_NODE_STATE_NO = 0, // MMC_DEV_NODE_STATE_NO = 0,
MMC_DEV_NODE_STATE_EXIST = 1, // MMC_DEV_NODE_STATE_EXIST = 1,
MMC_DEV_NODE_STATE_NO_EXIST = 2, // MMC_DEV_NODE_STATE_NO_EXIST = 2,
}MMC_DEV_NODE_STATE; // }MMC_DEV_NODE_STATE;
typedef enum // typedef enum
{ // {
MMC_DEV_MOUNT_STATE_NO = 0, // MMC_DEV_MOUNT_STATE_NO = 0,
MMC_DEV_MOUNT_STATE_MOUNTED = 1, // MMC_DEV_MOUNT_STATE_MOUNTED = 1,
MMC_DEV_MOUNT_STATE_UNMOUNTED = 2, // MMC_DEV_MOUNT_STATE_UNMOUNTED = 2,
}MMC_DEV_MOUNT_STATE; // }MMC_DEV_MOUNT_STATE;
typedef enum typedef enum
{ {

17
code/application/source/sf_app/code/source/storeMng/sf_storeMng.c
View File

@ -54,8 +54,21 @@ void sf_strg_dev_uninit(void)
void sf_strg_dev_register(SINT32 dev_id, SINT32 mounted) void sf_strg_dev_register(SINT32 dev_id, SINT32 mounted)
{ {
sf_strg_dev->dev_type = dev_id; MLOGD("dev_id:%d mounted:%d\n",dev_id, mounted);
sf_strg_dev->moumted_state = 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) MMC_DEV_TYPE sf_get_strg_dev(void)

2
code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c
View File

@ -2106,7 +2106,7 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8 *pAppData, UINT16 dataLen)
case WIFI_CONTROL_CAMERA_SHOOT: case WIFI_CONTROL_CAMERA_SHOOT:
MLOGI("[WIFI_SET_CAMERA_SHOOT] shoot:%d\n",pMsgStruct->msgBuf.ctrlShoot.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)) if((puiPara->CamMode != 1) && (pMsgStruct->msgBuf.ctrlShoot.shoot < 3))
{ {