Index: SystemComm.c
===================================================================
diff -u -rf77e7c2b1dab61807f21f25c793afc063d43907c -r3ca022103ce50b39e5d805b7577c7f360730412d
--- SystemComm.c	(.../SystemComm.c)	(revision f77e7c2b1dab61807f21f25c793afc063d43907c)
+++ SystemComm.c	(.../SystemComm.c)	(revision 3ca022103ce50b39e5d805b7577c7f360730412d)
@@ -54,7 +54,7 @@
 #define PENDING_ACK_LIST_SIZE           25          ///< Maximum number of Denali messages that can be pending ACK at any given time
 
 #define PENDING_ACK_LIST_OVERRIDE_UI_CHANNEL    1   ///< Value for determining UI channel when Pending ACKs are overriden.
-#define PENDING_ACK_LIST_OVERRIDE_DG_CHANNEL    2   ///< Value for determining DG channel when Pending ACKs are overriden.
+#define PENDING_ACK_LIST_OVERRIDE_DD_CHANNEL    2   ///< Value for determining DD channel when Pending ACKs are overriden.
 #define PENDING_ACK_LIST_OVERRIDE_TD_CHANNEL    3   ///< Value for determining TD channel when Pending ACKs are overriden.
 #define PENDING_ACK_LIST_OVERRIDE_RO_CHANNEL    4   ///< Value for determining RO channel when Pending ACKs are overriden.
 
@@ -245,7 +245,15 @@
     else
     {
         // Should not get here - not an active message box
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox )
+#ifdef _TD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox )
+#endif
+#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_RO_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox )
+#endif
     }
 }
 
@@ -373,12 +381,28 @@
             else
             {
                 signalCANXmitsCompleted();
-                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_CMMM_CAN_TRANSMIT_REJECTED, (U32)mBox )
+#ifdef _TD_
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_CMMM_CAN_TRANSMIT_REJECTED, (U32)mBox )
+#endif
+#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_RO_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_CMMM_CAN_TRANSMIT_REJECTED, (U32)mBox )
+#endif
             }
         }
         else
         {
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_COMM_INVALID_FRAME_SIZE, ((U32)buffer << 16) | dataSize )
+#ifdef _TD_
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_COMM_INVALID_FRAME_SIZE, ((U32)buffer << 16) | dataSize )
+#endif
+#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_RO_SOFTWARE_FAULT, SW_FAULT_ID_SYSTEM_COMM_INVALID_FRAME_SIZE, ((U32)buffer << 16) | dataSize )
+#endif
         }
     }
 
@@ -456,7 +480,7 @@
                     // If message from DG broadcast channel, update DG comm status
                     if ( COMM_BUFFER_IN_CAN_DD_BROADCAST == getInBufferID( i ) )
                     {
-                        checkInFromDG();
+                        checkInFromDD();
                     }
                     // If message from UI channel, mark UI communication so HD can begin transmitting
                     if ( ( COMM_BUFFER_IN_CAN_UI_2_TD == getInBufferID( i ) ) || ( COMM_BUFFER_IN_CAN_UI_BROADCAST == getInBufferID( i ) ) )
@@ -683,19 +707,19 @@
 #ifdef _TD_
             // Remove message pending ACK from list
             if ( ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_UI_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_TD_2_UI ) ) &&
-                 ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_DG_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_TD_2_DD ) ) )
+                 ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_DD_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_TD_2_DD ) ) )
 #endif
 #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_DG_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_DD_2_RO ) ) )
+                 ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_DD_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_DD_2_RO ) ) )
 #endif
 #ifdef _RO_
             // TODO : clean up required
             // Remove message pending ACK from list
             if ( ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_UI_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_TD_2_UI ) ) &&
-                 ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_DG_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_TD_2_DD ) ) )
+                 ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_DD_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_TD_2_DD ) ) )
 #endif
             {
                 pendingAckList[ i ].used = FALSE;