Index: Utilities.c
===================================================================
diff -u -r5c80aa8c892acedea15ef45b2dd887257e7787d4 -ra2e528563e541a5139218b865b2ec142b7d533bc
--- Utilities.c	(.../Utilities.c)	(revision 5c80aa8c892acedea15ef45b2dd887257e7787d4)
+++ Utilities.c	(.../Utilities.c)	(revision a2e528563e541a5139218b865b2ec142b7d533bc)
@@ -267,7 +267,11 @@
          ( data->typ >= NUM_OF_CRITICAL_DATA_TYPES ) )
     {
         result.uInt = 0;
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_CRITICAL_DATA_ERROR, (U32)&data[0], 0 )
+#ifdef _DG_
+        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 )
+#endif
     }
 
     return result;
@@ -296,7 +300,11 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_CRITICAL_DATA_ERROR, (U32)&data[0], 1 )
+#ifdef _DG_
+        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 )
+#endif
     }
 }