Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
E
EtherBone Core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
EtherBone Core
Commits
68731804
Commit
68731804
authored
Jun 16, 2020
by
Mathias Kreider
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
EBM: fixed bogus TX data injection when send is called on empty EB data
parent
2f068985
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
eb_framer.vhd
hdl/eb_master_core/eb_framer.vhd
+3
-1
No files found.
hdl/eb_master_core/eb_framer.vhd
View file @
68731804
...
...
@@ -66,6 +66,7 @@ signal s_slave_stall,
r_slave_ack
:
std_logic
;
signal
send_now
,
s_tx_send_now
,
s_not_idle
,
r_tx_send_now
:
std_logic
;
-- queued version
...
...
@@ -223,13 +224,14 @@ begin
s_tx_push
<=
(
tx_cyc
and
tx_stb
and
not
master_i
.
stall
);
op_fifo_pop
<=
(
s_tx_push
or
send_now
)
and
r_pop_cmd
and
not
op_fifo_empty
;
op_fifo_push
<=
((
slave_i
.
cyc
and
slave_i
.
stb
and
not
s_slave_stall
)
or
s_tx_send_now
)
and
not
op_fifo_full
;
op_fifo_push
<=
((
slave_i
.
cyc
and
slave_i
.
stb
and
not
s_slave_stall
)
or
(
s_tx_send_now
and
s_not_idle
)
)
and
not
op_fifo_full
;
op_fifo_d
(
31
downto
0
)
<=
slave_i
.
dat
when
slave_i
.
we
=
'1'
else
slave_i
.
adr
;
op_fifo_d
(
32
)
<=
s_tx_send_now
;
--prolong tx_send_now if the buffer is full until it can be written
s_tx_send_now
<=
r_tx_send_now
or
tx_send_now_i
;
s_not_idle
<=
'0'
when
r_state
=
S_IDLE
else
'1'
;
-- send must be in order, so it comes from the op buffer
send_now
<=
op_fifo_q
(
32
)
when
op_fifo_empty
=
'0'
else
'0'
;
...
...
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