eb id added

diff --git a/cts.tex b/cts.tex
index e7f938b9e004ffd15344f853ffb2f107bf72e600..523f93916679325c8094a5c0cf4694e03c252a47 100644 (file)
--- a/cts.tex
+++ b/cts.tex
@@ -85,16 +85,6 @@ For all registers described in this subsection refer to the Fig.\ref{cts_logic}
    \item[Bit 4] Disable readout on Etrax
   \end{description}
 
-
-
-
-%  \item[0xA0C9] Select how many times should be sent data to the EB with current ID (which corresponds to the EB IP number), when 0 does not swith between IDs
-%  \item[0xA0CA] Tables of 8 EB IDs (each ID has four bits), the IDs are switched form CA(3 down to 0) to CA(7 down to 4) ... CB(31 down to 28)
-%  \item[0xA0CB] Tables of 8 EB IDs (each ID has four bits)
-
-%  \end{description}
-
-
 For the time being "old" logic of the CTS is not removed.
 \item[0xA0C5 old CTS trigger selection] Trigger source selection
   \begin{description}
@@ -130,8 +120,13 @@ For the time being "old" logic of the CTS is not removed.
   \begin{description}
    \item[Bit 13 -- 0] LVL1 trigger information 13 downto 0
   \end{description}
-\end{description}
+<<<<<<< cts.tex
+\item[0xA0C9] Select how many times should be sent data to the EB with current ID (which corresponds to the EB IP number), when 0 does not swith between IDs
+\item[0xA0CA] Tables of 8 EB IDs (each ID has four bits), the IDs are switched form CA(3 down to 0) to CA(7 down to 4) ... CB(31 down to 28)
+\item[0xA0CB] Tables of 8 EB IDs (each ID has four bits) 
+
 
+\end{description}  
 
 \begin{figure}
   \centering