Index: SystemComm.c
===================================================================
diff -u -rcbe3a1c1ad46e567fbd5c55aa0d2df0f506db019 -r9023ef607793bf8f9e0491da6b84b7da6f8e77de
--- SystemComm.c	(.../SystemComm.c)	(revision cbe3a1c1ad46e567fbd5c55aa0d2df0f506db019)
+++ SystemComm.c	(.../SystemComm.c)	(revision 9023ef607793bf8f9e0491da6b84b7da6f8e77de)
@@ -32,9 +32,6 @@
 #ifdef _DD_
 #include "SystemCommDD.h"
 #include "OperationModes.h"
-#endif
-#ifdef _RO_
-#include "SystemCommFP.h"
 #include "FPOperationModes.h"
 #endif
 #include "Timers.h"
@@ -253,9 +250,6 @@
 #ifdef _DD_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox )
 #endif
-#ifdef _RO_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox )
-#endif
     }
 }
 
@@ -389,9 +383,6 @@
 #ifdef _DD_
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_CMMM_CAN_TRANSMIT_REJECTED, (U32)mBox )
 #endif
-#ifdef _RO_
-                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_CMMM_CAN_TRANSMIT_REJECTED, (U32)mBox )
-#endif
             }
         }
         else
@@ -402,9 +393,6 @@
 #ifdef _DD_
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_COMM_INVALID_FRAME_SIZE, ((U32)buffer << 16) | dataSize )
 #endif
-#ifdef _RO_
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_COMM_INVALID_FRAME_SIZE, ((U32)buffer << 16) | dataSize )
-#endif
         }
     }
 
@@ -496,16 +484,7 @@
                     {
                         checkInFromTD();
                     }
-                    // If message from RO channel, update RO comm status
-                    if ( COMM_BUFFER_IN_CAN_RO_BROADCAST == getInBufferID( i ) )
-                    {
-                        checkInFromFP();
-                    }
 #endif
-#ifdef _RO_
-                    // TODO define RO related check in
-#endif
-
                 }
                 else if ( -1 == msgSize ) // Candidate message with bad CRC found?
                 {
@@ -730,14 +709,8 @@
 #ifdef _DD_
             //TODO : validate code changes
             // Remove message pending ACK from list
-            if ( ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_TD_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_DD_2_TD ) ) &&
-                 ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_DD_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_DD_2_RO ) ) )
+            if ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_TD_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_DD_2_TD ) )
 #endif
-#ifdef _RO_
-            // TODO : clean up required
-            // Remove message pending ACK from list
-            if ( ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_DD_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_FP_2_DD ) ) )
-#endif
             {
                 pendingAckList[ i ].used = FALSE;
             }
@@ -797,12 +770,6 @@
                     SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_FP, (U32)msgID );
                 }
 #endif
-#ifdef _RO_
-                if ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_FP_2_DD )
-                {
-                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_FP_CAN_MESSAGE_NOT_ACKED_BY_DD, (U32)msgID );
-                }
-#endif
                 pendingAckList[ i ].used = FALSE;  // Take pending message off of list
             }
         }