From 5d2ca48ce3bfb130e84158ddb82f8e4aed3ab303 Mon Sep 17 00:00:00 2001 From: payton Date: Wed, 27 Dec 2023 11:56:51 +0800 Subject: [PATCH] =?UTF-8?q?1.1.Linux=E5=A2=9E=E5=8A=A0=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=92=8C=E6=89=8B=E5=8A=A8=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/cardv/SrcCode/UIApp/Photo/UIAppPhoto.h | 2 ++ .../source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c | 9 +++++++-- code/lib/source/sifar/code/source/common/sf_common.c | 9 ++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto.h b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto.h index 4f7017cf6..9d381a6b0 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto.h +++ b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto.h @@ -346,6 +346,7 @@ typedef enum { typedef enum { WDT_OTA_STS_INVALID = 0, WDT_OTA_STS_LOADER_DETECTING_FW, + WDT_OTA_STS_LOADER_DETECTING_FW_AUTO, WDT_OTA_STS_UBOOT_UPDATE_FAILED, WDT_OTA_STS_UBOOT_UPDATE_OPEN_FAILED, WDT_OTA_STS_UBOOT_UPDATE_READ_FAILED, @@ -353,6 +354,7 @@ typedef enum { WDT_OTA_STS_UBOOT_UPDATE_UNKNOWN, WDT_OTA_STS_UBOOT_UPDATE_OK, WDT_OTA_STS_LINUX_TRIGGER, + WDT_OTA_STS_LINUX_TRIGGER_AUTO, } WDT_OTA_STS; #define WDT_OTA_MAKEFOURCC(sts) MAKEFOURCC('O','T','A', sts) diff --git a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c index 6158ab415..2cca748b6 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c +++ b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c @@ -4100,8 +4100,13 @@ INT32 PhotoExe_OnNR(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) INT32 PhotoExe_OnFocusEnd(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) { extern UIMenuStoreInfo currentInfo; - currentInfo.OtaFlag = WDT_OTA_MAKEFOURCC(WDT_OTA_STS_LINUX_TRIGGER); - + if((PWR_ON_SETUP == sf_cardv_convert_power_on_mode())) + { + currentInfo.OtaFlag = WDT_OTA_MAKEFOURCC(WDT_OTA_STS_LINUX_TRIGGER); + } + else { + currentInfo.OtaFlag = WDT_OTA_MAKEFOURCC(WDT_OTA_STS_LINUX_TRIGGER_AUTO); + } Save_MenuInfo(); return NVTEVT_CONSUME; diff --git a/code/lib/source/sifar/code/source/common/sf_common.c b/code/lib/source/sifar/code/source/common/sf_common.c index 74a8cd2c6..3932885fb 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -2194,9 +2194,16 @@ static UINT32 sf_fwupdate(void) #else BOOL sf_ota_trigger(void) { - UINT32 uiUserData = WDT_OTA_MAKEFOURCC(WDT_OTA_STS_LINUX_TRIGGER); + UINT32 uiUserData = 0; char cmd[128]={0}; + if((PWR_ON_SETUP == sf_cardv_convert_power_on_mode())) + { + uiUserData = WDT_OTA_MAKEFOURCC(WDT_OTA_STS_LINUX_TRIGGER); + } + else { + uiUserData = WDT_OTA_MAKEFOURCC(WDT_OTA_STS_LINUX_TRIGGER_AUTO); + } Ux_PostEvent(NVTEVT_ALGMSG_FOCUSEND, 0); sprintf(cmd, "mem w %x %lx",WDT_REG_ADDR(WDT_DATA_OFS),uiUserData);