Index: NVDataMgmt.c
===================================================================
diff -u -r51178541e201275f227c8b3e8084a455bb78cf39 -r1e1578eeb5f1c1dd837283aab216ec50108f0754
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 51178541e201275f227c8b3e8084a455bb78cf39)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 1e1578eeb5f1c1dd837283aab216ec50108f0754)
@@ -668,9 +668,13 @@
             break;
 
         default:
-
-            SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_NVDATAMGMT_INVALID_SELF_TEST_STATE,
+#ifdef _DG_
+            SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATAMGMT_INVALID_SELF_TEST_STATE,
                                        NVDataMgmtSelfTestState );
+#else
+            SET_ALARM_WITH_2_U32_DATA ( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_NVDATAMGMT_INVALID_SELF_TEST_STATE,
+                                       NVDataMgmtSelfTestState );
+#endif
             NVDataMgmtSelfTestState = NVDATAMGMT_SELF_TEST_STATE_COMPLETE;
             NVDataMgmtSelfTestResult = SELF_TEST_STATUS_FAILED;
             break;
@@ -766,8 +770,13 @@
 
         default:
 
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_NVDATAMGMT_EXEC_INVALID_STATE,
+#ifdef _DG_
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATAMGMT_EXEC_INVALID_STATE,
                                        NVDataMgmtExecState );
+#else
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_NVDATAMGMT_EXEC_INVALID_STATE,
+                                       NVDataMgmtExecState );
+#endif
             NVDataMgmtExecState = NVDATAMGMT_EXEC_STATE_IDLE;
             break;
     }