Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
White Rabbit core collection
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
30
Issues
30
List
Board
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Schedules
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
White Rabbit core collection
Commits
d582d42b
Commit
d582d42b
authored
May 10, 2019
by
Tomasz Wlostowski
Committed by
Maciej Lipinski
May 13, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wr_streamers: post-cleanup/rebase fixes
parent
2ca37845
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
1 deletion
+6
-1
fixed_latency_delay.vhd
modules/wr_streamers/fixed_latency_delay.vhd
+2
-0
fixed_latency_ts_match.vhd
modules/wr_streamers/fixed_latency_ts_match.vhd
+3
-1
xtx_streamer.vhd
modules/wr_streamers/xtx_streamer.vhd
+1
-0
No files found.
modules/wr_streamers/fixed_latency_delay.vhd
View file @
d582d42b
...
@@ -227,9 +227,11 @@ begin
...
@@ -227,9 +227,11 @@ begin
ts_tai_i
=>
fifo_target_ts_tai
,
ts_tai_i
=>
fifo_target_ts_tai
,
ts_cycles_i
=>
fifo_target_ts_cycles
,
ts_cycles_i
=>
fifo_target_ts_cycles
,
ts_latency_i
=>
rx_streamer_cfg_i
.
fixed_latency
,
ts_latency_i
=>
rx_streamer_cfg_i
.
fixed_latency
,
ts_timeout_i
=>
rx_streamer_cfg_i
.
fixed_latency_timeout
,
tm_time_valid_i
=>
tm_time_valid_i
,
tm_time_valid_i
=>
tm_time_valid_i
,
tm_tai_i
=>
tm_tai_i
,
tm_tai_i
=>
tm_tai_i
,
tm_cycles_i
=>
tm_cycles_i
,
tm_cycles_i
=>
tm_cycles_i
,
timeout_o
=>
delay_timeout
,
match_o
=>
delay_match
,
match_o
=>
delay_match
,
late_o
=>
delay_miss
);
late_o
=>
delay_miss
);
...
...
modules/wr_streamers/fixed_latency_ts_match.vhd
View file @
d582d42b
...
@@ -107,9 +107,11 @@ begin
...
@@ -107,9 +107,11 @@ begin
if
g_clk_ref_rate
=
62500000
then
if
g_clk_ref_rate
=
62500000
then
tm_cycles_scaled
<=
unsigned
(
tm_cycles_i
&
'0'
);
tm_cycles_scaled
<=
unsigned
(
tm_cycles_i
&
'0'
);
ts_latency_scaled
<=
unsigned
(
ts_latency_i
&
'0'
);
ts_latency_scaled
<=
unsigned
(
ts_latency_i
&
'0'
);
ts_timeout_scaled
<=
unsigned
(
ts_timeout_i
&
'0'
);
elsif
g_clk_ref_rate
=
125000000
then
elsif
g_clk_ref_rate
=
125000000
then
tm_cycles_scaled
<=
unsigned
(
'0'
&
tm_cycles_i
);
tm_cycles_scaled
<=
unsigned
(
'0'
&
tm_cycles_i
);
ts_latency_scaled
<=
unsigned
(
'0'
&
ts_latency_i
);
ts_latency_scaled
<=
unsigned
(
'0'
&
ts_latency_i
);
ts_timeout_scaled
<=
unsigned
(
'0'
&
ts_timeout_i
);
else
else
report
"Unsupported g_clk_ref_rate (62.5 / 125 MHz)"
severity
failure
;
report
"Unsupported g_clk_ref_rate (62.5 / 125 MHz)"
severity
failure
;
end
if
;
end
if
;
...
@@ -182,7 +184,7 @@ begin
...
@@ -182,7 +184,7 @@ begin
ts_timeout_tai
<=
ts_timeout_tai
+
1
;
ts_timeout_tai
<=
ts_timeout_tai
+
1
;
end
if
;
end
if
;
S
tate
<=
CHECK_LATE
;
s
tate
<=
CHECK_LATE
;
when
CHECK_LATE
=>
when
CHECK_LATE
=>
...
...
modules/wr_streamers/xtx_streamer.vhd
View file @
d582d42b
...
@@ -199,6 +199,7 @@ architecture rtl of xtx_streamer is
...
@@ -199,6 +199,7 @@ architecture rtl of xtx_streamer is
signal
tag_cycles
:
std_logic_vector
(
27
downto
0
);
signal
tag_cycles
:
std_logic_vector
(
27
downto
0
);
signal
tag_valid
,
tag_valid_latched
:
std_logic
;
signal
tag_valid
,
tag_valid_latched
:
std_logic
;
signal
tag_error
:
std_logic
;
signal
link_ok_delay_cnt
:
unsigned
(
25
downto
0
);
signal
link_ok_delay_cnt
:
unsigned
(
25
downto
0
);
signal
link_ok_delay_expired
:
std_logic
;
signal
link_ok_delay_expired
:
std_logic
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment