Index: RTC.c
===================================================================
diff -u -r1afbd991f98562fda8059c75c59c0ea5b64243e4 -rccbdbdb98dc4d8c11cacade96002284d7d41d2d6
--- RTC.c	(.../RTC.c)	(revision 1afbd991f98562fda8059c75c59c0ea5b64243e4)
+++ RTC.c	(.../RTC.c)	(revision ccbdbdb98dc4d8c11cacade96002284d7d41d2d6)
@@ -1172,9 +1172,8 @@
     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;
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+        result                 = RTC_EXEC_STATE_IDLE;
         hasWriteToRTCRequested = FALSE;
     }
 
@@ -1208,8 +1207,7 @@
     else if ( RTCServiceState == RTC_SERVICE_COMPLETE )
     {
         releaseSemaphore( SEMAPHORE_RTC );
-
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_RTC_RAM_OPS_ERROR, result );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
         result = RTC_EXEC_STATE_IDLE;
     }
 
@@ -1243,8 +1241,8 @@
         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;
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+        result                 = RTC_EXEC_STATE_IDLE;
         hasWriteToRAMRequested = FALSE;
     }
 
@@ -1278,8 +1276,8 @@
         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;
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
+        result                  = RTC_EXEC_STATE_IDLE;
         hasReadFromRAMRequested = FALSE;
     }
 
@@ -1328,8 +1326,7 @@
     else if ( RTC_SERVICE_COMPLETE == RTCServiceState )
     {
         releaseSemaphore( SEMAPHORE_RTC );
-
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_RTC_RAM_OPS_ERROR, result );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_NVDATA_RTC_RAM_OPS_FAILURE, result )
         result = RTC_EXEC_STATE_IDLE;
     }