Index: AlarmMgmt.c
===================================================================
diff -u -r2474fa0f2fb3f769fb0cfae7309fa039ec9a0185 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de
--- AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 2474fa0f2fb3f769fb0cfae7309fa039ec9a0185)
+++ AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de)
@@ -19,11 +19,8 @@
 
 #define __ALARM_MGMT_C__
 
-#ifdef _RO_
 #include "FPOperationModes.h"
-#else
 #include "OperationModes.h"
-#endif
 #include "Messaging.h"
 #include "TaskGeneral.h"
 #include "Timers.h"
@@ -92,9 +89,6 @@
 #ifdef _DD_
        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm )
 #endif
-#ifdef _RO_
-       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS, (U32)alarm )
-#endif
     }
 
     return result;
@@ -125,9 +119,6 @@
 #ifdef _DD_
        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_RANK, index );
 #endif
-#ifdef _RO_
-       SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_RANK, index );
-#endif
     }
 
     return result;
@@ -171,9 +162,6 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE3, (U32)alarm )
 #endif
-#ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE3, (U32)alarm )
-#endif
     }
 }
 
@@ -217,9 +205,6 @@
                 broadcastData( MSG_ID_ALARM_CONDITION_CLEARED, COMM_BUFFER_OUT_CAN_DD_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) );
             }
 #endif
-#ifdef _RO_
-            broadcastData( MSG_ID_ALARM_CONDITION_CLEARED, COMM_BUFFER_OUT_CAN_FP_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) );
-#endif
         }
     }
     else
@@ -230,9 +215,6 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR_COND, (U32)alarm )
 #endif
-#ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR_COND, (U32)alarm )
-#endif
     }
 }
 
@@ -279,9 +261,6 @@
                     broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_DD_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) );
                 }
 #endif
-#ifdef _RO_
-                broadcastData( MSG_ID_ALARM_CLEARED, COMM_BUFFER_OUT_CAN_FP_ALARM, (U08*)&data, sizeof( ALARM_ID_DATA_PUBLISH_T ) );
-#endif
             }
         }
     }
@@ -293,9 +272,6 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR2, (U32)alarm )
 #endif
-#ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR2, (U32)alarm )
-#endif
     }
 }
 
@@ -355,9 +331,6 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED1, (U32)alarm )
 #endif
-#ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED1, (U32)alarm )
-#endif
     }
 
     return result;
@@ -392,9 +365,6 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED2, (U32)alarm )
 #endif
-#ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED2, (U32)alarm )
-#endif
     }
 
     return result;
@@ -426,9 +396,6 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED3, (U32)alarm )
 #endif
-#ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED3, (U32)alarm )
-#endif
    }
 
    return result;
@@ -477,9 +444,6 @@
 #ifdef _DD_
                 clearAlarmDD( (ALARM_ID_T)alarmID );
 #endif
-#ifdef _RO_
-                clearAlarmFP( (ALARM_ID_T)alarmID );
-#endif
             }
             result = TRUE;
         }