Index: App/Services/CommBuffers.h
===================================================================
diff -u -ree310a2e5262c05bf0dc0eb0d84da0ee50bac7fe -rcb47c5f896477ceae7597cb1a4191b3972e93f0d
--- App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision ee310a2e5262c05bf0dc0eb0d84da0ee50bac7fe)
+++ App/Services/CommBuffers.h	(.../CommBuffers.h)	(revision cb47c5f896477ceae7597cb1a4191b3972e93f0d)
@@ -21,31 +21,30 @@
 
 // ********** public definitions **********
 
-#define COMM_BUFFER_LENGTH      128     // bytes
-
 typedef enum Comm_Buffers
 {
-    COMM_BUFFER_CAN_HD_ALARM = 0,
-    COMM_BUFFER_CAN_DG_ALARM,
-    COMM_BUFFER_CAN_UI_ALARM,
-    COMM_BUFFER_CAN_HD_2_DG,
-    COMM_BUFFER_CAN_DG_2_HD,
-    COMM_BUFFER_CAN_HD_2_UI,
-    COMM_BUFFER_CAN_HD_BROADCAST,
-    COMM_BUFFER_CAN_DG_BROADCAST,
-    COMM_BUFFER_CAN_UI_2_HD,
-    COMM_BUFFER_CAN_UI_BROADCAST,
-    COMM_BUFFER_FPGA_IN,
-    COMM_BUFFER_FPGA_OUT,
-    COMM_BUFFER_DBG_IN,
-    COMM_BUFFER_DBG_OUT,
+    COMM_BUFFER_NOT_USED = 0,           // CAN message boxes start at 1
+    COMM_BUFFER_OUT_CAN_HD_ALARM,
+    COMM_BUFFER_IN_CAN_DG_ALARM,
+    COMM_BUFFER_IN_CAN_UI_ALARM,
+    COMM_BUFFER_OUT_CAN_HD_2_DG,
+    COMM_BUFFER_IN_CAN_DG_2_HD,
+    COMM_BUFFER_OUT_CAN_HD_2_UI,
+    COMM_BUFFER_OUT_CAN_HD_BROADCAST,
+    COMM_BUFFER_IN_CAN_DG_BROADCAST,
+    COMM_BUFFER_IN_CAN_UI_2_HD,
+    COMM_BUFFER_IN_CAN_UI_BROADCAST,
+    COMM_BUFFER_IN_DBG,
+    COMM_BUFFER_OUT_DBG,
     NUM_OF_COMM_BUFFERS
 } COMM_BUFFER_T;
 
 // ********** public function prototypes **********
 
 void initCommBuffers( void );
-BOOL addToCommBuffer( COMM_BUFFER_T buffer, U08* data, U32 len );
-U32 getFromCommBuffer( COMM_BUFFER_T buffer, U08* data, U32 maxLen );
+BOOL addToCommBuffer( COMM_BUFFER_T buffer, U08 *data, U32 len );
+U32 getFromCommBuffer( COMM_BUFFER_T buffer, U08 *data, U32 len );
+U32 peekFromCommBuffer( COMM_BUFFER_T buffer, U08 *data, U32 len );
+U32 numberOfBytesInCommBuffer( COMM_BUFFER_T buffer );
 
 #endif