Dem, fixed faulty handling of writing aging buffer to Nvm. Fixed copying of freeze...

diff --git a/diagnostic/Dem/Dem.c b/diagnostic/Dem/Dem.c
index 6bdb1a9e5f942b3beb49c7c1009468b45438a416..72507bf762744fd5664c48ecc9bdf0996837c2b7 100644 (file)
--- a/diagnostic/Dem/Dem.c
+++ b/diagnostic/Dem/Dem.c
@@ -193,12 +193,12 @@ static ExtDataRecType             preInitExtDataBuffer[DEM_MAX_NUMBER_EXT_DATA_PRE_INIT];
  * Allocation of primary event memory ramlog (after init) in uninitialized memory\r
  */\r
 /** @req DEM162 */\r
-EventRecType                   priMemEventBuffer[DEM_MAX_NUMBER_EVENT_PRI_MEM] __attribute__ ((section (".dem_eventmemory_pri")));\r
-static FreezeFrameRecType      priMemFreezeFrameBuffer[DEM_MAX_NUMBER_FF_DATA_PRI_MEM] __attribute__ ((section (".dem_eventmemory_pri")));\r
-//FreezeFrameRecType        FreezeFrameMirrorBuffer[DEM_MAX_NUMBER_FF_DATA_PRI_MEM] __attribute__ ((section (".dem_eventmemory_pri")));\r
+EventRecType                   priMemEventBuffer[DEM_MAX_NUMBER_EVENT_PRI_MEM];\r
+static FreezeFrameRecType      priMemFreezeFrameBuffer[DEM_MAX_NUMBER_FF_DATA_PRI_MEM];\r
+//FreezeFrameRecType        FreezeFrameMirrorBuffer[DEM_MAX_NUMBER_FF_DATA_PRI_MEM];\r
 extern FreezeFrameRecType*  FreezeFrameMirrorBuffer[];\r
-static ExtDataRecType          priMemExtDataBuffer[DEM_MAX_NUMBER_EXT_DATA_PRI_MEM] __attribute__ ((section (".dem_eventmemory_pri")));\r
-HealingRecType                         priMemAgingBuffer[DEM_MAX_NUMBER_AGING_PRI_MEM] __attribute__ ((section (".dem_eventmemory_pri")));\r
+static ExtDataRecType          priMemExtDataBuffer[DEM_MAX_NUMBER_EXT_DATA_PRI_MEM];\r
+HealingRecType                         priMemAgingBuffer[DEM_MAX_NUMBER_AGING_PRI_MEM];\r
 extern HealingRecType                  HealingMirrorBuffer[DEM_MAX_NUMBER_AGING_PRI_MEM];\r
 \r
 /* block in NVRam, use for freezeframe */\r
@@ -1526,8 +1526,8 @@ static void storeAgingRecPerMem(const NvM_BlockIdType AgingBlockId)
 \r
        Irq_Save(state);\r
 \r
