Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
HDL
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RTSD
HDL
Commits
be1627d9
Commit
be1627d9
authored
5 years ago
by
Eric Kooistra
Browse files
Options
Downloads
Patches
Plain Diff
Corrected ready = NOT waitrequest.
parent
83d35877
Branches
Branches containing commit
No related tags found
2 merge requests
!28
Master
,
!15
Resolve L2SDP-27
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libraries/base/mm/src/vhdl/mm_latency_adapter.vhd
+12
-5
12 additions, 5 deletions
libraries/base/mm/src/vhdl/mm_latency_adapter.vhd
with
12 additions
and
5 deletions
libraries/base/mm/src/vhdl/mm_latency_adapter.vhd
+
12
−
5
View file @
be1627d9
...
@@ -56,12 +56,14 @@ END mm_latency_adapter;
...
@@ -56,12 +56,14 @@ END mm_latency_adapter;
ARCHITECTURE
str
OF
mm_latency_adapter
IS
ARCHITECTURE
str
OF
mm_latency_adapter
IS
-- Sum of all t_mem_mosi fields widths
: 32 + 72 + 1 (wr) + 1 (rd
)
-- Sum of all t_mem_mosi fields widths
(synthesis will optimize away unused address and data bits
)
CONSTANT
c_data_w
:
NATURAL
:
=
c_mem_address_w
+
c_mem_data_w
+
2
;
CONSTANT
c_data_w
:
NATURAL
:
=
c_mem_address_w
+
c_mem_data_w
+
2
;
-- 32 + 72 + 1 (wr) + 1 (rd) = 106
SIGNAL
in_waitrequest
:
STD_LOGIC
;
SIGNAL
in_data
:
STD_LOGIC_VECTOR
(
c_data_w
-1
DOWNTO
0
);
SIGNAL
in_data
:
STD_LOGIC_VECTOR
(
c_data_w
-1
DOWNTO
0
);
SIGNAL
in_val
:
STD_LOGIC
;
SIGNAL
in_val
:
STD_LOGIC
;
SIGNAL
in_waitrequest
:
STD_LOGIC
;
SIGNAL
in_ready
:
STD_LOGIC
;
SIGNAL
out_ready
:
STD_LOGIC
;
SIGNAL
out_data
:
STD_LOGIC_VECTOR
(
c_data_w
-1
DOWNTO
0
);
SIGNAL
out_data
:
STD_LOGIC_VECTOR
(
c_data_w
-1
DOWNTO
0
);
SIGNAL
out_val
:
STD_LOGIC
;
SIGNAL
out_val
:
STD_LOGIC
;
...
@@ -73,9 +75,14 @@ BEGIN
...
@@ -73,9 +75,14 @@ BEGIN
p_miso
:
PROCESS
(
out_miso
,
in_waitrequest
)
p_miso
:
PROCESS
(
out_miso
,
in_waitrequest
)
BEGIN
BEGIN
in_miso
<=
out_miso
;
in_miso
<=
out_miso
;
--in_miso.rdval <= out_miso.rdval AND NOT in_waitrequest;
in_miso
.
waitrequest
<=
in_waitrequest
;
in_miso
.
waitrequest
<=
in_waitrequest
;
END
PROCESS
;
END
PROCESS
;
-- Account for opposite meaning of waitrequest and ready
in_waitrequest
<=
NOT
in_ready
;
out_ready
<=
NOT
out_miso
.
waitrequest
;
u_rl
:
ENTITY
common_lib
.
common_rl_decrease
u_rl
:
ENTITY
common_lib
.
common_rl_decrease
GENERIC
MAP
(
GENERIC
MAP
(
g_adapt
=>
g_adapt
,
g_adapt
=>
g_adapt
,
...
@@ -85,11 +92,11 @@ BEGIN
...
@@ -85,11 +92,11 @@ BEGIN
rst
=>
mm_rst
,
rst
=>
mm_rst
,
clk
=>
mm_clk
,
clk
=>
mm_clk
,
-- ST sink: RL = 1
-- ST sink: RL = 1
snk_out_ready
=>
in_
waitrequest
,
snk_out_ready
=>
in_
ready
,
snk_in_dat
=>
in_data
,
snk_in_dat
=>
in_data
,
snk_in_val
=>
in_val
,
snk_in_val
=>
in_val
,
-- ST source: RL = 0
-- ST source: RL = 0
src_in_ready
=>
out_
miso
.
waitrequest
,
src_in_ready
=>
out_
ready
,
src_out_dat
=>
out_data
,
src_out_dat
=>
out_data
,
src_out_val
=>
out_val
src_out_val
=>
out_val
);
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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