Fee. Removed Det-error reporting if calling Fee_Write or Fee_Read when module is...

diff --git a/memory/Fee/Fee.c b/memory/Fee/Fee.c
index 3c0ee170d5ae487197d3775b3f016a333d8710a6..006c03fc392a1f7a97451228cda77f3cf4aacc49 100644 (file)
--- a/memory/Fee/Fee.c
+++ b/memory/Fee/Fee.c
@@ -1497,11 +1497,10 @@ Std_ReturnType Fee_Read(uint16 blockNumber, uint16 blockOffset, uint8* dataBuffe
        uint16 dataset;\r
 \r
        DET_VALIDATE_RV(ModuleStatus != MEMIF_UNINIT, FEE_READ_ID, FEE_E_UNINIT, E_NOT_OK);\r
-       if(AdminFls.ForceGarbageCollect || (FEE_CORRUPTED == CurrentJob.State)){\r
+       if(AdminFls.ForceGarbageCollect || AdminFls.StartupForceGarbageCollect || (FEE_CORRUPTED == CurrentJob.State)){\r
                return E_NOT_OK;\r
        }\r
        if( !(ModuleStatus == MEMIF_IDLE) ) {\r
-               DET_REPORTERROR(MODULE_ID_FEE, FEE_READ_ID, FEE_E_BUSY, E_NOT_OK);\r
                return E_NOT_OK;\r
        }\r
 \r
@@ -1545,7 +1544,6 @@ Std_ReturnType Fee_Write(uint16 blockNumber, uint8* dataBufferPtr)
                return E_NOT_OK;\r
        }\r
        if( !(ModuleStatus == MEMIF_IDLE) ) {\r
-               DET_REPORTERROR(MODULE_ID_FEE, FEE_READ_ID, FEE_E_BUSY, E_NOT_OK);\r
                return E_NOT_OK;\r
        }\r
 \r
@@ -1588,7 +1586,7 @@ void Fee_Cancel(void)
  */\r
 MemIf_StatusType Fee_GetStatus(void)\r
 {\r
-       if(AdminFls.ForceGarbageCollect && (FEE_IDLE == CurrentJob.State)){\r
+       if((AdminFls.ForceGarbageCollect || AdminFls.StartupForceGarbageCollect) && (FEE_IDLE == CurrentJob.State)){\r
                return MEMIF_BUSY_INTERNAL;\r
        } else {\r
                return ModuleStatus;\r