-       if( E_NOT_OK == writeNvmMirror(AgingBlockId, (uint8 *)HealingMirrorBuffer, (const uint8 *)priMemAgingBuffer, sizeof(priMemAgingBuffer)) ){\r
-               AgingIsModified = TRUE;\r
+       if( E_NOT_OK != writeNvmMirror(AgingBlockId, (uint8 *)HealingMirrorBuffer, (const uint8 *)priMemAgingBuffer, sizeof(priMemAgingBuffer)) ){\r
+               AgingIsModified = FALSE;\r
        }\r
 \r
        Irq_Restore(state);\r
@@ -2315,7 +2315,7 @@ void Dem_PreInit(void)
 void Dem_Init(void)\r
 {\r
        uint16 i;\r
-       ChecksumType cSum;\r
+//     ChecksumType cSum;\r
        boolean entryValid = FALSE;\r
        const Dem_EventParameterType *eventParam;\r
 \r
@@ -2331,7 +2331,7 @@ void Dem_Init(void)
        } else {\r
 \r
                for(i = 0; i < DEM_MAX_NUMBER_FF_DATA_PRI_MEM; i++){\r
-                       if( E_NOT_OK == copyNvmMirror(FreezeFrameBlockId[i], (uint8 *)&priMemFreezeFrameBuffer[i], (const uint8 *)&FreezeFrameMirrorBuffer[i], sizeof(FreezeFrameRecType)) ){\r
+                       if( E_NOT_OK == copyNvmMirror(FreezeFrameBlockId[i], (uint8 *)&priMemFreezeFrameBuffer[i], (const uint8 *)FreezeFrameMirrorBuffer[i], sizeof(FreezeFrameRecType)) ){\r
                                //TODO:NVM is busy or block id is 0,report error or what?\r
                        }\r
                }\r
@@ -2343,8 +2343,8 @@ void Dem_Init(void)
                // Validate aging records stored in primary memory\r
                for (i = 0; i < DEM_MAX_NUMBER_AGING_PRI_MEM; i++){\r
                        entryValid = checkEntryValid(priMemAgingBuffer[i].eventId);\r
-                       cSum = calcChecksum(&priMemAgingBuffer[i], sizeof(HealingRecType) - sizeof(ChecksumType));\r
-                       if ((cSum != priMemAgingBuffer[i].checksum) || (priMemAgingBuffer[i].eventId == DEM_EVENT_ID_NULL) || (FALSE == entryValid)) {\r
+//                     cSum = calcChecksum(&priMemAgingBuffer[i], sizeof(HealingRecType) - sizeof(ChecksumType));\r
+                       if ((priMemAgingBuffer[i].eventId == DEM_EVENT_ID_NULL) || (FALSE == entryValid)) {\r
                                // Unlegal record, clear the record\r
                                memset(&priMemAgingBuffer[i], 0, sizeof(HealingRecType));\r
                                AgingIsModified = TRUE;\r
@@ -2354,8 +2354,8 @@ void Dem_Init(void)
                // Validate event records stored in primary memory\r
                for (i = 0; i < DEM_MAX_NUMBER_EVENT_PRI_MEM; i++) {\r
                        entryValid = checkEntryValid(priMemEventBuffer[i].eventId);\r
-                       cSum = calcChecksum(&priMemEventBuffer[i], sizeof(EventRecType)-sizeof(ChecksumType));\r
-                       if ((cSum != priMemEventBuffer[i].checksum) || (priMemEventBuffer[i].eventId == DEM_EVENT_ID_NULL) || (FALSE == entryValid)) {\r
+//                     cSum = calcChecksum(&priMemEventBuffer[i], sizeof(EventRecType)-sizeof(ChecksumType));\r
+                       if ((priMemEventBuffer[i].eventId == DEM_EVENT_ID_NULL) || (FALSE == entryValid)) {\r
                                // Unlegal record, clear the record\r
                                memset(&priMemEventBuffer[i], 0, sizeof(EventRecType));\r
                        }\r
@@ -2372,8 +2372,8 @@ void Dem_Init(void)
                // Validate extended data records stored in primary memory\r
                for (i = 0; i < DEM_MAX_NUMBER_EXT_DATA_PRI_MEM; i++) {\r
                        entryValid = checkEntryValid(priMemExtDataBuffer[i].eventId);\r
-                       cSum = calcChecksum(&priMemExtDataBuffer[i], sizeof(ExtDataRecType)-sizeof(ChecksumType));\r
-                       if ((cSum != priMemExtDataBuffer[i].checksum) || (priMemExtDataBuffer[i].eventId == DEM_EVENT_ID_NULL) || (FALSE == entryValid)) {\r
+//                     cSum = calcChecksum(&priMemExtDataBuffer[i], sizeof(ExtDataRecType)-sizeof(ChecksumType));\r
+                       if ((priMemExtDataBuffer[i].eventId == DEM_EVENT_ID_NULL) || (FALSE == entryValid)) {\r
                                // Unlegal record, clear the record\r
                                memset(&priMemExtDataBuffer[i], 0, sizeof(ExtDataRecType));\r
                        }\r
@@ -2389,8 +2389,8 @@ void Dem_Init(void)
                // Validate freeze frame records stored in primary memory\r
                for (i = 0; i < DEM_MAX_NUMBER_FF_DATA_PRI_MEM; i++) {\r
                        entryValid = checkEntryValid(priMemFreezeFrameBuffer[i].eventId);\r
-                       cSum = calcChecksum(&priMemFreezeFrameBuffer[i], sizeof(FreezeFrameRecType)-sizeof(ChecksumType));\r
-                       if ((cSum != priMemFreezeFrameBuffer[i].checksum) || (priMemFreezeFrameBuffer[i].eventId == DEM_EVENT_ID_NULL) || (FALSE == entryValid)) {\r
+//                     cSum = calcChecksum(&priMemFreezeFrameBuffer[i], sizeof(FreezeFrameRecType)-sizeof(ChecksumType));\r
+                       if ((priMemFreezeFrameBuffer[i].eventId == DEM_EVENT_ID_NULL) || (FALSE == entryValid)) {\r
                                // Unlegal record, clear the record\r
                                memset(&priMemFreezeFrameBuffer[i], 0, sizeof(FreezeFrameRecType));\r
                        }\r