Index: Utilities.c
===================================================================
diff -u -r6d80d69a210f45c733e5307859351f2cd820a8e7 -ra63f636c18858c8444d3e4908bb19755b4f2be27
--- Utilities.c	(.../Utilities.c)	(revision 6d80d69a210f45c733e5307859351f2cd820a8e7)
+++ Utilities.c	(.../Utilities.c)	(revision a63f636c18858c8444d3e4908bb19755b4f2be27)
@@ -397,15 +397,15 @@
 #ifdef _DD_
 //            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_INVALID_WIN_MAX_COUNT, maxCnt )
 #else
-//            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_INVALID_WIN_MAX_COUNT, maxCnt )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_INVALID_WIN_MAX_COUNT, maxCnt )
 #endif
         }
         else
         {
 #ifdef _DD_
 //            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_INVALID_WIN_COUNT, cnt )
 #else
-//            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_INVALID_WIN_COUNT, cnt )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_INVALID_WIN_COUNT, cnt )
 #endif
         }
     }
@@ -450,7 +450,7 @@
 #ifdef _DD_
 //        SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_TIME_WINDOWED_COUNT_ERROR, cnt );
 #else
-//        SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_TIME_WINDOWED_COUNT_ERROR, cnt );
+        SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_TIME_WINDOWED_COUNT_ERROR, cnt );
 #endif
     }
 
@@ -486,7 +486,7 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_CRITICAL_DATA_ERROR, (U32)&data[0], 0 )
 #else
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_CRITICAL_DATA_ERROR, (U32)&data[0], 0 )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_CRITICAL_DATA_ERROR, (U32)&data[0], 0 )
 #endif
     }
 
@@ -565,7 +565,7 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_CRITICAL_DATA_ERROR, (U32)&data[0], 1 )
 #else
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_CRITICAL_DATA_ERROR, (U32)&data[0], 1 )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_CRITICAL_DATA_ERROR, (U32)&data[0], 1 )
 #endif
     }
 
@@ -705,7 +705,7 @@
 //        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT, (U32)s )
 #endif
 #ifdef _TD_
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT, (U32)s )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT, (U32)s )
 #endif
     }
     _enable_IRQ();