Index: CommBuffers.h
===================================================================
diff -u -r809103b805b84e80dda7e3dd1e77a52330610666 -r6145aa3d5ad75342f087f36b1fcd41af213f95f8
--- CommBuffers.h	(.../CommBuffers.h)	(revision 809103b805b84e80dda7e3dd1e77a52330610666)
+++ CommBuffers.h	(.../CommBuffers.h)	(revision 6145aa3d5ad75342f087f36b1fcd41af213f95f8)
@@ -47,20 +47,24 @@
     COMM_BUFFER_IN_CAN_DD_BROADCAST,                       ///< Buffer for incoming DD broadcast messages (channel 101)
     COMM_BUFFER_IN_CAN_RO_BROADCAST,                       ///< Buffer for incoming RO broadcast messages (channel 102)
     COMM_BUFFER_IN_CAN_UI_BROADCAST,                       ///< Buffer for incoming UI broadcast messages (channel 103)
+    COMM_BUFFER_IN_CAN_PC,                                 ///< Buffer for incoming PC messages (channel 400-TD, 402-DD, 404-RO)
+    COMM_BUFFER_OUT_CAN_PC,                                ///< Buffer for outgoing messages to PC (channel 401-TD, 403-DD, 405-RO)
 #endif
 #ifdef _DD_
     COMM_BUFFER_IN_CAN_TD_ALARM,                           ///< Buffer for incoming TD alarm messages (channel 1)
     COMM_BUFFER_OUT_CAN_DD_ALARM,                          ///< Buffer for outgoing DD alarm messages (channel 2)
-    COMM_BUFFER_IN_CAN_RO_ALARM,                           ///< Buffer for incoming RO alarm messages (channel 4)
+    COMM_BUFFER_OUT_CAN_FP_ALARM,                          ///< Buffer for incoming FP alarm messages (channel 4)
     COMM_BUFFER_IN_CAN_UI_ALARM,                           ///< Buffer for incoming UI alarm messages (channel 8)
     COMM_BUFFER_IN_CAN_TD_2_DD,                            ///< Buffer for incoming TD to DD messages (channel 10)
     COMM_BUFFER_OUT_CAN_DD_2_TD,                           ///< Buffer for outgoing DD to TD messages (channel 11)
-    COMM_BUFFER_OUT_CAN_DD_2_RO,                           ///< Buffer for outgoing DD to RO messages (channel 20)
-    COMM_BUFFER_IN_CAN_RO_2_DD,                            ///< Buffer for incoming RO to DD messages (channel 21)
     COMM_BUFFER_IN_CAN_TD_BROADCAST,                       ///< Buffer for incoming TD broadcast messages (channel 100)
     COMM_BUFFER_OUT_CAN_DD_BROADCAST,                      ///< Buffer for outgoing DD broadcast messages (channel 101)
-    COMM_BUFFER_IN_CAN_RO_BROADCAST,                       ///< Buffer for incoming RO broadcast messages (channel 102)
+    COMM_BUFFER_OUT_CAN_FP_BROADCAST,                      ///< Buffer for outgoing FP broadcast messages (channel 102)
     COMM_BUFFER_IN_CAN_UI_BROADCAST,                       ///< Buffer for incoming UI broadcast messages (channel 103)
+    COMM_BUFFER_IN_DD_CAN_PC,                              ///< Buffer for incoming PC messages (channel 400-TD, 402-DD, 404-RO)
+    COMM_BUFFER_OUT_DD_CAN_PC,                             ///< Buffer for outgoing messages to PC (channel 401-TD, 403-DD, 405-RO)
+    COMM_BUFFER_IN_FP_CAN_PC,                              ///< Buffer for incoming PC messages (channel 400-TD, 402-DD, 404-RO)
+    COMM_BUFFER_OUT_FP_CAN_PC,                             ///< Buffer for outgoing messages to PC (channel 401-TD, 403-DD, 405-RO)
 #endif
 #ifdef _RO_
     COMM_BUFFER_IN_CAN_TD_ALARM,                           ///< Buffer for incoming TD alarm messages (channel 1)
@@ -73,9 +77,9 @@
     COMM_BUFFER_IN_CAN_DD_BROADCAST,                       ///< Buffer for incoming DD broadcast messages (channel 101)
     COMM_BUFFER_OUT_CAN_FP_BROADCAST,                      ///< Buffer for incoming RO broadcast messages (channel 102)
     COMM_BUFFER_IN_CAN_UI_BROADCAST,                       ///< Buffer for incoming UI broadcast messages (channel 103)
-#endif
     COMM_BUFFER_IN_CAN_PC,                                 ///< Buffer for incoming PC messages (channel 400-TD, 402-DD, 404-RO)
     COMM_BUFFER_OUT_CAN_PC,                                ///< Buffer for outgoing messages to PC (channel 401-TD, 403-DD, 405-RO)
+#endif
     NUM_OF_COMM_BUFFERS                                    ///< Number of CAN communication buffers
 } COMM_BUFFER_T;
 
Index: SystemComm.c
===================================================================
diff -u -rcbe3a1c1ad46e567fbd5c55aa0d2df0f506db019 -r6145aa3d5ad75342f087f36b1fcd41af213f95f8
--- SystemComm.c	(.../SystemComm.c)	(revision cbe3a1c1ad46e567fbd5c55aa0d2df0f506db019)
+++ SystemComm.c	(.../SystemComm.c)	(revision 6145aa3d5ad75342f087f36b1fcd41af213f95f8)
@@ -496,11 +496,6 @@
                     {
                         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
@@ -730,8 +725,7 @@
 #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
Index: TestSupport.c
===================================================================
diff -u -rff72879d15869d55792326d893166849dc7ba41c -r6145aa3d5ad75342f087f36b1fcd41af213f95f8
--- TestSupport.c	(.../TestSupport.c)	(revision ff72879d15869d55792326d893166849dc7ba41c)
+++ TestSupport.c	(.../TestSupport.c)	(revision 6145aa3d5ad75342f087f36b1fcd41af213f95f8)
@@ -623,9 +623,16 @@
                 payloadPtr += sizeof( BOOL );
             }
         }
-
         // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+#ifdef _DD_
+        result = serializeMessage( msg, COMM_BUFFER_OUT_DD_CAN_PC, ACK_NOT_REQUIRED );
+#endif
+#ifdef _TD_
         result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_PC, ACK_NOT_REQUIRED );
+#endif
+#ifdef _RO_
+        result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_PC, ACK_NOT_REQUIRED );
+#endif
     }
 
     return result;