Reserved for block config ID i NvM.

diff --git a/memory/NvM/NvM.c b/memory/NvM/NvM.c
index 7ac1d64b1d8a2cb35f73120b22ce1192bea1ef0c..060f2f897ab6b0b35ab73b89c26faeffb2d7ed88 100644 (file)
--- a/memory/NvM/NvM.c
+++ b/memory/NvM/NvM.c
@@ -567,16 +567,13 @@ void NvM_CancelWriteAll(void)
 void NvM_GetErrorStatus(NvM_BlockIdType blockId, uint8 *requestResultPtr)\r
 {\r
        VALIDATE_NO_RV(nvmState != NVM_UNINITIALIZED, NVM_GET_ERROR_STATUS_ID, NVM_E_NOT_INITIALIZED);\r
-       VALIDATE_NO_RV(blockId < NVM_NUM_OF_NVRAM_BLOCKS+2, NVM_GET_ERROR_STATUS_ID, NVM_E_PARAM_BLOCK_ID);\r
+       VALIDATE_NO_RV(blockId < NVM_NUM_OF_NVRAM_BLOCKS+1, NVM_GET_ERROR_STATUS_ID, NVM_E_PARAM_BLOCK_ID);\r
 \r
        if (blockId == 0) {\r
                // Multiblock ID\r
                *requestResultPtr = AdminMultiBlock.ErrorStatus;\r
-       } else if (blockId == 1) {\r
-               // Configuration block id\r
-               // TODO: Shall anything be read here?\r
        } else {\r
-               *requestResultPtr = AdminBlock[blockId-2].ErrorStatus;\r
+               *requestResultPtr = AdminBlock[blockId-1].ErrorStatus;\r
        }\r
 \r
 }\r
@@ -588,19 +585,19 @@ void Nvm_SetRamBlockStatus(NvM_BlockIdType blockId, boolean blockChanged)
        const NvM_BlockDescriptorType   *BlockDescriptorList = NvM_Config.BlockDescriptor;\r
 \r
        VALIDATE_NO_RV(nvmState != NVM_UNINITIALIZED, NVM_SET_RAM_BLOCK_STATUS_ID, NVM_E_NOT_INITIALIZED);      /** @req NVM497 */\r
-       VALIDATE_NO_RV(blockId < NVM_NUM_OF_NVRAM_BLOCKS+2, NVM_SET_RAM_BLOCK_STATUS_ID, NVM_E_PARAM_BLOCK_ID);\r
+       VALIDATE_NO_RV(blockId < NVM_NUM_OF_NVRAM_BLOCKS+1, NVM_SET_RAM_BLOCK_STATUS_ID, NVM_E_PARAM_BLOCK_ID);\r
        VALIDATE_NO_RV(blockId > 1, NVM_SET_RAM_BLOCK_STATUS_ID, NVM_E_PARAM_BLOCK_ID);\r
 \r
-       if (BlockDescriptorList[blockId-2].RamBlockDataAddress != NULL) {       /** @req NVM240 */\r
+       if (BlockDescriptorList[blockId-1].RamBlockDataAddress != NULL) {       /** @req NVM240 */\r
                if (blockChanged) {\r
-                       AdminBlock[blockId-2].BlockChanged = TRUE;      /** @req NVM406 */\r
-                       AdminBlock[blockId-2].BlockValid = TRUE;        /** @req NVM241 */\r
-                       if (BlockDescriptorList[blockId-2].BlockUseCrc) {\r
-                               AdminBlock[blockId-2].BlockState = BLOCK_STATE_RECALC_CRC;      /** @req NVM121 */\r
+                       AdminBlock[blockId-1].BlockChanged = TRUE;      /** @req NVM406 */\r
+                       AdminBlock[blockId-1].BlockValid = TRUE;        /** @req NVM241 */\r
+                       if (BlockDescriptorList[blockId-1].BlockUseCrc) {\r
+                               AdminBlock[blockId-1].BlockState = BLOCK_STATE_RECALC_CRC;      /** @req NVM121 */\r
                        }\r
                } else {\r
-                       AdminBlock[blockId-2].BlockChanged = FALSE;     /** @req NVM405 */\r
-                       AdminBlock[blockId-2].BlockValid = FALSE;\r
+                       AdminBlock[blockId-1].BlockChanged = FALSE;     /** @req NVM405 */\r
+                       AdminBlock[blockId-1].BlockValid = FALSE;\r
                } // else blockChanged\r
        } // if permanent block\r
 }\r