Skip to content

C
Conv TTL Blocking - Gateware
Commit f943e5f2 authored by Theodor-Adrian Stana's avatar Theodor-Adrian Stana
Browse files
Options

doc: Updated no-sig-detect block figure and fixed small errors in memory map 

Signed-off-by: Theodor-Adrian Stana's avatarTheodor Stana <t.stana@cern.ch>
parent 5dcc4b58
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 21 deletions
doc/hdlguide/fig/no-sig-detect.svg
View file @ f943e5f2
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="3.959798" inkscape:zoom="3.959798"
inkscape:cx="121.4336" inkscape:cx="181.80464"
inkscape:cy="6.8062216" inkscape:cy="46.316789"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="true" showgrid="true"
...@@ -69,12 +69,22 @@ ...@@ -69,12 +69,22 @@
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer1" id="layer1"
transform="translate(-79.224409,-72.38776)"> transform="translate(-79.224409,-72.38776)">
<path
transform="translate(65.410462,154.90546)"
d="m 111.75489,-16.716501 a 1.7716535,1.7716535 0 1 1 -3.54331,0 1.7716535,1.7716535 0 1 1 3.54331,0 z"
sodipodi:ry="1.7716535"
sodipodi:rx="1.7716535"
sodipodi:cy="-16.716501"
sodipodi:cx="109.98324"
id="path3020"
style="fill:none;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
sodipodi:type="arc" />
<rect <rect
style="opacity:0.98999999;fill:#000000;fill-opacity:0.1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" style="opacity:0.98999999;fill:#000000;fill-opacity:0.1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="rect16159" id="rect16159"
width="62.007866" width="62.007866"
height="70.866119" height="70.866119"
x="176.98679" x="177.16536"
y="113.3858" /> y="113.3858" />
<path <path
style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
...@@ -84,7 +94,7 @@ ...@@ -84,7 +94,7 @@
sodipodi:nodetypes="ccc" /> sodipodi:nodetypes="ccc" />
<path <path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 177.16535,131.10234 -44.29133,0 0,-26.5748 -35.433075,0" d="m 177.16535,122.24407 -44.29133,0 0,-17.71653 -35.433075,0"
id="path16881" id="path16881"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" /> sodipodi:nodetypes="cccc" />
...@@ -97,21 +107,21 @@ ...@@ -97,21 +107,21 @@
xml:space="preserve" xml:space="preserve"
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
x="178.93701" x="178.93701"
y="134.64565" y="125.78738"
id="text16885" id="text16885"
sodipodi:linespacing="125%"><tspan sodipodi:linespacing="125%"><tspan
sodipodi:role="line" sodipodi:role="line"
id="tspan16887" id="tspan16887"
x="178.93701" x="178.93701"
y="134.64565">cnt</tspan></text> y="125.78738">cnt</tspan></text>
<text <text
sodipodi:linespacing="125%" sodipodi:linespacing="125%"
id="text16889" id="text16889"
y="134.64565" y="125.78738"
x="214.37007" x="214.37007"
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
xml:space="preserve"><tspan xml:space="preserve"><tspan
y="134.64565" y="125.78738"
x="214.37007" x="214.37007"
id="tspan16891" id="tspan16891"
sodipodi:role="line">en_o</tspan></text> sodipodi:role="line">en_o</tspan></text>
...@@ -170,18 +180,20 @@ ...@@ -170,18 +180,20 @@
sodipodi:linespacing="125%" sodipodi:linespacing="125%"
id="text4622" id="text4622"
y="175.39368" y="175.39368"
x="116.92913" x="148.81889"
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
xml:space="preserve"><tspan xml:space="preserve"><tspan
y="175.39368" y="175.39368"
x="116.92913" x="148.81889"
id="tspan4624" sodipodi:role="line"
sodipodi:role="line">clk125</tspan></text> id="tspan3013"
style="text-align:end;text-anchor:end">clk20</tspan></text>
<path <path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 239.17323,131.10234 17.71653,0 0,-19.48819 17.71654,0" d="m 239.17323,122.24407 17.71653,0 0,-10.62992 17.71654,0"
id="path16971" id="path16971"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path <path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 292.32283,108.07084 35.43308,0" d="m 292.32283,108.07084 35.43308,0"
...@@ -238,13 +250,39 @@ ...@@ -238,13 +250,39 @@
sodipodi:linespacing="125%" sodipodi:linespacing="125%"
id="text3010" id="text3010"
y="157.67714" y="157.67714"
x="207.69482" x="207.28346"
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
xml:space="preserve"><tspan xml:space="preserve"><tspan
y="157.67714" y="157.67714"
x="207.69482" x="207.28346"
id="tspan3012" id="tspan3012"
sodipodi:role="line" sodipodi:role="line"
style="font-size:12px;font-weight:bold;text-align:center;text-anchor:middle">1999</tspan></text> style="font-size:12px;font-weight:bold;text-align:center;text-anchor:middle">&lt;1999</tspan></text>
<text
sodipodi:linespacing="125%"
id="text3012"
y="141.73225"
x="178.93701"
style="font-size:10px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
xml:space="preserve"><tspan
y="141.73225"
x="178.93701"
id="tspan3014"
sodipodi:role="line">rst</tspan></text>
<path
sodipodi:type="arc"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="path3016"
sodipodi:cx="109.98324"
sodipodi:cy="-16.716501"
sodipodi:rx="1.7716535"
sodipodi:ry="1.7716535"
d="m 111.75489,-16.716501 a 1.7716535,1.7716535 0 1 1 -3.54331,0 1.7716535,1.7716535 0 1 1 3.54331,0 z"
transform="translate(22.890778,138.96057)" />
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 132.87401,122.24407 0,15.94488 40.74804,0"
id="path3790"
inkscape:connector-curvature="0" />
</g> </g>
</svg> </svg>
doc/hdlguide/hdlguide-conv-ttl-blo.bib
View file @ f943e5f2
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
howpublished = {\url{www.ohwr.org/attachments/download/2324/ELMA_SNMP_specification.pdf}} howpublished = {\url{www.ohwr.org/attachments/download/2324/ELMA_SNMP_specification.pdf}}
} }
@misc{rtm-detect, @misc{rtm-det,
title = {{Rear Transition Module detection}}, title = {{Rear Transition Module detection}},
howpublished = {\url{http://www.ohwr.org/projects/conv-ttl-blo/wiki/RTM_board_detection}} howpublished = {\url{http://www.ohwr.org/projects/conv-ttl-blo/wiki/RTM_board_detection}}
} }
......
doc/hdlguide/hdlguide-conv-ttl-blo.tex
View file @ f943e5f2
...@@ -554,7 +554,7 @@ input in order to generate a pulse at the output, logic external to the block ...@@ -554,7 +554,7 @@ input in order to generate a pulse at the output, logic external to the block
caters for the different types of signals that arrive on CONV-TTL-BLO inputs. caters for the different types of signals that arrive on CONV-TTL-BLO inputs.
Most of this external logic is on the TTL pulse side, where both TTL and TTL-BAR Most of this external logic is on the TTL pulse side, where both TTL and TTL-BAR
pulses may arrive. As described in Section 4.3 of the CONV-TTL-BLO User Guide\cite{ctb-ug}, pulses may arrive. As described in Section 4.3 of the CONV-TTL-BLO User Guide~\cite{ctb-ug},
if a wire is not plugged in when TTL-BAR pulses are input, a continuous logic high level if a wire is not plugged in when TTL-BAR pulses are input, a continuous logic high level
on the line would inhibit pulses arriving on the blocking side from triggering a pulse on the line would inhibit pulses arriving on the blocking side from triggering a pulse
generation. This is why the \textit{no signal detect} block has been implemented. generation. This is why the \textit{no signal detect} block has been implemented.
...@@ -976,7 +976,7 @@ $reg. index = \frac{addr}{4} + 1$ ...@@ -976,7 +976,7 @@ $reg. index = \frac{addr}{4} + 1$
\begin{tabular}{l l c c p{.35\textwidth}} \begin{tabular}{l l c c p{.35\textwidth}}
\textbf{Bits} & \textbf{Field} & \textbf{Access} & \textbf{Default} & \textbf{Description} \\ \textbf{Bits} & \textbf{Field} & \textbf{Access} & \textbf{Default} & \textbf{Description} \\
7..0 & GWVERS & R/O & X & gateware version \\ 7..0 & GWVERS & R/O & X & Gateware version \\
15..8 & SWITCHES & R/O & X & Switch status \\ 15..8 & SWITCHES & R/O & X & Switch status \\
21..16 & RTM & R/O & X & RTM detection lines \\ 21..16 & RTM & R/O & X & RTM detection lines \\
22 & CWDTO & R/W & 0 & Communication watchdog timeout \\ 22 & CWDTO & R/W & 0 & Communication watchdog timeout \\
...@@ -1022,7 +1022,7 @@ $reg. index = \frac{addr}{4} + 1$ ...@@ -1022,7 +1022,7 @@ $reg. index = \frac{addr}{4} + 1$
\textbf{Bits} & \textbf{Field} & \textbf{Access} & \textbf{Default} & \textbf{Description} \\ \textbf{Bits} & \textbf{Field} & \textbf{Access} & \textbf{Default} & \textbf{Description} \\
0 & RST\_UNLOCK & R/W & 0 & Reset bit unlock \\ 0 & RST\_UNLOCK & R/W & 0 & Reset bit unlock \\
1 & RST & R/W & 0 & Reset bit \\ 1 & RST & R/W & 0 & Reset bit \\
9..2 & MPT & W/O & 0 & Manual Pulse Trigger control \\ 9..2 & MPT & W/O & 0 & Manual Pulse Trigger \\
31..10 & \textit{Reserved} & -- & X & \\ 31..10 & \textit{Reserved} & -- & X & \\
\end{tabular} \end{tabular}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment