Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
combpm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
DG
FOFB
combpm
Commits
0aaa7af0
Commit
0aaa7af0
authored
1 year ago
by
BRONES Romain
Browse files
Options
Downloads
Plain Diff
fix:Filter table alignment
* Table is now properly aligned * Remove legacy tready (not used)
parents
73ef0ccf
48e5f8d5
No related branches found
Branches containing commit
Tags
1.1.0
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
hdl/combpm_protocol_electron.vhd
+1
-8
1 addition, 8 deletions
hdl/combpm_protocol_electron.vhd
hdl/top_combpm_electron.vhd
+6
-8
6 additions, 8 deletions
hdl/top_combpm_electron.vhd
rdl/combpm.rdl
+2
-2
2 additions, 2 deletions
rdl/combpm.rdl
with
9 additions
and
18 deletions
hdl/combpm_protocol_electron.vhd
+
1
−
8
View file @
0aaa7af0
...
...
@@ -18,7 +18,6 @@ entity combpm_protocol_electron is
-- AXIS interface
m_axis_m2s
:
out
t_bpmpacket_axis_m2s
;
m_axis_s2m
:
in
t_bpmpacket_axis_s2m
;
-- Status and control interface
soft_reset
:
in
std_logic
;
-- Reset all counters.
...
...
@@ -260,14 +259,8 @@ begin
-- AXIS TVALID
m_axi_tvalid
<=
'1'
;
else
-- Acknowledge transfer
if
m_axis_s2m
.
tready
=
'1'
then
m_axi_tvalid
<=
'0'
;
end
if
;
m_axi_tvalid
<=
'0'
;
end
if
;
end
if
;
end
process
p_axis
;
...
...
This diff is collapsed.
Click to expand it.
hdl/top_combpm_electron.vhd
+
6
−
8
View file @
0aaa7af0
...
...
@@ -95,7 +95,6 @@ architecture struct of top_combpm_electron is
signal
cdc_control_array_bpm
:
std_logic_vector
(
2
downto
0
);
-- CDC, clock bpm side
signal
m_axis_decoded_m2s
:
t_bpmpacket_axis_m2s
;
signal
m_axis_decoded_s2m
:
t_bpmpacket_axis_s2m
;
-- warning: TREADY is ignored !
begin
...
...
@@ -237,7 +236,6 @@ begin
gt_datarx
=>
gt_datarx
,
m_axis_m2s
=>
m_axis_decoded_m2s
,
m_axis_s2m
=>
m_axis_decoded_s2m
,
mc_time
=>
mc_time
,
soft_reset
=>
addrmap_w
.
PROTOCOL
.
SOFTRESET
.
data
(
0
),
...
...
@@ -350,12 +348,12 @@ begin
m_axis_tvalid
=>
m_axis_tvalid
,
-- Table configuration interface
pi_table_en
=>
addrmap_r
.
table
.
en
,
pi_table_we
=>
addrmap_r
.
table
.
we
,
pi_table_addr
=>
addrmap_r
.
table
.
addr
(
C_W_ADDR_TABLE
-1
downto
0
),
pi_table_data
=>
addrmap_r
.
table
.
data
,
po_table_data
=>
addrmap_w
.
table
.
data
pi_table_en
=>
addrmap_r
.
filter
table
.
en
,
pi_table_we
=>
addrmap_r
.
filter
table
.
we
,
pi_table_addr
=>
addrmap_r
.
filter
table
.
addr
(
C_W_ADDR_TABLE
-1
downto
0
),
pi_table_data
=>
addrmap_r
.
filter
table
.
data
(
7
downto
0
)
,
po_table_data
=>
addrmap_w
.
filter
table
.
data
(
7
downto
0
)
);
addrmap_w
.
filtertable
.
data
(
31
downto
8
)
<=
(
others
=>
'0'
);
end
architecture
struct
;
This diff is collapsed.
Click to expand it.
rdl/combpm.rdl
+
2
−
2
View file @
0aaa7af0
...
...
@@ -116,8 +116,8 @@ addrmap combpm {
external mem {
desc = "BPM filter table";
memwidth =
8
;
memwidth =
32
;
mementries = 2**`C_W_ADDR_TABLE;
}
TABLE @0x200
;
}
FILTERTABLE
;
};
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