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
0
Merge Requests
0
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
48995404
Commit
48995404
authored
Aug 17, 2017
by
Cesar Prados
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wr_endpoint: add length of pkt extending dvalid and eof
parent
6dd4d7ea
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
25 deletions
+22
-25
ep_rx_buffer.vhd
modules/wr_endpoint/ep_rx_buffer.vhd
+4
-8
ep_rx_oob_insert.vhd
modules/wr_endpoint/ep_rx_oob_insert.vhd
+18
-17
No files found.
modules/wr_endpoint/ep_rx_buffer.vhd
View file @
48995404
...
...
@@ -89,14 +89,10 @@ architecture behavioral of ep_rx_buffer is
-- tag = 11
dout
(
17
)
<=
'1'
;
dout
(
16
)
<=
'1'
;
if
(
fab
.
dvalid
=
'1'
)
then
dout
(
15
downto
0
)
<=
fab
.
data
;
else
dout
(
15
)
<=
fab
.
sof
;
dout
(
14
)
<=
fab
.
eof
;
dout
(
13
)
<=
fab
.
error
;
dout
(
12
downto
0
)
<=
(
others
=>
'0'
);
end
if
;
dout
(
15
)
<=
fab
.
sof
;
dout
(
14
)
<=
fab
.
eof
;
dout
(
13
)
<=
fab
.
error
;
dout
(
12
downto
0
)
<=
(
others
=>
'0'
);
valid_tmp
:
=
'1'
;
-- dout_valid <= '1';
elsif
(
fab
.
dvalid
=
'1'
)
then
...
...
modules/wr_endpoint/ep_rx_oob_insert.vhd
View file @
48995404
...
...
@@ -29,6 +29,7 @@ architecture behavioral of ep_rx_oob_insert is
type
t_state
is
(
WAIT_OOB
,
OOB
);
signal
state
:
t_state
;
signal
src_fab_addr
:
std_logic_vector
(
1
downto
0
);
signal
byte_cntr
:
unsigned
(
15
downto
0
);
...
...
@@ -80,11 +81,12 @@ begin
snk_dreq_o
<=
src_dreq_i
;
src_fab_o
.
sof
<=
snk_fab_i
.
sof
;
src_fab_o
.
eof
<=
snk_fab_i
.
eof
;
--
src_fab_o.eof <= snk_fab_i.eof;
src_fab_o
.
ERROR
<=
snk_fab_i
.
ERROR
;
src_fab_o
.
bytesel
<=
snk_fab_i
.
bytesel
;
src_fab_o
.
has_rx_timestamp
<=
snk_fab_i
.
has_rx_timestamp
;
src_fab_o
.
rx_timestamp_valid
<=
snk_fab_i
.
rx_timestamp_valid
;
src_fab_o
.
addr
<=
src_fab_addr
;
p_count_bytes
:
process
(
clk_sys_i
,
rst_n_i
)
begin
-- process
...
...
@@ -93,7 +95,7 @@ begin
snk_fab_i
.
sof
=
'1'
then
byte_cntr
<=
(
others
=>
'0'
);
else
if
(
snk_fab_i
.
dvalid
=
'1'
and
src_fab_
o
.
addr
=
c_WRF_DATA
)
then
if
(
snk_fab_i
.
dvalid
=
'1'
and
src_fab_addr
=
c_WRF_DATA
)
then
if
(
snk_fab_i
.
bytesel
=
'1'
)
then
byte_cntr
<=
byte_cntr
+
1
;
else
...
...
@@ -106,38 +108,37 @@ begin
p_comb_src
:
process
(
state
,
snk_fab_i
,
src_dreq_i
,
regs_i
)
begin
if
(
snk_fab_i
.
has_rx_timestamp
=
'1'
)
then
src_fab_o
.
data
<=
c_WRF_OOB_TYPE_RX
&
(
not
snk_fab_i
.
rx_timestamp_valid
)
&
"000000"
&
regs_i
.
ecr_portid_o
;
src_fab_o
.
dvalid
<=
'1'
;
src_fab_
o
.
addr
<=
c_WRF_OOB
;
src_fab_
addr
<=
c_WRF_OOB
;
else
if
(
state
=
WAIT_OOB
)
then
src_fab_o
.
addr
<=
c_WRF_DATA
;
src_fab_addr
<=
c_WRF_DATA
;
else
src_fab_addr
<=
c_WRF_OOB
;
end
if
;
if
(
snk_fab_i
.
eof
=
'0'
)
then
src_fab_o
.
data
<=
snk_fab_i
.
data
;
src_fab_o
.
dvalid
<=
snk_fab_i
.
dvalid
;
elsif
(
state
=
OOB
)
then
src_fab_o
.
addr
<=
c_WRF_OOB
;
if
(
snk_fab_i
.
eof
=
'1'
)
then
src_fab_o
.
data
<=
std_logic_vector
(
byte_cntr
);
src_fab_o
.
dvalid
<=
'1'
;
else
src_fab_o
.
data
<=
snk_fab_i
.
data
;
src_fab_o
.
dvalid
<=
snk_fab_i
.
dvalid
;
end
if
;
else
src_fab_o
.
data
<=
std_logic_vector
(
byte_cntr
);
src_fab_o
.
dvalid
<=
'1'
;
end
if
;
end
if
;
end
process
;
p_fsm
:
process
(
clk_sys_i
)
begin
if
rising_edge
(
clk_sys_i
)
then
src_fab_o
.
eof
<=
snk_fab_i
.
eof
;
if
rst_n_i
=
'0'
or
regs_i
.
ecr_rx_en_o
=
'0'
then
state
<=
WAIT_OOB
;
else
--src_fab_o.eof <= snk_fab_i.eof;
if
(
snk_fab_i
.
error
=
'1'
or
snk_fab_i
.
sof
=
'1'
)
then
state
<=
WAIT_OOB
;
else
...
...
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