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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
DG
FOFB
combpm
Commits
52b790db
Commit
52b790db
authored
1 year ago
by
BRONES Romain
Browse files
Options
Downloads
Patches
Plain Diff
fix; Syntax fix
parent
77e3ffd4
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
hdl/combpm_packet_filter.vhd
+4
-6
4 additions, 6 deletions
hdl/combpm_packet_filter.vhd
hdl/top_combpm_electron.vhd
+2
-2
2 additions, 2 deletions
hdl/top_combpm_electron.vhd
tcl/main.tcl
+5
-5
5 additions, 5 deletions
tcl/main.tcl
with
11 additions
and
13 deletions
hdl/combpm_packet_filter.vhd
+
4
−
6
View file @
52b790db
library
ieee
;
us
e
ieee
.
std_logic_1164
.
all
;
US
e
ieee
.
std_logic_1164
.
all
;
use
ieee
.
numeric_std
.
all
;
...
...
@@ -7,6 +7,7 @@ library desy;
use
desy
.
ram_tdp
;
use
work
.
pkg_combpm
.
C_W_BPMID
;
use
work
.
pkg_combpm
.
C_W_TDEST
;
entity
combpm_packet_filter
is
generic
(
...
...
@@ -26,7 +27,7 @@ entity combpm_packet_filter is
-- AXIS MASTER INTERFACE
m_axis_tvalid
:
out
std_logic
;
m_axis_tdata
:
out
std_logic_vector
(
G_W_TDATA
-1
downto
0
);
m_axis_tdest
:
out
std_logic_vector
(
C_TDEST
_W
-1
downto
0
);
m_axis_tdest
:
out
std_logic_vector
(
C_
W_
TDEST
-1
downto
0
);
-- Table configuration interface
pi_table_en
:
in
std_logic
;
...
...
@@ -51,12 +52,9 @@ architecture rtl of combpm_packet_filter is
signal
table_data
:
std_logic_vector
(
7
downto
0
);
signal
tvalid_r
:
std_logic_vector
(
1
downto
0
);
signal
zero_packet
:
std_logic_vector
(
C_TDATA_W
-1
downto
0
);
begin
zero_packet
<=
(
others
=>
'0'
);
----------------------
-- STREAM REGISTERS --
----------------------
...
...
@@ -86,7 +84,7 @@ begin
-----------------
-- AXIS OUTPUT --
-----------------
m_axis_tdest
<=
std_logic_vector
(
resize
(
unsigned
(
table_data
(
6
downto
0
)),
C_TDEST
_W
));
m_axis_tdest
<=
std_logic_vector
(
resize
(
unsigned
(
table_data
(
6
downto
0
)),
C_
W_
TDEST
));
m_axis_tdata
<=
r2_tdata
;
m_axis_tvalid
<=
tvalid_r
(
tvalid_r
'left
)
and
table_data
(
7
);
...
...
This diff is collapsed.
Click to expand it.
hdl/top_combpm_electron.vhd
+
2
−
2
View file @
52b790db
...
...
@@ -271,7 +271,7 @@ begin
mc_time
=>
mc_time
,
soft_reset
=>
addrmap_r
.
RESET
.
SOFTRESET
.
data
(
0
),
seq_offset
=>
signed
(
addrmap_r
.
SEQ_OFFSET
.
data
),
seq_offset
=>
signed
(
addrmap_r
.
SEQ_OFFSET
.
data
.
data
),
frame_seq_cnt
=>
frame_seq_cnt
,
frame_valid_cnt
=>
frame_valid_cnt
,
frame_invalid_cnt
=>
frame_invalid_cnt
,
...
...
@@ -383,7 +383,7 @@ begin
-- AXIS SLAVE INTERFACE
m_axis_tdest
=>
m_axis_tdest
,
m_axis_tdata
=>
m_axis_tdata
_filt
,
m_axis_tdata
=>
m_axis_
filt_
tdata
,
m_axis_tvalid
=>
m_axis_tvalid
,
-- Table configuration interface
...
...
This diff is collapsed.
Click to expand it.
tcl/main.tcl
+
5
−
5
View file @
52b790db
...
...
@@ -20,11 +20,11 @@ proc setSources {} {
# Generate VHDL package with modversion
genModVerFile VHDL ../hdl/pkg_combpm_version.vhd
lappend Vhdl ../hdl/pkg_combpm_version.vhd
lappend Vhdl ../hdl/pkg_combpm.vhd
lappend Vhdl ../hdl/combpm_protocol_electron.vhd
lappend Vhdl ../hdl/top_combpm_electron.vhd
lappend Vhdl ../hdl/combpm_packet_filter.vhd
lappend Vhdl
{
"
../hdl/pkg_combpm_version.vhd
"
"VHDL 2008"
}
lappend Vhdl
{
"
../hdl/pkg_combpm.vhd
"
"VHDL 2008"
}
lappend Vhdl
{
"
../hdl/combpm_protocol_electron.vhd
"
"VHDL 2008"
}
lappend Vhdl
{
"
../hdl/top_combpm_electron.vhd
"
"VHDL 2008"
}
lappend Vhdl
{
"
../hdl/combpm_packet_filter.vhd
"
"VHDL 2008"
}
}
...
...
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