Skip to content
GitLab
Explore
Sign in
Register
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
49f051ab
Commit
49f051ab
authored
2 years ago
by
Eric Kooistra
Browse files
Options
Downloads
Patches
Plain Diff
Output active bg_ctrl.
parent
138d2921
No related branches found
No related tags found
1 merge request
!288
Resolve L2SDP-836
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
libraries/base/diag/src/vhdl/diag_block_gen.vhd
+3
-0
3 additions, 0 deletions
libraries/base/diag/src/vhdl/diag_block_gen.vhd
libraries/base/diag/src/vhdl/mms_diag_block_gen.vhd
+3
-1
3 additions, 1 deletion
libraries/base/diag/src/vhdl/mms_diag_block_gen.vhd
with
6 additions
and
1 deletion
libraries/base/diag/src/vhdl/diag_block_gen.vhd
+
3
−
0
View file @
49f051ab
...
@@ -81,6 +81,7 @@ entity diag_block_gen is
...
@@ -81,6 +81,7 @@ entity diag_block_gen is
buf_rddat
:
in
std_logic_vector
(
g_buf_dat_w
-1
downto
0
);
buf_rddat
:
in
std_logic_vector
(
g_buf_dat_w
-1
downto
0
);
buf_rdval
:
in
std_logic
;
buf_rdval
:
in
std_logic
;
ctrl
:
in
t_diag_block_gen
;
ctrl
:
in
t_diag_block_gen
;
ctrl_reg
:
out
t_diag_block_gen
;
-- current active ctrl
en_sync
:
in
std_logic
:
=
'1'
;
en_sync
:
in
std_logic
:
=
'1'
;
out_siso
:
in
t_dp_siso
:
=
c_dp_siso_rdy
;
out_siso
:
in
t_dp_siso
:
=
c_dp_siso_rdy
;
out_sosi
:
out
t_dp_sosi
out_sosi
:
out
t_dp_sosi
...
@@ -287,4 +288,6 @@ begin
...
@@ -287,4 +288,6 @@ begin
buf_addr
<=
TO_UVEC
(
r
.
mem_cnt
,
g_buf_addr_w
);
buf_addr
<=
TO_UVEC
(
r
.
mem_cnt
,
g_buf_addr_w
);
buf_rden
<=
r
.
rd_ena
;
buf_rden
<=
r
.
rd_ena
;
ctrl_reg
<=
r
.
ctrl_reg
;
end
rtl
;
end
rtl
;
This diff is collapsed.
Click to expand it.
libraries/base/diag/src/vhdl/mms_diag_block_gen.vhd
+
3
−
1
View file @
49f051ab
...
@@ -140,6 +140,7 @@ ENTITY mms_diag_block_gen IS
...
@@ -140,6 +140,7 @@ ENTITY mms_diag_block_gen IS
reg_tx_seq_mosi
:
IN
t_mem_mosi
:
=
c_mem_mosi_rst
;
-- Tx seq control (one per stream because c_reg_tx_seq_broadcast=FALSE)
reg_tx_seq_mosi
:
IN
t_mem_mosi
:
=
c_mem_mosi_rst
;
-- Tx seq control (one per stream because c_reg_tx_seq_broadcast=FALSE)
reg_tx_seq_miso
:
OUT
t_mem_miso
;
reg_tx_seq_miso
:
OUT
t_mem_miso
;
-- ST interface
-- ST interface
bg_ctrl_active_arr
:
OUT
t_diag_block_gen_arr
(
g_nof_streams
-1
DOWNTO
0
);
usr_siso_arr
:
OUT
t_dp_siso_arr
(
g_nof_streams
-1
DOWNTO
0
);
-- connect when g_use_usr_input=TRUE, else leave not connected
usr_siso_arr
:
OUT
t_dp_siso_arr
(
g_nof_streams
-1
DOWNTO
0
);
-- connect when g_use_usr_input=TRUE, else leave not connected
usr_sosi_arr
:
IN
t_dp_sosi_arr
(
g_nof_streams
-1
DOWNTO
0
)
:
=
(
OTHERS
=>
c_dp_sosi_rst
);
usr_sosi_arr
:
IN
t_dp_sosi_arr
(
g_nof_streams
-1
DOWNTO
0
)
:
=
(
OTHERS
=>
c_dp_sosi_rst
);
out_siso_arr
:
IN
t_dp_siso_arr
(
g_nof_streams
-1
DOWNTO
0
)
:
=
(
OTHERS
=>
c_dp_siso_rdy
);
-- Default xon='1'
out_siso_arr
:
IN
t_dp_siso_arr
(
g_nof_streams
-1
DOWNTO
0
)
:
=
(
OTHERS
=>
c_dp_siso_rdy
);
-- Default xon='1'
...
@@ -283,7 +284,8 @@ BEGIN
...
@@ -283,7 +284,8 @@ BEGIN
buf_rden
=>
st_rd_arr
(
I
),
buf_rden
=>
st_rd_arr
(
I
),
buf_rddat
=>
st_rddata_arr
(
I
),
buf_rddat
=>
st_rddata_arr
(
I
),
buf_rdval
=>
st_rdval_arr
(
I
),
buf_rdval
=>
st_rdval_arr
(
I
),
ctrl
=>
bg_ctrl
,
ctrl
=>
bg_ctrl
,
-- same BG control for all streams
ctrl_reg
=>
bg_ctrl_active_arr
(
I
),
-- active BG control can differ in time per stream
en_sync
=>
en_sync
,
en_sync
=>
en_sync
,
out_siso
=>
bg_src_in_arr
(
I
),
out_siso
=>
bg_src_in_arr
(
I
),
out_sosi
=>
bg_src_out_arr
(
I
)
out_sosi
=>
bg_src_out_arr
(
I
)
...
...
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