moved types used by rte to Rte_dem.h

[arc.git] / diagnostic / Dem / Dem_Types.h

diff --git a/diagnostic/Dem/Dem_Types.h b/diagnostic/Dem/Dem_Types.h
index bb443a2496bb582bd90b5561a2141f3910e9ed5f..4283a083f69a4d71d14b582f224d304ce611f719 100644 (file)
--- a/diagnostic/Dem/Dem_Types.h
+++ b/diagnostic/Dem/Dem_Types.h
@@ -23,7 +23,7 @@
 #ifndef DEM_TYPES_H_\r
 #define DEM_TYPES_H_\r
 #include "Std_Types.h" /** @req DEM176.Std */\r
-\r
+#include "Rte_Dem.h"\r
 #define DEM_EVENT_DESTINATION_END_OF_LIST 0\r
 \r
 /*\r
@@ -35,11 +35,6 @@ typedef uint8 Dem_ReturnTypeOfDtcSupportedType;
 #define DEM_SAEJ1939_73                0x02\r
 #define DEM_ISO_11992_4                0x03\r
 \r
-/*\r
- * Dem_EventIdType\r
- */\r
-typedef uint16 Dem_EventIdType;\r
-\r
 /*\r
  * Dem_DTCGroupType\r
  */\r
@@ -55,7 +50,6 @@ typedef uint32 Dem_DTCGroupType;
 /*\r
  * DemDTCKindType\r
  */\r
-typedef uint8 Dem_DTCKindType;\r
 #define        DEM_DTC_KIND_ALL_DTCS                   (Dem_DTCKindType)0x01\r
 #define        DEM_DTC_KIND_EMISSION_REL_DTCS  (Dem_DTCKindType)0x02\r
 \r
@@ -68,10 +62,6 @@ typedef uint8 Dem_DTCOriginType;
 #define        DEM_DTC_ORIGIN_PERMANENT_MEMORY (Dem_DTCOriginType)0x03\r
 #define        DEM_DTC_ORIGIN_MIRROR_MEMORY    (Dem_DTCOriginType)0x04\r
 \r
-/*\r
- * DemEventStatusExtendedType\r
- */\r
-typedef uint8 Dem_EventStatusExtendedType;\r
 #define        DEM_TEST_FAILED                                                         (Dem_EventStatusExtendedType)0x01\r
 #define        DEM_TEST_FAILED_THIS_OPERATION_CYCLE            (Dem_EventStatusExtendedType)0x02\r
 #define        DEM_PENDING_DTC                                                         (Dem_EventStatusExtendedType)0x04\r
@@ -81,10 +71,6 @@ typedef uint8 Dem_EventStatusExtendedType;
 #define        DEM_TEST_NOT_COMPLETED_THIS_OPERATION_CYCLE (Dem_EventStatusExtendedType)0x40\r
 #define        DEM_WARNING_INDICATOR_REQUESTED                         (Dem_EventStatusExtendedType)0x80\r
 \r
-/*\r
- * DemOperationCycleType\r
- */\r
-typedef uint8 Dem_OperationCycleIdType;        // TODO: Check type and values\r
 enum {\r
        DEM_ACTIVE,             // Started by DEM on Dem_PreInit and stopped on Dem_Shutdown\r
 \r
@@ -96,10 +82,6 @@ enum {
        DEM_OPERATION_CYCLE_ID_ENDMARK\r
 }; /** @req DEM142 */\r
 \r
-/*\r
- * Dem_OperationCycleStateType\r
- */\r
-typedef uint8 Dem_OperationCycleStateType;\r
 #define DEM_CYCLE_STATE_START          (Dem_OperationCycleStateType)1\r
 #define DEM_CYCLE_STATE_END                    (Dem_OperationCycleStateType)2\r
 \r
@@ -126,32 +108,15 @@ typedef uint8 Dem_EventStatusType;
 #define DEM_EVENT_STATUS_PREPASSED     (Dem_EventStatusType)2\r
 #define DEM_EVENT_STATUS_PREFAILED     (Dem_EventStatusType)3\r
 \r
-/*\r
- * Dem_DTCType\r
- */\r
-typedef uint32 Dem_DTCType;\r
-\r
-/*\r
- * Dem_InitMonitorKindType\r
- */\r
-typedef uint8 Dem_InitMonitorKindType;\r
 #define DEM_INIT_MONITOR_CLEAR         (Dem_InitMonitorKindType)1\r
 #define DEM_INIT_MONITOR_RESTART       (Dem_InitMonitorKindType)2\r
 \r
-/*\r
- * Dem_IndicatorStatusType\r
- */\r
-typedef uint8 Dem_IndicatorStatusType;\r
+\r
 #define DEM_INDICATOR_OFF                      (Dem_IndicatorStatusType)0\r
 #define DEM_INDICATOR_CONTINUOUS       (Dem_IndicatorStatusType)1\r
 #define DEM_INDICATOR_BLINKING         (Dem_IndicatorStatusType)2\r
 #define DEM_INDICATOR_BLINK_CONT       (Dem_IndicatorStatusType)3\r
 \r
-/*\r
- * Dem_FaultDetectionCpunterType\r
- */\r
-typedef sint8 Dem_FaultDetectionCounterType;\r
-\r
 /*\r
  * Dem_PreDebounceNameType\r
  */\r