Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
EtherBone Core
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Projects
EtherBone Core
Commits
511b249d
Commit
511b249d
authored
7 years ago
by
Cesar Prados
Browse files
Options
Downloads
Patches
Plain Diff
wrf: add status word to tx
parent
ba955bcb
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
hdl/eb_master_core/eb_master_eth_tx.vhd
+12
-14
12 additions, 14 deletions
hdl/eb_master_core/eb_master_eth_tx.vhd
hdl/eb_slave_core/eb_eth_tx.vhd
+2
-1
2 additions, 1 deletion
hdl/eb_slave_core/eb_eth_tx.vhd
with
14 additions
and
15 deletions
hdl/eb_master_core/eb_master_eth_tx.vhd
+
12
−
14
View file @
511b249d
...
@@ -343,27 +343,25 @@ begin
...
@@ -343,27 +343,25 @@ begin
-- Flag for Checksum field, high when present on s_tx_dat
-- Flag for Checksum field, high when present on s_tx_dat
s_ip_chk_ins
<=
'1'
when
r_output_cnt
=
(
c_eth_len
+
c_ip_chk_pos
)
s_ip_chk_ins
<=
'1'
when
r_output_cnt
=
(
c_eth_len
+
c_ip_chk_pos
)
else
'0'
;
else
'0'
;
-- Flag for TOL field, high when present on s_tx_dat
-- Flag for TOL field, high when present on s_tx_dat
s_udp_len_ins
<=
'1'
when
r_output_cnt
=
(
c_eth_len
+
c_ip_len
+
c_udp_len_pos
)
s_udp_len_ins
<=
'1'
when
r_output_cnt
=
(
c_eth_len
+
c_ip_len
+
c_udp_len_pos
)
else
'0'
;
else
'0'
;
-- Correct checksum including TOL, valid on s_ip_chk_ins HI
-- Correct checksum including TOL, valid on s_ip_chk_ins HI
s_ip_chk
<=
not
(
std_logic_vector
(
unsigned
(
s_tx_dat
)
+
unsigned
(
r_ip_tol
)));
s_ip_chk
<=
not
(
std_logic_vector
(
unsigned
(
s_tx_dat
)
+
unsigned
(
r_ip_tol
)));
-- Output Mux for otf insertion
-- Output Mux for otf insertion
s_otf_mux
<=
s_udp_len_ins
&
s_ip_chk_ins
&
s_ip_tol_ins
&
s_eth_typ_len_ins
;
s_otf_mux
<=
s_udp_len_ins
&
s_ip_chk_ins
&
s_ip_tol_ins
&
s_eth_typ_len_ins
;
otf_mux
:
with
s_otf_mux
select
src_o
.
dat
<=
s_tx_dat
when
"0000"
,
r_eth_typ_len
when
"0001"
,
r_ip_tol
when
"0010"
,
s_ip_chk
when
"0100"
,
r_udp_len
when
"1000"
,
s_tx_dat
when
others
;
src_o
.
dat
<=
s_tx_dat
when
s_otf_mux
=
"0000"
and
s_tx_typ
=
'0'
else
x"4000"
when
s_otf_mux
=
"0000"
and
s_tx_typ
=
'1'
else
r_eth_typ_len
when
s_otf_mux
=
"0001"
else
r_ip_tol
when
s_otf_mux
=
"0010"
else
s_ip_chk
when
s_otf_mux
=
"0100"
else
r_udp_len
when
s_otf_mux
=
"1000"
else
s_tx_dat
;
-- get TOL from first element in commit fifo
-- get TOL from first element in commit fifo
otf_mod_ip_hdr
:
process
(
clk_i
)
otf_mod_ip_hdr
:
process
(
clk_i
)
begin
begin
...
...
This diff is collapsed.
Click to expand it.
hdl/eb_slave_core/eb_eth_tx.vhd
+
2
−
1
View file @
511b249d
...
@@ -289,7 +289,8 @@ begin
...
@@ -289,7 +289,8 @@ begin
src_o
.
adr
<=
c_WRF_STATUS
when
s_tx_typ
=
'1'
else
c_WRF_DATA
;
src_o
.
adr
<=
c_WRF_STATUS
when
s_tx_typ
=
'1'
else
c_WRF_DATA
;
src_o
.
we
<=
'1'
;
src_o
.
we
<=
'1'
;
src_o
.
sel
<=
"11"
;
src_o
.
sel
<=
"11"
;
src_o
.
dat
<=
s_tx_dat
;
src_o
.
dat
<=
x"8000"
when
s_tx_typ
=
'1'
else
-- c_WRF_STATUS
s_tx_dat
;
-- c_WRF_DATA
s_tx_pop
<=
not
s_tx_empty
and
not
(
s_tx_cyc
and
src_i
.
stall
);
s_tx_pop
<=
not
s_tx_empty
and
not
(
s_tx_cyc
and
src_i
.
stall
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment