NvM, replaced asserts with reporting of Det-error.

diff --git a/memory/NvM/NvM.c b/memory/NvM/NvM.c
index d44f72bc9894c119310d2adeddf7e005664c1db5..e96e78a18c088f8229df5f8c5c70211635b9cfb5 100644 (file)
--- a/memory/NvM/NvM.c
+++ b/memory/NvM/NvM.c
@@ -1468,8 +1468,8 @@ Std_ReturnType NvM_SetRamBlockStatus(NvM_BlockIdType blockId, boolean blockChang
        qEntry.blockChanged = blockChanged;\r
        qEntry.serviceId = NVM_SET_RAM_BLOCK_STATUS_ID;\r
        rv = CirqBuffPush(&nvmQueue,&qEntry);\r
-       NVM_ASSERT(rv == 0 );\r
 \r
+       DET_VALIDATE_RV((rv == 0),NVM_SET_RAM_BLOCK_STATUS_ID, NVM_E_LIST_OVERFLOW , E_NOT_OK);\r
        /* req 3.1.5/NVM185 */\r
        admPtr->ErrorStatus = NVM_REQ_PENDING;\r
 \r
@@ -1540,7 +1540,8 @@ Std_ReturnType NvM_RestoreBlockDefaults( NvM_BlockIdType blockId, uint8* NvM_Des
        qEntry.dataPtr = (uint8_t *)NvM_DestPtr;\r
        qEntry.serviceId = NVM_RESTORE_BLOCK_DEFAULTS_ID;\r
        rv = CirqBuffPush(&nvmQueue,&qEntry);\r
-       NVM_ASSERT(rv == 0 );\r
+\r
+       DET_VALIDATE_RV((rv == 0),NVM_RESTORE_BLOCK_DEFAULTS_ID, NVM_E_LIST_OVERFLOW , E_NOT_OK);\r
 \r
        /* req 3.1.5/NVM185 */\r
        admPtr->ErrorStatus = NVM_REQ_PENDING;\r
@@ -1630,8 +1631,8 @@ Std_ReturnType NvM_ReadBlock( NvM_BlockIdType blockId, uint8* NvM_DstPtr )
        qEntry.dataPtr = NvM_DstPtr;\r
        qEntry.serviceId = NVM_READ_BLOCK_ID;\r
        rv = CirqBuffPush(&nvmQueue,&qEntry);\r
-       NVM_ASSERT(rv == 0 );\r
 \r
+       DET_VALIDATE_RV((rv == 0),NVM_READ_BLOCK_ID, NVM_E_LIST_OVERFLOW , E_NOT_OK);\r
 \r
        /* req 3.1.5/NVM185 */\r
        AdminBlock[blockId-1].ErrorStatus = NVM_REQ_PENDING;\r
@@ -1675,7 +1676,8 @@ Std_ReturnType NvM_WriteBlock( NvM_BlockIdType blockId, const uint8* NvM_SrcPtr
        qEntry.dataPtr = (uint8_t *)NvM_SrcPtr;\r
        qEntry.serviceId = NVM_WRITE_BLOCK_ID;\r
        rv = CirqBuffPush(&nvmQueue,&qEntry);\r
-       NVM_ASSERT(rv == 0 );\r
+\r
+       DET_VALIDATE_RV((rv == 0),NVM_WRITE_BLOCK_ID, NVM_E_LIST_OVERFLOW , E_NOT_OK);\r
 \r
        /* req 3.1.5/NVM185 */\r
        admPtr->ErrorStatus = NVM_REQ_PENDING;\r
@@ -1732,7 +1734,7 @@ Std_ReturnType NvM_SetDataIndex( NvM_BlockIdType blockId, uint8 dataIndex ) {
        qEntry.dataIndex = dataIndex;\r
        qEntry.serviceId = NVM_SET_DATA_INDEX_ID;\r
        rv = CirqBuffPush(&nvmQueue,&qEntry);\r
-       NVM_ASSERT(rv == 0 );\r
+       DET_VALIDATE_RV((rv == 0),NVM_SET_DATA_INDEX_ID, NVM_E_LIST_OVERFLOW , E_NOT_OK);\r
 \r
        /* req 3.1.5/NVM185 */\r
        admPtr->ErrorStatus = NVM_REQ_PENDING;\r
@@ -1762,7 +1764,8 @@ Std_ReturnType NvM_GetDataIndex( NvM_BlockIdType blockId, uint8 *dataIndexPtr )
        qEntry.dataPtr = dataIndexPtr;\r
        qEntry.serviceId = NVM_GET_DATA_INDEX_ID;\r
        rv = CirqBuffPush(&nvmQueue,&qEntry);\r
-       NVM_ASSERT(rv == 0 );\r
+\r
+       DET_VALIDATE_RV((rv == 0),NVM_GET_DATA_INDEX_ID, NVM_E_LIST_OVERFLOW , E_NOT_OK);\r
 \r
        /* req 3.1.5/NVM185 */\r
        admPtr->ErrorStatus = NVM_REQ_PENDING;\r