Index: firmware/App/Services/CommBuffers.c
===================================================================
diff -u -r72f847f5a701cf0e10e8803ea6bd0ad5fab1f284 -rc0273c73da6b6dee4ad6f1d54cb6c6f27a262b5b
--- firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 72f847f5a701cf0e10e8803ea6bd0ad5fab1f284)
+++ firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision c0273c73da6b6dee4ad6f1d54cb6c6f27a262b5b)
@@ -18,7 +18,8 @@
 #include <HDCommon.h>
 #include <string.h>     // for memcpy()
 
-#include "CommBuffers.h"
+#include "CommBuffers.h"
+#include "SystemComm.h"
 #include "SystemCommMessages.h"
 #include "Timers.h"
 
@@ -37,7 +38,6 @@
 
 // ********** private function prototypes **********
 
-static void clearBuffer( COMM_BUFFER_T buffer );
 static U32 switchDoubleBuffer( COMM_BUFFER_T buffer );
 static void getDataFromInactiveBuffer( COMM_BUFFER_T buffer, U08 *data, U32 len );
 
@@ -72,7 +72,7 @@
  * @param buffer : the buffer to clear
  * @return none
  *************************************************************************/
-static void clearBuffer( COMM_BUFFER_T buffer )
+void clearBuffer( COMM_BUFFER_T buffer )
 {
     if ( buffer < NUM_OF_COMM_BUFFERS )
     {
@@ -120,34 +120,39 @@
     {
         BOOL bufferFull = FALSE;
         U32 activeBuffer;
-        U32 currentActiveBufCount;  // where to start adding new data to buffer (after existing data)
+        U32 currentActiveBufCount;  // where to start adding new data to buffer (after existing data)
+
+        if ( ( FALSE == isHDOnlyCANNode() ) ||
+             ( FALSE == isCANBoxForXmit( (CAN_MESSAGE_BOX_T)buffer ) ) )
+        {
+            // thread protection for queue operations
+            _disable_IRQ();
 
-        // thread protection for queue operations
-        _disable_IRQ();
+            activeBuffer = activeDoubleBuffer[ buffer ];
+            currentActiveBufCount = commBufferByteCount[ buffer ][ activeBuffer ];
 
-        activeBuffer = activeDoubleBuffer[ buffer ];
-        currentActiveBufCount = commBufferByteCount[ buffer ][ activeBuffer ];
+            // check to make sure buffer is not too full to service this add
+            if ( len <= ( COMM_BUFFER_LENGTH - currentActiveBufCount ) )
+            {
+                U08 *buffPtr;  // buffer destination for added data
 
-        // check to make sure buffer is not too full to service this add
-        if ( len <= ( COMM_BUFFER_LENGTH - currentActiveBufCount ) )
-        {
-            U08 *buffPtr;  // buffer destination for added data
+                // set destination pointer to end of active buffer data
+                buffPtr = &commBuffers[ buffer ][ activeBuffer ][ currentActiveBufCount ];
+                // copy source data to destination buffer
+                memcpy( buffPtr, data, len );
+                // adjust buffer count per this data add (also reserves space to add data before releasing thread protection)
+                commBufferByteCount[ buffer ][ activeBuffer ] += len;
+                // data successfully added to buffer
+                result = TRUE;
+            }
+            else // buffer too full to add this much data
+            {
+                bufferFull = TRUE;
+            }
+            // release thread protection
+            _enable_IRQ();
+        }
 
-            // set destination pointer to end of active buffer data
-            buffPtr = &commBuffers[ buffer ][ activeBuffer ][ currentActiveBufCount ];
-            // copy source data to destination buffer
-            memcpy( buffPtr, data, len );
-            // adjust buffer count per this data add (also reserves space to add data before releasing thread protection)
-            commBufferByteCount[ buffer ][ activeBuffer ] += len;
-            // data successfully added to buffer
-            result = TRUE;
-        }
-        else // buffer too full to add this much data
-        {
-            bufferFull = TRUE;
-        }
-        // release thread protection
-        _enable_IRQ();
         // if buffer was full, check persistence - trigger s/w fault if persists
         if ( TRUE == bufferFull )
         {
@@ -164,7 +169,7 @@
                 // if buffer overflows persists, fault
                 if ( calcTimeSince( firstBufferOverflowTimeStamp ) > BUFFER_OVERFLOW_PERSISTENCE_MS )
                 {
-                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_TOO_MUCH_DATA, len )
+                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_TOO_MUCH_DATA, (U32)buffer )
                 }
             }
             else // first overflow - set time stamp for persistence check
@@ -182,7 +187,7 @@
     }
     else // invalid buffer given
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_INVALID_BUFFER, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_INVALID_BUFFER, buffer )
     }
 
     return result;
@@ -243,7 +248,7 @@
     }
     else // invalid buffer given
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_GET_INVALID_BUFFER, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_GET_INVALID_BUFFER, buffer )
     }
 
     return result;
@@ -301,7 +306,7 @@
     }
     else // invalid buffer given
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_PEEK_INVALID_BUFFER, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_PEEK_INVALID_BUFFER, buffer )
     }
 
     return numOfBytesPeeked;
@@ -332,7 +337,7 @@
     }
     else // invalid buffer
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_COUNT_INVALID_BUFFER, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_COUNT_INVALID_BUFFER, buffer )
     }
 
     return result;