Index: SystemComm.c
===================================================================
diff -u -r19f8ae4251383b97ce914f3ae41811024e82ea39 -r60942b3154c83220da99a31718872afbb0ae6dca
--- SystemComm.c	(.../SystemComm.c)	(revision 19f8ae4251383b97ce914f3ae41811024e82ea39)
+++ SystemComm.c	(.../SystemComm.c)	(revision 60942b3154c83220da99a31718872afbb0ae6dca)
@@ -381,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
         }
     }
 
Index: TestSupport.c
===================================================================
diff -u -r2801d97e877dd78189aa891e80a2f7cf60a6a2b7 -r60942b3154c83220da99a31718872afbb0ae6dca
--- TestSupport.c	(.../TestSupport.c)	(revision 2801d97e877dd78189aa891e80a2f7cf60a6a2b7)
+++ TestSupport.c	(.../TestSupport.c)	(revision 60942b3154c83220da99a31718872afbb0ae6dca)
@@ -218,8 +218,6 @@
  * test configuration successfully.
  * @details \b Inputs: none
  * @details \b Outputs: testConfig
- * @details \b Alarm: ALARM_ID_XX_SOFTWARE_FAULT if invalid
- * test configuration parameter given.
  * @param config which test configuration to set
  * @return TRUE if the set configuration was successful otherwise, FALSE
  *************************************************************************/
@@ -243,8 +241,6 @@
  * test configuration successfully.
  * @details \b Inputs: none
  * @details \b Outputs: testConfig
- * @details \b Alarm: ALARM_ID_XX_SOFTWARE_FAULT if invalid
- * test configuration is given.
  * @param config which test configuration to reset
  * @return TRUE if the reset configuration was successful otherwise, FALSE
  *************************************************************************/