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

[arc.git] / include / Nm_ConfigTypes.h

diff --git a/include/Nm_ConfigTypes.h b/include/Nm_ConfigTypes.h
index 596e842468791e53aafd2e7f9b9ef8ccefd3dbd0..d58f934b01878cd403d043d3fba7b16f306379b5 100644 (file)
--- a/include/Nm_ConfigTypes.h
+++ b/include/Nm_ConfigTypes.h
@@ -17,19 +17,14 @@
 #ifndef NM_CONFIGTYPES_H_\r
 #define NM_CONFIGTYPES_H_\r
 \r
-/** Data structure shall be pre-compile time configurable. */\r
 typedef struct {\r
-#if (NM_BUSNM_CANNM_ENABLED == STD_ON)\r
-       const CanNm_ConfigType* CanNmConfigPtr\r
-#endif\r
-#if (NM_BUSNM_FRNM_ENABLED == STD_ON)\r
-       const FrNm_ConfigType * FrNmConfigPtr\r
-#endif\r
-}Nm_BusNm_ConfigType;\r
+       const Nm_BusNmType                      BusType;\r
+       const NetworkHandleType         BusNmNetworkHandle;\r
+       const NetworkHandleType         ComMNetworkHandle;\r
+} Nm_ChannelType;\r
 \r
 typedef struct {\r
-\r
+       const Nm_ChannelType*           Channels;\r
 } Nm_ConfigType;\r
 \r
-\r
 #endif /* NM_CONFIGTYPES_H_ */\r