From bfc8d0cc2055b7fa5171aeace011435e23f71359 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Tue, 9 Jun 2020 15:56:31 +0300 Subject: fixing some bugs in version 30 --- Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c | 14 ++++++++++---- .../Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c | 1 - 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Common/SWUpdate') diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c index 1b53a826b..65328efb3 100644 --- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c +++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c @@ -60,6 +60,7 @@ uint32_t ReadBytes = 0; Task_Handle CommRxTaskHandle; extern Semaphore_Handle FFS_Sem; +extern Semaphore_Handle FileUpload_sem_param; ErrorCode getErrorCode(FRESULT Fresult) { @@ -101,7 +102,7 @@ uint32_t FileUploadRequestFunc(MessageContainer* requestContainer) Fresult = FR_DENIED; else { - if (Semaphore_pend(FFS_Sem, BIOS_NO_WAIT)) + if (Semaphore_pend(FileUpload_sem_param, BIOS_NO_WAIT)) { CommRxTaskHandle = Task_self(); Task_setPri(CommRxTaskHandle, 2); @@ -125,7 +126,7 @@ uint32_t FileUploadRequestFunc(MessageContainer* requestContainer) { my_free (UploadFileHandle); UploadFileHandle = 0; - Semaphore_post(FFS_Sem); + Semaphore_post(FileUpload_sem_param); } } else @@ -162,9 +163,14 @@ uint32_t FileChunkUploadCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag) UploadFileHandle = 0; FileReceivedLength = 0; FileDone = true; + Task_setPri(CommRxTaskHandle, 9); + Semaphore_post(FileUpload_sem_param); + //Report("Task_setPri", __FILE__, __LINE__, 9, RpWarning, (int)CommRxTaskHandle, 0); if (SafeRemoveControlCallback(Chunk_ControlId, FileChunkUploadCallBackFunction )==OK) Chunk_ControlId = 0xFF; + return OK; + } uint32_t FileChunkUploadRequestFunc(MessageContainer* requestContainer) @@ -257,7 +263,7 @@ uint32_t FileChunkUploadRequestFunc(MessageContainer* requestContainer) if (FileDone == true) { Task_setPri(CommRxTaskHandle, 9); - Semaphore_post(FFS_Sem); + Semaphore_post(FileUpload_sem_param); //Report("Task_setPri", __FILE__, __LINE__, 9, RpWarning, (int)CommRxTaskHandle, 0); } return OK; @@ -273,7 +279,7 @@ void FileChunkUploadError(void) FileReceivedLength = 0; FileDone = true; Task_setPri(CommRxTaskHandle, 9); - Semaphore_post(FFS_Sem); + Semaphore_post(FileUpload_sem_param); } } uint32_t FileDownloadRequestFunc(MessageContainer* requestContainer) diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c index f39f6a5eb..013a06e22 100644 --- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c +++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FirmwareUpgrade.c @@ -32,7 +32,6 @@ #include "Modules/AlarmHandling/AlarmHandling.h" #include "modules/General/process.h" -extern Semaphore_Handle FFS_Sem; int NumberOfFiles = 0,CurrentRunningFile; int CurrentFileSize = 0; -- cgit v1.3.1