Index: RTC.c
===================================================================
diff -u -r8f8569c7cbc55dceebb2f5654e3ae162691d5991 -ra5ba573ba517926bb1dc49f42b0284cef69d613d
--- RTC.c	(.../RTC.c)	(revision 8f8569c7cbc55dceebb2f5654e3ae162691d5991)
+++ RTC.c	(.../RTC.c)	(revision a5ba573ba517926bb1dc49f42b0284cef69d613d)
@@ -1171,9 +1171,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;
     }
 
@@ -1207,8 +1211,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;
     }
 
@@ -1242,8 +1250,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;
     }
 
@@ -1277,8 +1290,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;
     }
 
@@ -1314,7 +1332,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
@@ -1327,8 +1344,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;
     }