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

1.去除编译警告

Browse Source 
2.修复ftp相关命令
3.修复升级失败时重启
This commit is contained in:
payton 2023-09-06 21:09:24 +08:00
parent 5a146dd990
commit 8ce2b8abbe
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/lib/source/sifar/code/include/sf_common.h
View File

@ -122,6 +122,6 @@ UINT32 sf_cardv_cap_start(void);
UINT32 sf_cardv_hd_cap_start(void); UINT32 sf_cardv_hd_cap_start(void);
void sf_cardv_set_wait_shared_condition(int in); void sf_cardv_set_wait_shared_condition(int in);
int sf_cardv_para_signaling_start(void); int sf_cardv_para_signaling_start(void);
UINT32 sf_cardv_wifi_send(); UINT32 sf_cardv_wifi_send(void);
#endif #endif

35
code/lib/source/sifar/code/source/common/sf_common.c
View File

@ -1257,15 +1257,19 @@ BOOL sf_cmd_ftp(unsigned char argc, char **argv)
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
//printf("[%s:%d] value:%d\n", __FUNCTION__, __LINE__,value); //printf("[%s:%d] value:%d\n", __FUNCTION__, __LINE__,value);
if(4 == argc) if(4 == argc)
{ {
memset(puiPara ->FtpIp,'\0', sizeof(puiPara ->FtpIp));
memset(puiPara ->FtpPort, '\0', sizeof(puiPara ->FtpPort));
memset(puiPara ->FtpUsr, '\0', sizeof(puiPara ->FtpUsr));
memset(puiPara ->FtpPwd,'\0', sizeof(puiPara ->FtpPwd));
strncpy((char *)puiPara->FtpIp, argv[0], ((sizeof(puiPara->FtpIp) <= strlen(argv[0])) ? (sizeof(puiPara->FtpIp)) : (strlen(argv[0])))); strncpy((char *)puiPara->FtpIp, argv[0], ((sizeof(puiPara->FtpIp) <= strlen(argv[0])) ? (sizeof(puiPara->FtpIp)) : (strlen(argv[0]))));
strncpy((char *)puiPara->FtpPort, argv[0], ((sizeof(puiPara->FtpPort) <= strlen(argv[0])) ? (sizeof(puiPara->FtpPort)) : (strlen(argv[0])))); strncpy((char *)puiPara->FtpPort, argv[1], ((sizeof(puiPara->FtpPort) <= strlen(argv[1])) ? (sizeof(puiPara->FtpPort)) : (strlen(argv[1]))));
strncpy((char *)puiPara->FtpUsr, argv[0], ((sizeof(puiPara->FtpUsr) <= strlen(argv[0])) ? (sizeof(puiPara->FtpUsr)) : (strlen(argv[0])))); strncpy((char *)puiPara->FtpUsr, argv[2], ((sizeof(puiPara->FtpUsr) <= strlen(argv[2])) ? (sizeof(puiPara->FtpUsr)) : (strlen(argv[2]))));
strncpy((char *)puiPara->FtpPwd, argv[0], ((sizeof(puiPara->FtpPwd) <= strlen(argv[0])) ? (sizeof(puiPara->FtpPwd)) : (strlen(argv[0])))); strncpy((char *)puiPara->FtpPwd, argv[3], ((sizeof(puiPara->FtpPwd) <= strlen(argv[3])) ? (sizeof(puiPara->FtpPwd)) : (strlen(argv[3]))));
Save_MenuInfo(); Save_MenuInfo();
} }
printf("[%s:%d] FtpIp:%s\n", __FUNCTION__, __LINE__,puiPara->FtpIp); printf("[%s:%d] FtpIp:%s FtpPort:%s FtpUsr:%s FtpPwd:%s\n", __FUNCTION__, __LINE__,puiPara->FtpIp,puiPara ->FtpPort,puiPara ->FtpUsr,puiPara ->FtpPwd);
return TRUE; return TRUE;
} }
@ -1275,15 +1279,19 @@ BOOL sf_cmd_ftps(unsigned char argc, char **argv)
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
//printf("[%s:%d] value:%d\n", __FUNCTION__, __LINE__,value); //printf("[%s:%d] value:%d\n", __FUNCTION__, __LINE__,value);
if(4 == argc) if(4 == argc)
{ {
memset(puiPara ->FtpsIp,'\0', sizeof(puiPara ->FtpsIp));
memset(puiPara ->FtpsPort, '\0', sizeof(puiPara ->FtpsPort));
memset(puiPara ->FtpsUsr, '\0', sizeof(puiPara ->FtpsUsr));
memset(puiPara ->FtpsPwd,'\0', sizeof(puiPara ->FtpsPwd));
strncpy((char *)puiPara->FtpsIp, argv[0], ((sizeof(puiPara->FtpsIp) <= strlen(argv[0])) ? (sizeof(puiPara->FtpsIp)) : (strlen(argv[0])))); strncpy((char *)puiPara->FtpsIp, argv[0], ((sizeof(puiPara->FtpsIp) <= strlen(argv[0])) ? (sizeof(puiPara->FtpsIp)) : (strlen(argv[0]))));
strncpy((char *)puiPara->FtpsPort, argv[0], ((sizeof(puiPara->FtpsPort) <= strlen(argv[0])) ? (sizeof(puiPara->FtpsPort)) : (strlen(argv[0])))); strncpy((char *)puiPara->FtpsPort, argv[1], ((sizeof(puiPara->FtpsPort) <= strlen(argv[1])) ? (sizeof(puiPara->FtpsPort)) : (strlen(argv[1]))));
strncpy((char *)puiPara->FtpsUsr, argv[0], ((sizeof(puiPara->FtpsUsr) <= strlen(argv[0])) ? (sizeof(puiPara->FtpsUsr)) : (strlen(argv[0])))); strncpy((char *)puiPara->FtpsUsr, argv[2], ((sizeof(puiPara->FtpsUsr) <= strlen(argv[2])) ? (sizeof(puiPara->FtpsUsr)) : (strlen(argv[2]))));
strncpy((char *)puiPara->FtpsPwd, argv[0], ((sizeof(puiPara->FtpsPwd) <= strlen(argv[0])) ? (sizeof(puiPara->FtpsPwd)) : (strlen(argv[0])))); strncpy((char *)puiPara->FtpsPwd, argv[3], ((sizeof(puiPara->FtpsPwd) <= strlen(argv[3])) ? (sizeof(puiPara->FtpsPwd)) : (strlen(argv[3]))));
Save_MenuInfo(); Save_MenuInfo();
} }
printf("[%s:%d] FtpIp:%s\n", __FUNCTION__, __LINE__,puiPara->FtpIp); printf("[%s:%d] FtpsIp:%s FtpsPort:%s FtpsUsr:%s FtpsPwd:%s\n", __FUNCTION__, __LINE__,puiPara->FtpsIp,puiPara ->FtpsPort,puiPara ->FtpsUsr,puiPara ->FtpsPwd);
return TRUE; return TRUE;
} }
@ -2023,7 +2031,8 @@ void* sf_sys_do_upgrade(void *arg)
} }
sf_mcu_reg_set(SF_MCU_SOFT_UPDATE, 0); sf_mcu_reg_set(SF_MCU_SOFT_UPDATE, 0);
sf_set_send_statu(FALSE); sf_set_send_statu(FALSE);
if(PWR_ON_SETUP == sf_cardv_convert_power_on_mode()){ //if(PWR_ON_SETUP == sf_cardv_convert_power_on_mode())
{
vos_util_delay_ms(1000); vos_util_delay_ms(1000);
Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, 0); Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, 0);
} }
@ -2594,7 +2603,7 @@ UINT32 sf_cardv_hd_cap_start(void)
} }
UINT32 sf_cardv_wifi_send() UINT32 sf_cardv_wifi_send(void)
{ {
SINT32 fd = 0; SINT32 fd = 0;
SINT32 sendBuffLen = 0; SINT32 sendBuffLen = 0;
@ -2604,7 +2613,7 @@ UINT32 sf_cardv_wifi_send()
if(SF_SUCCESS == sf_share_mem_hd_update()) if(SF_SUCCESS == sf_share_mem_hd_update())
{ {
SF_REPORT_WIFI_ATTR_S* wifiCfg = sf_wifi_cfg_get(); //SF_REPORT_WIFI_ATTR_S* wifiCfg = sf_wifi_cfg_get();
fd = sf_get_wifi_socket(); fd = sf_get_wifi_socket();
SF_CHAR filePath[64] = { 0 }; SF_CHAR filePath[64] = { 0 };