Index: PersistentAlarm.c
===================================================================
diff -u -re3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de
--- PersistentAlarm.c	(.../PersistentAlarm.c)	(revision e3a4d7c5c18dc07a6cc7fe2dc07d0d143fd92c57)
+++ PersistentAlarm.c	(.../PersistentAlarm.c)	(revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de)
@@ -106,9 +106,6 @@
 #ifdef _DD_
        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX1, alarmId );
 #endif
-#ifdef _RO_
-       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX1, alarmId );
-#endif
    }
 }
 
@@ -192,9 +189,6 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX2, alarmId );
 #endif
-#ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX2, alarmId );
-#endif
     }
 
     return isAlarmTriggered;
@@ -240,9 +234,6 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX3, alarmId )
 #endif
-#ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PERSISTENT_ALARM_INVALID_INDEX3, alarmId )
-#endif
     }
 
     return isErrorConditionCleared;
@@ -322,9 +313,6 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED1, (U32)group )
 #endif
-#ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED1, (U32)group )
-#endif
     }
 }
 
@@ -360,9 +348,6 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED2, (U32)group )
 #endif
-#ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED2, (U32)group )
-#endif
     }
 }
 
@@ -400,9 +385,6 @@
 #ifdef _DD_
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED3, errorType )
 #endif
-#ifdef _RO_
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED3, errorType )
-#endif
             break;
     }