updated gbe registers in trbnetdoc

diff --git a/gbe.tex b/gbe.tex
index 08e015abe6c01f324d61267ece94f9798edfa5e6..4f9a5b035b483f688ff3b74e264395671655d3a4 100644 (file)
--- a/gbe.tex
+++ b/gbe.tex
@@ -21,16 +21,19 @@ The GbE interface itself has two registers to control the link status, available
 \hline
 \textbf{Address} & \textbf{Name} & \textbf{Description} \\
 \hline\hline
-0x8300 & SubEventID    & The ID is written in each SubEventHeader to identify the source of data  \\
-0x8301 & SubEventDecoding & Information sent in the SubEventHeader \\
-0x8302 & QueueDecoding    & Information sent in the HadesTuQueue \\
-0x8303 & MaxPacketSize    & Maximum size of the UDP packet (default: 0xFDE8 = 65000) \\
-0x8304 & MaxFrameSize     & Maximum size of a Ethernet packet (default: 0x578 = 1400) \\
-0x8305 & UseGbE           & Enable sending data over GbE (default: 1) \\
-0x8306 & UseTrbNet        & Forward data over TrbNet (default: 0) \\
+0x8300 & SubEventID    & The ID is written in each SubEventHeader to identify the source of data (default: x"0000_00cf") \\
+0x8301 & SubEventDecoding & Information sent in the SubEventHeader (default: x"0002_0001") \\
+0x8302 & QueueDecoding    & Information sent in the HadesTuQueue (default: x"0003_0062") \\
+0x8304 & MaxFrameSize     & Maximum size of a Ethernet packet (default: 1400) \\
+0x8305 & UseGbE           & Enable sending data over GbE (default: 0) \\
 0x8307 & MultiEventQueue  & Enable packing several events into one event queue (default: 0) \\
 0x8308 & TriggerCounter   & The internal, 24bit trigger counter used for the SubEventHeader (default: 0) \\
-0x8309 & DelayCounter     & Microseconds delay between sending two UDP packets \\
+0x8309 & EnableRX         & Enables/disables reception of frames (default: 1)\\
+0x830B & IncludeTType     & Include Trigger Type in decoding field (default: 0)\\
+0x830C & MaxSubSize       & Max Subevent size, larger are discarded (default: 59800)\\
+0x830E & MaxSubsInQueue   & Max number of Subevents in one Queue (default: 200)\\
+0x830F & MaxSubSizeInQ    & Max Subevent size, after which the Queue is closed immediately (default: 32000)\\
+0x8310 & MaxQueueSize     & Max size of a Queue (default: 60000) \\
 0x83FF & ResetDefault     & When written to 0xFFFFFFFF: all values are reset to default \\
 \hline
 \end{tabularx}
@@ -51,11 +54,11 @@ The GbE interface itself has two registers to control the link status, available
 0x81S1 & DestMacMsb  & Bit 15..0: Higher 16 bit of the destination MAC, Bit 31..16: reserved\\
 0x81S2 & DestIP      & Destination IP \\
 0x81S3 & DestUdpPort & Bit 15..0: Destination UDP port, Bit 31..16: reserved \\
-0x81S4 & SrcMacLsb   & Lower 32 bits of the source MAC address \\
-0x81S5 & SrcMacMsb   & Bit 15..0: Higher 16 bit of the source MAC, Bit 31..16: reserved \\
-0x81S6 & SrcIP       & Source IP address \\
+0x81S4 & SrcMacLsb   & OBSOLETE (address automatically generated) \\
+0x81S5 & SrcMacMsb   & OBSOLETE (address automatically generated) \\
+0x81S6 & SrcIP       & OBSOLETE (address aacquired from DHCP) \\
 0x81S7 & SrcUdpPort  & Bit 15..0: Source UDP port, Bit 31..16: reserved \\
-0x81S8 & MtuSize     & Bit 15..0: MTU size, Bit 31..16: reserved \\
+0x81S8 & MtuSize     & OBSOLETE (switched to control register 0x8304) \\
 \hline
 \end{tabularx}
 \caption{Memory map for GbE Ethernet settings. The third digit is the EventBuilder number, allowing to stor 16 different settings that are selected by the IPU request information word.}
@@ -63,24 +66,27 @@ The GbE interface itself has two registers to control the link status, available
 \end{center}
 \end{table}
 
-- Link control
-
-\begin{description}
- \item[0x8000: Control Register] PHY control register. Each of the bits has to be reset manually after use
-  \begin{description}
-   \item[Bit 0]Restart Autonegotiation
-   \item[Bit 1]PHY mode (must be 0)
-   \item[Bit 3]PHY reset
-  \end{description}
- \item[0x8200: Status Register] GbE link status register (detailed explanation: t.b.d.)
-  \begin{description}
-   \item[Bit 15..0] Link partner page
-   \item[Bit 16] Link partner page received (strobe signal)
-   \item[Bit 17] Autonegotiation completed
-   \item[Bit 23..20] Reset state machine status
-   \item[Bit 27..24] Link status
-  \end{description}
-\end{description}
+- Status registers:
+
+\begin{table}[hbtp]
+\begin{center}
+\begin{tabularx}{\textwidth}{|l|l|X|}
+\hline
+\textbf{Address} & \textbf{Name} & \textbf{Description} \\
+\hline\hline
+0x83E0 & RxBytes    & Received bytes counter \\
+0x83E1 & RxFrames   & Received frames counter \\
+0x83E2 & TxBytes    & Transmitted bytes counter \\
+0x83E3 & TxFrames   & Transmitted frames counter \\
+0x83E4 & TxPackets  & Transmitted packets counter \\
+0x83E5 & RxDropped  & Dropped RX frames counter \\
+\hline
+\end{tabularx}
+\caption{Memory map for GbE Ethernet status registers.}
+\label{GbEEBSettings}
+\end{center}
+\end{table}
+
 
 \begin{figure}
        \centering