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
978dff8c
Commit
978dff8c
authored
11 years ago
by
Mathias Kreider
Browse files
Options
Downloads
Patches
Plain Diff
fixed bugs in ebm
- flush command no longer ignored when busy - commit_len_fifo write pointer bug fixed
parent
529818ee
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
hdl/eb_master_core/eb_commit_len_fifo.vhd
+7
-7
7 additions, 7 deletions
hdl/eb_master_core/eb_commit_len_fifo.vhd
hdl/eb_master_core/eb_framer.vhd
+1
-1
1 addition, 1 deletion
hdl/eb_master_core/eb_framer.vhd
hdl/eb_master_core/eb_master_top.vhd
+3
-2
3 additions, 2 deletions
hdl/eb_master_core/eb_master_top.vhd
with
11 additions
and
10 deletions
hdl/eb_master_core/eb_commit_len_fifo.vhd
+
7
−
7
View file @
978dff8c
...
...
@@ -128,18 +128,18 @@ begin
r_cnt
<=
(
others
=>
'0'
);
r_len
<=
(
others
=>
'0'
);
e_idx
<=
w_idx1
;
w_idx
<=
w_idx1
+
1
;
elsif
w_abort_i
=
'1'
then
r_len
<=
(
others
=>
'0'
);
w_idx
<=
e_idx
+
1
;
else
w_idx
<=
w_idx1
;
end
if
;
if
w_push_i
=
'1'
then
r_len
<=
r_len
+
to_unsigned
((
g_width
/
8
),
r_len
'length
);
end
if
;
if
w_abort_i
=
'1'
then
r_len
<=
(
others
=>
'0'
);
w_idx
<=
e_idx
+
1
;
else
w_idx
<=
w_idx1
;
end
if
;
-- Compare the newest pointers
if
(
w_idx1
xor
c_high
)
=
r_idx1
then
...
...
This diff is collapsed.
Click to expand it.
hdl/eb_master_core/eb_framer.vhd
+
1
−
1
View file @
978dff8c
...
...
@@ -206,7 +206,7 @@ begin
r_dat_o
=>
ctrl_fifo_q
);
op_fifo_pop
<=
((
pop_state
and
(
tx_stb
and
not
master_i
.
stall
))
or
op_pop
)
and
not
op_fifo_empty
;
op_fifo_push
<=
(
cyc
and
stb
and
not
r_stall
)
and
not
op_fifo_full
;
op_fifo_push
<=
(
(
cyc
and
stb
and
not
r_stall
)
or
tx_send_now_i
)
and
not
op_fifo_full
;
op_fifo_d
<=
dat
when
we
=
'1'
else
adr
;
...
...
This diff is collapsed.
Click to expand it.
hdl/eb_master_core/eb_master_top.vhd
+
3
−
2
View file @
978dff8c
...
...
@@ -148,8 +148,8 @@ begin
-- |_________|
--SLAVE IF
s_slave_framer_i
.
cyc
<=
slave_i
.
cyc
or
s_tx_send_now
;
s_slave_framer_i
.
stb
<=
(
slave_i
.
stb
and
slave_i
.
adr
(
c_dat_bit
))
or
s_tx_send_now
;
s_slave_framer_i
.
cyc
<=
slave_i
.
cyc
;
s_slave_framer_i
.
stb
<=
(
slave_i
.
stb
and
slave_i
.
adr
(
c_dat_bit
));
s_slave_framer_i
.
we
<=
slave_i
.
adr
(
c_rw_bit
);
s_slave_framer_i
.
adr
<=
s_adr_hi
&
slave_i
.
adr
(
slave_i
.
adr
'left
-
g_adr_bits_hi
downto
0
);
s_slave_framer_i
.
dat
<=
slave_i
.
dat
;
...
...
@@ -162,6 +162,7 @@ begin
slave_o
.
rty
<=
'0'
;
framer
:
eb_framer
PORT
MAP
(
clk_i
=>
clk_i
,
...
...
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