Commit ef2d3b44 authored by Ille, Ondrej, Ing.'s avatar Ille, Ondrej, Ing.

Merge branch '385-specification-inconsisten-names-for-timestamp-in-the-frame-buffer' into 'master'

Resolve "specification: inconsisten names for timestamp in the frame buffer"

Closes #385

See merge request !374
parents ecb01b1f df2c1b48
Pipeline #25196 passed with stage
in 1 minute and 19 seconds
......@@ -221,7 +221,7 @@ cellcolor{gray}
status open
\begin_layout Plain Layout
\backslash
hyperref[FRAME_FORM_W]{FRAME\backslash textunderscore FORM\backslash textunderscore W}\end_layout
hyperref[FRAME_FORMAT_W]{FRAME\backslash textunderscore FORMAT\backslash textunderscore W}\end_layout
\end_inset
\end_layout
......@@ -235,7 +235,7 @@ hyperref[FRAME_FORM_W]{FRAME\backslash textunderscore FORM\backslash textundersc
status open
\begin_layout Plain Layout
\backslash
hyperref[FRAME_FORM_W]{FRAME\backslash textunderscore FORM\backslash textunderscore W}\end_layout
hyperref[FRAME_FORMAT_W]{FRAME\backslash textunderscore FORMAT\backslash textunderscore W}\end_layout
\end_inset
\end_layout
......@@ -249,7 +249,7 @@ hyperref[FRAME_FORM_W]{FRAME\backslash textunderscore FORM\backslash textundersc
status open
\begin_layout Plain Layout
\backslash
hyperref[FRAME_FORM_W]{FRAME\backslash textunderscore FORM\backslash textunderscore W}\end_layout
hyperref[FRAME_FORMAT_W]{FRAME\backslash textunderscore FORMAT\backslash textunderscore W}\end_layout
\end_inset
\end_layout
......@@ -263,7 +263,7 @@ hyperref[FRAME_FORM_W]{FRAME\backslash textunderscore FORM\backslash textundersc
status open
\begin_layout Plain Layout
\backslash
hyperref[FRAME_FORM_W]{FRAME\backslash textunderscore FORM\backslash textunderscore W}\end_layout
hyperref[FRAME_FORMAT_W]{FRAME\backslash textunderscore FORMAT\backslash textunderscore W}\end_layout
\end_inset
\end_layout
......@@ -723,12 +723,12 @@ hyperref[DATA_61_64_W]{DATA\backslash textunderscore 61\backslash textunderscore
\end_layout
\begin_layout Subsection
FRAME_FORM_W
FRAME_FORMAT_W
\begin_inset ERT
status open
\begin_layout Plain Layout
\backslash
label{FRAME_FORM_W
label{FRAME_FORMAT_W
}\end_layout
\end_inset
\end_layout
......@@ -3565,7 +3565,7 @@ cellcolor{cyan}
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[31:24]\end_layout
TIME_STAMP_L_W[31:24]\end_layout
\end_inset
</cell>
......@@ -3573,7 +3573,7 @@ TIME_STAMP_31_0[31:24]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[31:24]\end_layout
TIME_STAMP_L_W[31:24]\end_layout
\end_inset
</cell>
......@@ -3581,7 +3581,7 @@ TIME_STAMP_31_0[31:24]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[31:24]\end_layout
TIME_STAMP_L_W[31:24]\end_layout
\end_inset
</cell>
......@@ -3589,7 +3589,7 @@ TIME_STAMP_31_0[31:24]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[31:24]\end_layout
TIME_STAMP_L_W[31:24]\end_layout
\end_inset
</cell>
......@@ -3597,7 +3597,7 @@ TIME_STAMP_31_0[31:24]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[31:24]\end_layout
TIME_STAMP_L_W[31:24]\end_layout
\end_inset
</cell>
......@@ -3605,7 +3605,7 @@ TIME_STAMP_31_0[31:24]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[31:24]\end_layout
TIME_STAMP_L_W[31:24]\end_layout
\end_inset
</cell>
......@@ -3613,7 +3613,7 @@ TIME_STAMP_31_0[31:24]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[31:24]\end_layout
TIME_STAMP_L_W[31:24]\end_layout
\end_inset
</cell>
......@@ -3621,7 +3621,7 @@ TIME_STAMP_31_0[31:24]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[31:24]\end_layout
TIME_STAMP_L_W[31:24]\end_layout
\end_inset
</cell>
......@@ -3885,7 +3885,7 @@ cellcolor{cyan}
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[23:16]\end_layout
TIME_STAMP_L_W[23:16]\end_layout
\end_inset
</cell>
......@@ -3893,7 +3893,7 @@ TIME_STAMP_31_0[23:16]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[23:16]\end_layout
TIME_STAMP_L_W[23:16]\end_layout
\end_inset
</cell>
......@@ -3901,7 +3901,7 @@ TIME_STAMP_31_0[23:16]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[23:16]\end_layout
TIME_STAMP_L_W[23:16]\end_layout
\end_inset
</cell>
......@@ -3909,7 +3909,7 @@ TIME_STAMP_31_0[23:16]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[23:16]\end_layout
TIME_STAMP_L_W[23:16]\end_layout
\end_inset
</cell>
......@@ -3917,7 +3917,7 @@ TIME_STAMP_31_0[23:16]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[23:16]\end_layout
TIME_STAMP_L_W[23:16]\end_layout
\end_inset
</cell>
......@@ -3925,7 +3925,7 @@ TIME_STAMP_31_0[23:16]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[23:16]\end_layout
TIME_STAMP_L_W[23:16]\end_layout
\end_inset
</cell>
......@@ -3933,7 +3933,7 @@ TIME_STAMP_31_0[23:16]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[23:16]\end_layout
TIME_STAMP_L_W[23:16]\end_layout
\end_inset
</cell>
......@@ -3941,7 +3941,7 @@ TIME_STAMP_31_0[23:16]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[23:16]\end_layout
TIME_STAMP_L_W[23:16]\end_layout
\end_inset
</cell>
......@@ -4205,7 +4205,7 @@ cellcolor{cyan}
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[15:8]\end_layout
TIME_STAMP_L_W[15:8]\end_layout
\end_inset
</cell>
......@@ -4213,7 +4213,7 @@ TIME_STAMP_31_0[15:8]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[15:8]\end_layout
TIME_STAMP_L_W[15:8]\end_layout
\end_inset
</cell>
......@@ -4221,7 +4221,7 @@ TIME_STAMP_31_0[15:8]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[15:8]\end_layout
TIME_STAMP_L_W[15:8]\end_layout
\end_inset
</cell>
......@@ -4229,7 +4229,7 @@ TIME_STAMP_31_0[15:8]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[15:8]\end_layout
TIME_STAMP_L_W[15:8]\end_layout
\end_inset
</cell>
......@@ -4237,7 +4237,7 @@ TIME_STAMP_31_0[15:8]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[15:8]\end_layout
TIME_STAMP_L_W[15:8]\end_layout
\end_inset
</cell>
......@@ -4245,7 +4245,7 @@ TIME_STAMP_31_0[15:8]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[15:8]\end_layout
TIME_STAMP_L_W[15:8]\end_layout
\end_inset
</cell>
......@@ -4253,7 +4253,7 @@ TIME_STAMP_31_0[15:8]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[15:8]\end_layout
TIME_STAMP_L_W[15:8]\end_layout
\end_inset
</cell>
......@@ -4261,7 +4261,7 @@ TIME_STAMP_31_0[15:8]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[15:8]\end_layout
TIME_STAMP_L_W[15:8]\end_layout
\end_inset
</cell>
......@@ -4525,7 +4525,7 @@ cellcolor{cyan}
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[7:0]\end_layout
TIME_STAMP_L_W[7:0]\end_layout
\end_inset
</cell>
......@@ -4533,7 +4533,7 @@ TIME_STAMP_31_0[7:0]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[7:0]\end_layout
TIME_STAMP_L_W[7:0]\end_layout
\end_inset
</cell>
......@@ -4541,7 +4541,7 @@ TIME_STAMP_31_0[7:0]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[7:0]\end_layout
TIME_STAMP_L_W[7:0]\end_layout
\end_inset
</cell>
......@@ -4549,7 +4549,7 @@ TIME_STAMP_31_0[7:0]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[7:0]\end_layout
TIME_STAMP_L_W[7:0]\end_layout
\end_inset
</cell>
......@@ -4557,7 +4557,7 @@ TIME_STAMP_31_0[7:0]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[7:0]\end_layout
TIME_STAMP_L_W[7:0]\end_layout
\end_inset
</cell>
......@@ -4565,7 +4565,7 @@ TIME_STAMP_31_0[7:0]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[7:0]\end_layout
TIME_STAMP_L_W[7:0]\end_layout
\end_inset
</cell>
......@@ -4573,7 +4573,7 @@ TIME_STAMP_31_0[7:0]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[7:0]\end_layout
TIME_STAMP_L_W[7:0]\end_layout
\end_inset
</cell>
......@@ -4581,7 +4581,7 @@ TIME_STAMP_31_0[7:0]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIME_STAMP_31_0[7:0]\end_layout
TIME_STAMP_L_W[7:0]\end_layout
\end_inset
</cell>
......@@ -4674,7 +4674,7 @@ X\end_layout
\end_layout
\begin_layout Description
TIME_STAMP_31_0 Lower 32 bits of timestamp when the frame should be transmitted or when it was received.
TIME_STAMP_L_W Lower 32 bits of timestamp when the frame should be transmitted or when it was received.
\end_layout
\begin_layout Standard
\begin_inset VSpace bigskip
......@@ -4874,7 +4874,7 @@ cellcolor{cyan}
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[31:24]\end_layout
TIMESTAMP_U_W[31:24]\end_layout
\end_inset
</cell>
......@@ -4882,7 +4882,7 @@ TIMESTAMP_L_W[31:24]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[31:24]\end_layout
TIMESTAMP_U_W[31:24]\end_layout
\end_inset
</cell>
......@@ -4890,7 +4890,7 @@ TIMESTAMP_L_W[31:24]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[31:24]\end_layout
TIMESTAMP_U_W[31:24]\end_layout
\end_inset
</cell>
......@@ -4898,7 +4898,7 @@ TIMESTAMP_L_W[31:24]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[31:24]\end_layout
TIMESTAMP_U_W[31:24]\end_layout
\end_inset
</cell>
......@@ -4906,7 +4906,7 @@ TIMESTAMP_L_W[31:24]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[31:24]\end_layout
TIMESTAMP_U_W[31:24]\end_layout
\end_inset
</cell>
......@@ -4914,7 +4914,7 @@ TIMESTAMP_L_W[31:24]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[31:24]\end_layout
TIMESTAMP_U_W[31:24]\end_layout
\end_inset
</cell>
......@@ -4922,7 +4922,7 @@ TIMESTAMP_L_W[31:24]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[31:24]\end_layout
TIMESTAMP_U_W[31:24]\end_layout
\end_inset
</cell>
......@@ -4930,7 +4930,7 @@ TIMESTAMP_L_W[31:24]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[31:24]\end_layout
TIMESTAMP_U_W[31:24]\end_layout
\end_inset
</cell>
......@@ -5194,7 +5194,7 @@ cellcolor{cyan}
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[23:16]\end_layout
TIMESTAMP_U_W[23:16]\end_layout
\end_inset
</cell>
......@@ -5202,7 +5202,7 @@ TIMESTAMP_L_W[23:16]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[23:16]\end_layout
TIMESTAMP_U_W[23:16]\end_layout
\end_inset
</cell>
......@@ -5210,7 +5210,7 @@ TIMESTAMP_L_W[23:16]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[23:16]\end_layout
TIMESTAMP_U_W[23:16]\end_layout
\end_inset
</cell>
......@@ -5218,7 +5218,7 @@ TIMESTAMP_L_W[23:16]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[23:16]\end_layout
TIMESTAMP_U_W[23:16]\end_layout
\end_inset
</cell>
......@@ -5226,7 +5226,7 @@ TIMESTAMP_L_W[23:16]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[23:16]\end_layout
TIMESTAMP_U_W[23:16]\end_layout
\end_inset
</cell>
......@@ -5234,7 +5234,7 @@ TIMESTAMP_L_W[23:16]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[23:16]\end_layout
TIMESTAMP_U_W[23:16]\end_layout
\end_inset
</cell>
......@@ -5242,7 +5242,7 @@ TIMESTAMP_L_W[23:16]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[23:16]\end_layout
TIMESTAMP_U_W[23:16]\end_layout
\end_inset
</cell>
......@@ -5250,7 +5250,7 @@ TIMESTAMP_L_W[23:16]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[23:16]\end_layout
TIMESTAMP_U_W[23:16]\end_layout
\end_inset
</cell>
......@@ -5514,7 +5514,7 @@ cellcolor{cyan}
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[15:8]\end_layout
TIMESTAMP_U_W[15:8]\end_layout
\end_inset
</cell>
......@@ -5522,7 +5522,7 @@ TIMESTAMP_L_W[15:8]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[15:8]\end_layout
TIMESTAMP_U_W[15:8]\end_layout
\end_inset
</cell>
......@@ -5530,7 +5530,7 @@ TIMESTAMP_L_W[15:8]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[15:8]\end_layout
TIMESTAMP_U_W[15:8]\end_layout
\end_inset
</cell>
......@@ -5538,7 +5538,7 @@ TIMESTAMP_L_W[15:8]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[15:8]\end_layout
TIMESTAMP_U_W[15:8]\end_layout
\end_inset
</cell>
......@@ -5546,7 +5546,7 @@ TIMESTAMP_L_W[15:8]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[15:8]\end_layout
TIMESTAMP_U_W[15:8]\end_layout
\end_inset
</cell>
......@@ -5554,7 +5554,7 @@ TIMESTAMP_L_W[15:8]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[15:8]\end_layout
TIMESTAMP_U_W[15:8]\end_layout
\end_inset
</cell>
......@@ -5562,7 +5562,7 @@ TIMESTAMP_L_W[15:8]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[15:8]\end_layout
TIMESTAMP_U_W[15:8]\end_layout
\end_inset
</cell>
......@@ -5570,7 +5570,7 @@ TIMESTAMP_L_W[15:8]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[15:8]\end_layout
TIMESTAMP_U_W[15:8]\end_layout
\end_inset
</cell>
......@@ -5834,7 +5834,7 @@ cellcolor{cyan}
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[7:0]\end_layout
TIMESTAMP_U_W[7:0]\end_layout
\end_inset
</cell>
......@@ -5842,7 +5842,7 @@ TIMESTAMP_L_W[7:0]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[7:0]\end_layout
TIMESTAMP_U_W[7:0]\end_layout
\end_inset
</cell>
......@@ -5850,7 +5850,7 @@ TIMESTAMP_L_W[7:0]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[7:0]\end_layout
TIMESTAMP_U_W[7:0]\end_layout
\end_inset
</cell>
......@@ -5858,7 +5858,7 @@ TIMESTAMP_L_W[7:0]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[7:0]\end_layout
TIMESTAMP_U_W[7:0]\end_layout
\end_inset
</cell>
......@@ -5866,7 +5866,7 @@ TIMESTAMP_L_W[7:0]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[7:0]\end_layout
TIMESTAMP_U_W[7:0]\end_layout
\end_inset
</cell>
......@@ -5874,7 +5874,7 @@ TIMESTAMP_L_W[7:0]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[7:0]\end_layout
TIMESTAMP_U_W[7:0]\end_layout
\end_inset
</cell>
......@@ -5882,7 +5882,7 @@ TIMESTAMP_L_W[7:0]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[7:0]\end_layout
TIMESTAMP_U_W[7:0]\end_layout
\end_inset
</cell>
......@@ -5890,7 +5890,7 @@ TIMESTAMP_L_W[7:0]\end_layout
\begin_inset Text
\begin_layout Plain Layout
TIMESTAMP_L_W[7:0]\end_layout
TIMESTAMP_U_W[7:0]\end_layout
\end_inset
</cell>
......@@ -5983,7 +5983,7 @@ X\end_layout
\end_layout
\begin_layout Description
TIMESTAMP_L_W Upper 32 bits of timestamp when the frame should be transmitted or when it was received.
TIMESTAMP_U_W Upper 32 bits of timestamp when the frame should be transmitted or when it was received.
\end_layout
\begin_layout Standard
\begin_inset VSpace bigskip
......
This diff is collapsed.
......@@ -494,7 +494,7 @@ Ports\end_layout
\noindent
\align center
\begin_inset Tabular
<lyxtabular columns="4" rows="62" version="3">
<lyxtabular columns="4" rows="63" version="3">
<features islongtable="true" longtabularalignment="center">
<column alignment="center" valignment="top" width="4cm">
<column alignment="center" valignment="top" width="1.2cm">
......@@ -2875,7 +2875,7 @@ Start Measurement of data bit time (in TX Trigger)\end_layout
</cell>
</row>
<row>
<cell alignment="center" bottomline="true" leftline="true" topline="true" usebox="none" valignment="top">
<cell alignment="center" leftline="true" topline="true" usebox="none" valignment="top">
\begin_inset Text
\begin_layout Plain Layout
......@@ -2883,12 +2883,46 @@ gen_first_ssp\end_layout
\end_inset
</cell>
<cell alignment="center" bottomline="true" leftline="true" topline="true" usebox="none" valignment="top">
<cell alignment="center" leftline="true" topline="true" usebox="none" valignment="top">
\begin_inset Text
\begin_layout Plain Layout
out\end_layout
\end_inset
</cell>
<cell alignment="center" leftline="true" topline="true" usebox="none" valignment="top">
\begin_inset Text
\begin_layout Plain Layout
std_logic\end_layout
\end_inset
</cell>
<cell alignment="center" leftline="true" rightline="true" topline="true" usebox="none" valignment="top">
\begin_inset Text
\begin_layout Plain Layout
First SSP generated (in ESI bit)\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="center" bottomline="true" leftline="true" topline="true" usebox="none" valignment="top">
\begin_inset Text
\begin_layout Plain Layout
sync_edge\end_layout
\end_inset
</cell>
<cell alignment="center" bottomline="true" leftline="true" topline="true" usebox="none" valignment="top">
\begin_inset Text
\begin_layout Plain Layout
in\end_layout
\end_inset
</cell>
<cell alignment="center" bottomline="true" leftline="true" topline="true" usebox="none" valignment="top">
......@@ -2903,7 +2937,7 @@ std_logic\end_layout
\begin_inset Text
\begin_layout Plain Layout
First SSP generated (in ESI bit)\end_layout
Synchronization edge\end_layout
\end_inset
</cell>
......
......@@ -222,7 +222,7 @@ Ports\end_layout
\noindent
\align center
\begin_inset Tabular
<lyxtabular columns="4" rows="32" version="3">