Updates to memory stack

diff --git a/include/Fee.h b/include/Fee.h
index c998b0b1997a15f222849edff36df43506c41b61..cb7e5b2ec6d5eb36bac1cc2d0540226922c8b135 100644 (file)
--- a/include/Fee.h
+++ b/include/Fee.h
@@ -23,10 +23,6 @@
 #ifndef FEE_H_\r
 #define FEE_H_\r
 \r
-#include "Std_Types.h"\r
-#include "Fee_Cfg.h"\r
-#include "Fls.h"\r
-\r
 \r
 #define FEE_MODULE_ID                  MODULE_ID_FEE\r
 #define FEE_VENDOR_ID                  1\r
@@ -38,6 +34,10 @@
 #define FEE_AR_MINOR_VERSION   0\r
 #define FEE_AR_PATCH_VERSION   1\r
 \r
+#include "Std_Types.h"\r
+#include "Fee_Cfg.h"\r
+#include "Fls.h"\r
+\r
 #if (FEE_DEV_ERROR_DETECT == STD_ON)\r
 // Error codes reported by this module defined by AUTOSAR\r
 #define FEE_E_UNINIT                                           0x01\r

diff --git a/include/MemIf.h b/include/MemIf.h
index 96c0bf3c7660a5af6cd1bb7c03406fa46cb642c5..fe3e5c621bd9e575d8ea8aaf2a6f0874d9f6d71e 100644 (file)
--- a/include/MemIf.h
+++ b/include/MemIf.h
@@ -22,9 +22,6 @@
 \r
 #ifndef MEMIF_H_\r
 #define MEMIF_H_\r
-#include "Std_Types.h"\r
-#include "MemIf_Cfg.h"\r
-\r
 #define MEMIF_MODULE_ID                        MODULE_ID_MEMIF\r
 #define MEMIF_VENDOR_ID                        1\r
 \r
@@ -35,6 +32,9 @@
 #define MEMIF_AR_MINOR_VERSION 0\r
 #define MEMIF_AR_PATCH_VERSION 1\r
 \r
+#include "Std_Types.h"\r
+#include "MemIf_Cfg.h"\r
+\r
 #if (MEMIF_VERSION_INFO_API == STD_ON)\r
 #define MemIf_GetVersionInfo(_vi) STD_GET_VERSION_INFO(_vi, MEMIF)\r
 #endif /* MEMIF_VERSION_INFO_API */\r

diff --git a/memory/Fee/Fee.c b/memory/Fee/Fee.c
index 1cda04ffe980e760bdb9445c78e7f03212eef294..7c2612e22e5b40aa917b3e3164b85bf4d1021529 100644 (file)
--- a/memory/Fee/Fee.c
+++ b/memory/Fee/Fee.c
@@ -306,7 +306,7 @@ static void SetFlsJobBusy()
 \r
 static boolean CheckFlsJobFinnished(void)\r
 {\r
-       return !(FlsJobReady);\r
+       return (FlsJobReady);\r
 }\r
 \r
 #endif\r

diff --git a/memory/NvM/NvM.c b/memory/NvM/NvM.c
index 30a56b0f1ab6f333eb3d66e62543a9725534684d..599b729a5a501c385a7eb2142a9bedcf798954f7 100644 (file)
--- a/memory/NvM/NvM.c
+++ b/memory/NvM/NvM.c
@@ -146,36 +146,34 @@ typedef struct {
 static AdminMultiReqType AdminMultiReq;\r
 \r
 \r
-#if (NVM_POLLING_MODE == STD_ON)\r
 static void SetFlsJobBusy()\r
 {\r
-       /* Nothing needed here */\r
+       MemIfJobAdmin.JobFinnished = FALSE;\r
 }\r
 \r
+\r
+#if (NVM_POLLING_MODE == STD_ON)\r
 static boolean CheckFlsJobFinnished(void)\r
 {\r
        MemIf_JobResultType jobResult;\r
 \r
-       jobResult = MemIf_GetJobResult();\r
-\r
-       if (jobResult == MEMIF_JOB_OK) {\r
-               MemIfJobAdmin.JobFinnished = TRUE;\r
-               MemIfJobAdmin.JobStatus = E_OK;\r
-               MemIfJobAdmin.JobResult = jobResult;\r
-       } else if (jobResult != MEMIF_JOB_PENDING) {\r
-               MemIfJobAdmin.JobFinnished = TRUE;\r
-               MemIfJobAdmin.JobStatus = E_NOT_OK;\r
-               MemIfJobAdmin.JobResult = jobResult;\r
+       if (!MemIfJobAdmin.JobFinnished) {\r
+               jobResult = MemIf_GetJobResult();\r
+\r
+               if (jobResult == MEMIF_JOB_OK) {\r
+                       MemIfJobAdmin.JobFinnished = TRUE;\r
+                       MemIfJobAdmin.JobStatus = E_OK;\r
+                       MemIfJobAdmin.JobResult = jobResult;\r
+               } else if (jobResult != MEMIF_JOB_PENDING) {\r
+                       MemIfJobAdmin.JobFinnished = TRUE;\r
+                       MemIfJobAdmin.JobStatus = E_NOT_OK;\r
+                       MemIfJobAdmin.JobResult = jobResult;\r
+               }\r
        }\r
 \r
        return MemIfJobAdmin.JobFinnished;\r
 }\r
 #else\r
-static void SetFlsJobBusy()\r
-{\r
-       MemIfJobAdmin.JobFinnished = FALSE;\r
-}\r
-\r
 static boolean CheckFlsJobFinnished(void)\r
 {\r
        return MemIfJobAdmin.JobFinnished;\r