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
6ea88194
Commit
6ea88194
authored
3 years ago
by
Daniel van der Schuur
Browse files
Options
Downloads
Patches
Plain Diff
-Cleaned code.
parent
4ce74009
No related branches found
No related tags found
1 merge request
!137
st_histogram updates. Ready for integration in LOFAR2.
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libraries/dsp/st/src/vhdl/st_histogram.vhd
+1
-15
1 addition, 15 deletions
libraries/dsp/st/src/vhdl/st_histogram.vhd
with
1 addition
and
15 deletions
libraries/dsp/st/src/vhdl/st_histogram.vhd
+
1
−
15
View file @
6ea88194
...
...
@@ -156,9 +156,6 @@ ARCHITECTURE rtl OF st_histogram IS
SIGNAL
bin_arbiter_rd_ram_pointer
:
STD_LOGIC
;
SIGNAL
prv_bin_arbiter_rd_ram_pointer
:
STD_LOGIC
;
SIGNAL
read_allowed
:
BOOLEAN
;
SIGNAL
prv_read_allowed
:
BOOLEAN
;
SIGNAL
nxt_bin_arbiter_wr_mosi
:
t_mem_mosi
;
SIGNAL
bin_arbiter_wr_mosi
:
t_mem_mosi
;
SIGNAL
bin_arbiter_rd_mosi
:
t_mem_mosi
;
...
...
@@ -389,22 +386,11 @@ BEGIN
-- bin_arbiter_rd_mosi (rd requests to RAM)
-- bin_reader_miso (carries the bins requested by bin_reader)
-------------------------------------------------------------------------------
-- Really simple arbitration: always allow writes, only allow reads when possible (rd_addr != wr_addr).
read_allowed
<=
FALSE
WHEN
bin_writer_mosi
.
wr
=
'1'
AND
bin_reader_mosi
.
rd
=
'1'
AND
bin_writer_mosi
.
address
=
bin_reader_mosi
.
address
ELSE
TRUE
;
-- save previous read_allowed
p_prv_read_allowed
:
PROCESS
(
dp_rst
,
dp_clk
)
IS
BEGIN
IF
dp_rst
=
'1'
THEN
prv_read_allowed
<=
FALSE
;
ELSIF
RISING_EDGE
(
dp_clk
)
THEN
prv_read_allowed
<=
read_allowed
;
END
IF
;
END
PROCESS
;
-- Forward MOSI buses
-- . RD MOSI
bin_arbiter_rd_mosi
.
wr
<=
'0'
;
bin_arbiter_rd_mosi
.
rd
<=
bin_reader_mosi
.
rd
WHEN
read_allowed
ELSE
'0'
;
bin_arbiter_rd_mosi
.
rd
<=
bin_reader_mosi
.
rd
;
bin_arbiter_rd_mosi
.
address
<=
bin_reader_mosi
.
address
;
-- . WR MOSI
bin_arbiter_wr_mosi
.
rd
<=
'0'
;
...
...
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