Index: RTC.c
===================================================================
diff -u -r1afbd991f98562fda8059c75c59c0ea5b64243e4 -rbc8e6282b66b86f678cf2f7d9195250e3d243354
--- RTC.c	(.../RTC.c)	(revision 1afbd991f98562fda8059c75c59c0ea5b64243e4)
+++ RTC.c	(.../RTC.c)	(revision bc8e6282b66b86f678cf2f7d9195250e3d243354)
@@ -1172,9 +1172,13 @@
     else if ( RTCServiceState == RTC_SERVICE_COMPLETE )
     {
         releaseSemaphore( SEMAPHORE_RTC );
-
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_RTC_RAM_OPS_ERROR, result );
-        result = RTC_EXEC_STATE_IDLE;
+#ifdef _DG_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
+#ifdef _HD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
+        result                 = RTC_EXEC_STATE_IDLE;
         hasWriteToRTCRequested = FALSE;
     }
 
@@ -1208,8 +1212,12 @@
     else if ( RTCServiceState == RTC_SERVICE_COMPLETE )
     {
         releaseSemaphore( SEMAPHORE_RTC );
-
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_RTC_RAM_OPS_ERROR, result );
+#ifdef _DG_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
+#ifdef _HD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
         result = RTC_EXEC_STATE_IDLE;
     }
 
@@ -1243,8 +1251,13 @@
         releaseSemaphore( SEMAPHORE_RTC );
 
         RTCRAMStatus = RTC_RAM_STATUS_FAILED;
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RTC_RAM_OPS_ERROR, result, RTCRAMStatus );
-        result = RTC_EXEC_STATE_IDLE;
+#ifdef _DG_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
+#ifdef _HD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
+        result                 = RTC_EXEC_STATE_IDLE;
         hasWriteToRAMRequested = FALSE;
     }
 
@@ -1278,8 +1291,13 @@
         releaseSemaphore( SEMAPHORE_RTC );
 
         RTCRAMStatus = RTC_RAM_STATUS_FAILED;
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RTC_RAM_OPS_ERROR, result, RTCRAMStatus );
-        result = RTC_EXEC_STATE_IDLE;
+#ifdef _DG_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
+#ifdef _HD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
+        result                  = RTC_EXEC_STATE_IDLE;
         hasReadFromRAMRequested = FALSE;
     }
 
@@ -1315,7 +1333,6 @@
 #ifdef _DG_
             broadcastData( MSG_ID_DG_RTC_EPOCH, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( RTC_DATA_T ) );
 #endif
-
 #ifdef _HD_
             broadcastData( MSG_ID_RTC_EPOCH, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( RTC_DATA_T ) );
 #endif
@@ -1328,8 +1345,12 @@
     else if ( RTC_SERVICE_COMPLETE == RTCServiceState )
     {
         releaseSemaphore( SEMAPHORE_RTC );
-
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_RTC_RAM_OPS_ERROR, result );
+#ifdef _DG_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
+#ifdef _HD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+#endif
         result = RTC_EXEC_STATE_IDLE;
     }