Index: TestSupport.h
===================================================================
diff -u -r1640a914c7923f8fd8fb78801158e0979c0a5256 -rf152a1f8f051ffe9d501b39990e2876423ff0275
--- TestSupport.h	(.../TestSupport.h)	(revision 1640a914c7923f8fd8fb78801158e0979c0a5256)
+++ TestSupport.h	(.../TestSupport.h)	(revision f152a1f8f051ffe9d501b39990e2876423ff0275)
@@ -133,6 +133,7 @@
 // max      = DATA array's maximum index
 // d_name   = name of data's variable
 // f_val    = value to return if index is out of range
+#ifdef _DG_
 #define DATA_ARRAY_GET( t, f_name, i_name, max, d_name, f_val ) \
 t f_name( U32 i_name ) \
 { \
@@ -150,10 +151,33 @@
     } \
     else \
     { \
-        activateAlarmNoData( ALARM_ID_SOFTWARE_FAULT ); \
+        activateAlarmNoData( ALARM_ID_DG_SOFTWARE_FAULT ); \
     } \
     return result; \
 }
+#else
+#define DATA_ARRAY_GET( t, f_name, i_name, max, d_name, f_val ) \
+t f_name( U32 i_name ) \
+{ \
+    t result = f_val; \
+    if ( i_name <= max ) \
+    { \
+        if ( OVERRIDE_KEY == d_name[ i_name ].override ) \
+        { \
+            result = d_name[ i_name ].ovData; \
+        } \
+        else \
+        { \
+            result = d_name[ i_name ].data; \
+        } \
+    } \
+    else \
+    { \
+        activateAlarmNoData( ALARM_ID_HD_SOFTWARE_FAULT ); \
+    } \
+    return result; \
+}
+#endif
 
 // DATA_OVERRIDE_FUNC - creates an override and a reset override function for a DATA
 // t        = data's type