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

[业务]1.合并代码后编译失败问题处理

Browse Source
This commit is contained in:
alisa 2023-09-11 00:48:40 +08:00
parent 0a5c35d505
commit d6fdec636e
2 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,7 +125,6 @@ int sf_cardv_para_signaling_start(void);
BOOL sf_cmd_ftp_ota(unsigned char argc, char **argv);
BOOL sf_cmd_switch_esim(unsigned char argc, char **argv);
UINT32 sf_cardv_wifi_send(void);
#endif

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

@ -2680,48 +2680,4 @@ UINT32 sf_cardv_hd_cap_start(void)
}
HdCapTskCfg.IsRun = 1;
return SF_SUCCESS;
<<<<<<< HEAD
=======
}
UINT32 sf_cardv_wifi_send(void)
{
SINT32 fd = 0;
SINT32 sendBuffLen = 0;
SINT8 sendBuff[1024] = { 0 };
SINT32 i = 0;
struct stat statBuf;
if(SF_SUCCESS == sf_share_mem_hd_update())
{
//SF_REPORT_WIFI_ATTR_S* wifiCfg = sf_wifi_cfg_get();
fd = sf_get_wifi_socket();
SF_CHAR filePath[64] = { 0 };
SINT32 fdWifi = -1;
sprintf(filePath, "/tmp/wifiData.txt");
printf("filePath:%s\n", filePath);
fdWifi = open(filePath, O_RDWR, 0777);
if(fdWifi >= 0)
{
fstat(fdWifi, &statBuf);
sendBuffLen = statBuf.st_size;
printf("fSize=%d\n", sendBuffLen);
read(fdWifi, sendBuff, sendBuffLen);
close(fdWifi);
for(i = 0; i < sendBuffLen; i++)
{
printf("[%x]-", sendBuff[i]);
}
printf("\n[cardv-sendBuff-1] e\n");
send(fd, sendBuff, sendBuffLen, 0);
remove("/tmp/wifiData.txt");
}
}
return 0;
>>>>>>> origin/Branch_S530
}