From dc4ddd2a3add26568eeac9e6e95c8a1fcab5b4ba Mon Sep 17 00:00:00 2001 From: "sober.song" Date: Mon, 8 Jan 2024 18:53:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9sf=5Fwifi=5Fsvr=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E4=BB=A3=E7=A0=81=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/sf_app/code/source/wifi/sf_wifi_svr.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c b/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c index 394bf41d6..f6aafad7c 100755 --- a/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c +++ b/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c @@ -430,15 +430,9 @@ S8 *appThumbKeyToName(thumbSize_t imgSize, thumbType_t fileType, UINT16 dirKey, free(strg_path); return SF_FAILURE; } -<<<<<<< Updated upstream - MLOGI("s1\n"); - char font =sf_get_strg_dev() == MMC_DEV_EMMC ? 'B' : 'A'; -======= - //char font = sf_get_strg_dev() == MMC_DEV_EMMC ? 'B' : 'E'; UINT32 dcf_handle = (UINT32)System_Get_DCF_Handle(); /* 0:emmc 1:sd */ char font = System_Get_DCF_Disk_Drive(dcf_handle) == 'B' ? 'B' : 'E'; ->>>>>>> Stashed changes if(imgSize == THUMB_320x240) {