Merge with other head

[arc.git] / memory / NvM / Nvm_ServiceComponent.c

diff --git a/memory/NvM/Nvm_ServiceComponent.c b/memory/NvM/Nvm_ServiceComponent.c
index 6b57bc035148f703698f5d9ba39af7d8b6693892..70a29531ab4b236da5441f7b5cdb133af3e62994 100644 (file)
--- a/memory/NvM/Nvm_ServiceComponent.c
+++ b/memory/NvM/Nvm_ServiceComponent.c
@@ -17,13 +17,13 @@
 \r
 #if defined(CFG_NVM_USE_SERVICE_COMPONENT)\r
 \r
-Std_ReturnType NvMService_GetErrorStatus(Nvm_BlockIdType BlockId, NvM_RequestResultType* RequestResultPtr) {\r
+Std_ReturnType NvMService_GetErrorStatus(NvM_BlockIdType BlockId, NvM_RequestResultType* RequestResultPtr) {\r
        NvM_GetErrorStatus( BlockId, (uint8*)RequestResultPtr );\r
        return E_OK;\r
 }\r
 \r
 #if (NVM_SET_RAM_BLOCK_STATUS_API == STD_ON )\r
-Std_ReturnType NvMService_SetRamBlockStatus(Nvm_BlockIdType BlockId, Boolean BlockChanged) {\r
+Std_ReturnType NvMService_SetRamBlockStatus(NvM_BlockIdType BlockId, Boolean BlockChanged) {\r
        Nvm_SetRamBlockStatus( BlockId, (boolean)BlockChanged );\r
        return E_OK;\r
 }\r
@@ -31,51 +31,51 @@ Std_ReturnType NvMService_SetRamBlockStatus(Nvm_BlockIdType BlockId, Boolean Blo
 \r
 #if (NVM_API_CONFIG_CLASS > NVM_API_CONFIG_CLASS_1)\r
 \r
-Std_ReturnType NvMService_SetDataIndex(Nvm_BlockIdType BlockId, UInt8 DataIndex) {\r
+Std_ReturnType NvMService_SetDataIndex(NvM_BlockIdType BlockId, UInt8 DataIndex) {\r
        NvM_SetDataIndex( BlockId, (uint8)DataIndex );\r
        return E_OK;\r
 }\r
 \r
-Std_ReturnType NvMService_GetDataIndex(Nvm_BlockIdType BlockId, UInt8* DataIndexPtr) {\r
+Std_ReturnType NvMService_GetDataIndex(NvM_BlockIdType BlockId, UInt8* DataIndexPtr) {\r
        NvM_GetDataIndex( BlockId, (uint8*)DataIndexPtr );\r
        return E_OK;\r
 }\r
 \r
-Std_ReturnType NvMService_ReadBlock(Nvm_BlockIdType BlockId, const DstPtrType DstPtr) {\r
+Std_ReturnType NvMService_ReadBlock(NvM_BlockIdType BlockId, const DstPtrType DstPtr) {\r
        return NvMService_ReadBlock(BlockId, (uint8*)DstPtr), E_OK;\r
 }\r
 \r
-Std_ReturnType NvMService_WriteBlock(Nvm_BlockIdType BlockId, const DstPtrType SrcPtr) {\r
+Std_ReturnType NvMService_WriteBlock(NvM_BlockIdType BlockId, const DstPtrType SrcPtr) {\r
        return NvM_WriteBlock( BlockId, (uint8*)(SrcPtr) ), E_OK;\r
 }\r
 \r
-Std_ReturnType NvMService_RestoreBlockDefaults(Nvm_BlockIdType BlockId, const DstPtrType DstPtr) {\r
+Std_ReturnType NvMService_RestoreBlockDefaults(NvM_BlockIdType BlockId, const DstPtrType DstPtr) {\r
        return Nvm_RestoreBlockDefaults( BlockId, (uint8*)DstPtr ), E_OK;\r
 }\r
 \r
 #else\r
 \r
-Std_ReturnType NvMService_SetDataIndex(Nvm_BlockIdType BlockId, UInt8 DataIndex) {\r
+Std_ReturnType NvMService_SetDataIndex(NvM_BlockIdType BlockId, UInt8 DataIndex) {\r
        /* Dummy */\r
        return E_OK;\r
 }\r
 \r
-Std_ReturnType NvMService_GetDataIndex(Nvm_BlockIdType BlockId, UInt8* DataIndexPtr) {\r
+Std_ReturnType NvMService_GetDataIndex(NvM_BlockIdType BlockId, UInt8* DataIndexPtr) {\r
        /* Dummy */\r
        return E_OK;\r
 }\r
 \r
-Std_ReturnType NvMService_ReadBlock(Nvm_BlockIdType BlockId, const DstPtrType DstPtr) {\r
+Std_ReturnType NvMService_ReadBlock(NvM_BlockIdType BlockId, const DstPtrType DstPtr) {\r
        /* Dummy */\r
        return E_OK;\r
 }\r
 \r
-Std_ReturnType NvMService_WriteBlock(Nvm_BlockIdType BlockId, const DstPtrType SrcPtr) {\r
+Std_ReturnType NvMService_WriteBlock(NvM_BlockIdType BlockId, const DstPtrType SrcPtr) {\r
        /* Dummy */\r
-       return E_OK;\r
+       NvM_WriteBlock(BlockId, (const uint8*) SrcPtr);\r
 }\r
 \r
-Std_ReturnType NvMService_RestoreBlockDefaults(Nvm_BlockIdType BlockId, const DstPtrType DstPtr) {\r
+Std_ReturnType NvMService_RestoreBlockDefaults(NvM_BlockIdType BlockId, const DstPtrType DstPtr) {\r
        /* Dummy */\r
        return E_OK;\r
 }\r
@@ -84,32 +84,32 @@ Std_ReturnType NvMService_RestoreBlockDefaults(Nvm_BlockIdType BlockId, const Ds
 \r
 #if (NVM_API_CONFIG_CLASS > NVM_API_CONFIG_CLASS_2)\r
 \r
-Std_ReturnType NvMService_EraseBlock(Nvm_BlockIdType BlockId) {\r
+Std_ReturnType NvMService_EraseBlock(NvM_BlockIdType BlockId) {\r
        return NvM_EraseNvBlock( BlockId );\r
 }\r
 \r
-Std_ReturnType NvMService_InvalidateNvBlock(Nvm_BlockIdType BlockId) {\r
+Std_ReturnType NvMService_InvalidateNvBlock(NvM_BlockIdType BlockId) {\r
        return NvM_InvalidateNvBlock( BlockId );\r
 }\r
 \r
-Std_ReturnType NvMAdministration_SetBlockProtection(Nvm_BlockIdType BlockId, Boolean ProtectionEnabled) {\r
+Std_ReturnType NvMAdministration_SetBlockProtection(NvM_BlockIdType BlockId, Boolean ProtectionEnabled) {\r
        NvM_SetBlockProtection( BlockId, (boolean)(ProtectionEnabled) );\r
        return E_OK;\r
 }\r
 \r
 #else\r
 \r
-Std_ReturnType NvMService_EraseBlock(Nvm_BlockIdType BlockId) {\r
+Std_ReturnType NvMService_EraseBlock(NvM_BlockIdType BlockId) {\r
        /* Dummy */\r
        return E_OK;\r
 }\r
 \r
-Std_ReturnType NvMService_InvalidateNvBlock(Nvm_BlockIdType BlockId) {\r
+Std_ReturnType NvMService_InvalidateNvBlock(NvM_BlockIdType BlockId) {\r
        /* Dummy */\r
        return E_OK;\r
 }\r
 \r
-Std_ReturnType NvMAdministration_SetBlockProtection(Nvm_BlockIdType BlockId, Boolean ProtectionEnabled) {\r
+Std_ReturnType NvMAdministration_SetBlockProtection(NvM_BlockIdType BlockId, Boolean ProtectionEnabled) {\r
        /* Dummy */\r
        return E_OK;\r
 }\r