From d6fdec636e5678ce5e3c9f4385d2a2010ed0bff2 Mon Sep 17 00:00:00 2001
From: alisa <alisa.wu@willfine.com>
Date: Mon, 11 Sep 2023 00:48:40 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=B8=9A=E5=8A=A1]1.=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8E=E7=BC=96=E8=AF=91=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/source/sifar/code/include/sf_common.h |  1 -
 .../sifar/code/source/common/sf_common.c      | 44 -------------------
 2 files changed, 45 deletions(-)

diff --git a/code/lib/source/sifar/code/include/sf_common.h b/code/lib/source/sifar/code/include/sf_common.h
index 15ade337e..49b347d53 100755
--- a/code/lib/source/sifar/code/include/sf_common.h
+++ b/code/lib/source/sifar/code/include/sf_common.h
@@ -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
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 1c4769261..cad82df47 100755
--- a/code/lib/source/sifar/code/source/common/sf_common.c
+++ b/code/lib/source/sifar/code/source/common/sf_common.c
@@ -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
-}
\ No newline at end of file