Index: Utilities.c
===================================================================
diff -u -ra63f636c18858c8444d3e4908bb19755b4f2be27 -rc245cff8627d3301392879b5457ce66b82a36f9e
--- Utilities.c	(.../Utilities.c)	(revision a63f636c18858c8444d3e4908bb19755b4f2be27)
+++ Utilities.c	(.../Utilities.c)	(revision c245cff8627d3301392879b5457ce66b82a36f9e)
@@ -18,7 +18,7 @@
 #include <string.h>      // For memcpy
 
 #include "Common.h"
-//#include "FPGA.h"
+#include "FPGA.h"
 #include "Timers.h"
 #include "Utilities.h"
 
@@ -394,19 +394,21 @@
         if ( cnt < NUM_OF_TIME_WINDOWED_COUNTS )
         {
             timeWindowedCountsInitialized[ cnt ] = FALSE;
-#ifdef _DD_
-//            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_INVALID_WIN_MAX_COUNT, maxCnt )
-#else
+#ifdef _TD_
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_INVALID_WIN_MAX_COUNT, maxCnt )
 #endif
+#ifdef _DD_
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_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
+#ifdef _TD_
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_INVALID_WIN_COUNT, cnt )
 #endif
+#ifdef _DD_
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_INVALID_WIN_COUNT, cnt )
+#endif
         }
     }
 }
@@ -447,11 +449,12 @@
     }
     else
     {
-#ifdef _DD_
-//        SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_TIME_WINDOWED_COUNT_ERROR, cnt );
-#else
+#ifdef _TD_
         SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_TIME_WINDOWED_COUNT_ERROR, cnt );
 #endif
+#ifdef _DD_
+        SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_UTIL_TIME_WINDOWED_COUNT_ERROR, cnt );
+#endif
     }
 
     return result;
@@ -483,10 +486,11 @@
          ( data->typ >= NUM_OF_CRITICAL_DATA_TYPES ) )
     {
         result.uInt = 0;
+#ifdef _TD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_CRITICAL_DATA_ERROR, (U32)&data[0], 0 )
+#endif
 #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_TD_CRITICAL_DATA_ERROR, (U32)&data[0], 0 )
 #endif
     }
 
@@ -562,10 +566,11 @@
     }
     else
     {
+#ifdef _TD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_CRITICAL_DATA_ERROR, (U32)&data[0], 1 )
+#endif
 #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_TD_CRITICAL_DATA_ERROR, (U32)&data[0], 1 )
 #endif
     }
 
@@ -701,12 +706,12 @@
     }
     else if ( TRUE == didTimeout( sempahoreStatus[ s ].semaphoreStartTimeMS, SEMAPHORE_IN_USE_TIMEOUT_MS ) )
     {
-#ifdef _DD_
-//        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 )
 #endif
+#ifdef _DD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT, (U32)s )
+#endif
     }
     _enable_IRQ();