Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 12 insertions, 15 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
index f3d42b01a..17c1f164b 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
@@ -566,20 +566,12 @@ uint32_t    DeleteRequestFunc(MessageContainer* requestContainer)
     //int NumOfFiles = 0;
     FRESULT Fresult = FR_OK;
 
-    if (1)//(Semaphore_pend(FFS_Sem, BIOS_NO_WAIT))
-    {
-        Fresult = f_unlink(request->path);
-        Semaphore_post(FFS_Sem);
-    }
-    else
-    {
-        Fresult = FR_DENIED;
-        Report("Semaphore_pend failed", __FILE__, __LINE__, 4, RpWarning,   (int)0, 0);
-    }
+    Fresult = f_unlink(request->path);
+    Semaphore_post(FFS_Sem);
 
     REPORT_MSG(Fresult, "File Delete");
     responseContainer = createContainer(MESSAGE_TYPE__DeleteResponse,  requestContainer->token, false, &response, &delete_response__pack, &delete_response__get_packed_size);
-    if (Fresult!= OK)
+    if ((Fresult!= FR_OK)&&(Fresult!= FR_NO_FILE))
     {
         //usnprintf(ErrorMsg, 100, "File Operation failed error code %d",Fresult);
         responseContainer.has_error = true;
@@ -794,8 +786,11 @@ FRESULT FileWrite(void * buffer, uint16_t size,char *path, uint32_t timeout)
                     {
                         LOG_ERROR (Fresult,"fwrite error");
                     }
-                    //LOG_ERROR (Bytes,"f_write ok no of bytes");
-                     Report("f_write ok no of bytes", __FILE__, __LINE__, Bytes, RpWarning,   (int)size, 0);
+                    else
+                    {
+                        //LOG_ERROR (Bytes,"f_write ok no of bytes");
+                         Report("f_write ok no of bytes", __FILE__, __LINE__, Bytes, RpWarning,   (int)size, 0);
+                    }
                     f_close(FileHandle);
                 }
                 else
@@ -875,12 +870,14 @@ FRESULT FileRead(char *path, uint32_t *Size, void **Buffer)
         }
         else
         {
-            LOG_ERROR (Fresult,"malloc error");
+            Report("malloc error", __FILE__, __LINE__, Fresult, RpWarning,   (int)fno->fsize, 0);
+            Fresult = FR_DENIED;
         }
     }
     else
     {
-        LOG_ERROR (Fresult,"f_stat error");
+        Report("f_stat error", __FILE__, __LINE__, Fresult, RpWarning,   (int)0, 0);
+        Fresult = FR_DENIED;
     }
     my_free(fno);
     return Fresult;