Merge branch 'mikulka' of git@rtime.felk.cvut.cz:arc into mikulka

[arc.git] / include / NvM_Types.h

diff --git a/include/NvM_Types.h b/include/NvM_Types.h
index 8bedbea8e2215ed8993070fd2ad8ac0a65e42c03..f683668b48e42481822b632654dabcf76a209d29 100644 (file)
--- a/include/NvM_Types.h
+++ b/include/NvM_Types.h
@@ -27,7 +27,11 @@
 #define NVM_TYPES_H_\r
 \r
 #include "Std_Types.h"\r
+#if defined(CFG_NVM_USE_SERVICE_COMPONENT)\r
+#include "Rte_NvM.h"\r
+#endif\r
 \r
+#if !defined(_DEFINED_TYPEDEF_FOR_NvM_RequestResultType_)\r
 typedef uint8 NvM_RequestResultType;   /** @req NVM470 */\r
 #define NVM_REQ_OK                                     0x00\r
 #define NVM_REQ_NOT_OK                         0x01\r
@@ -36,10 +40,13 @@ typedef uint8 NvM_RequestResultType;        /** @req NVM470 */
 #define NVM_REQ_BLOCK_SKIPPED          0x04\r
 #define NVM_REQ_NV_INVALIDATED         0x05\r
 #define NVM_REQ_CANCELLED                      0x06\r
+#endif\r
 \r
 /** @req 3.1.5/NVM471 */\r
 /* 0 and 1 is reserved, sequential order */\r
+#if !defined(_DEFINED_TYPEDEF_FOR_NvM_BlockIdType_)\r
 typedef uint16 NvM_BlockIdType;\r
+#endif\r
 \r
 #define NVM_MULTI_BLOCK_REQUEST_ID                     0\r
 #define NVM_REDUNDANT_BLOCK_FOR_CONFIG_ID      1\r