Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
ccn_packet
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
ccn_packet
Commits
1cd250a4
Commit
1cd250a4
authored
May 30, 2024
by
BRONES Romain
Browse files
Options
Downloads
Patches
Plain Diff
feat(ccnpack): Add latch sequence registers
parent
d445476f
Branches
Branches containing commit
Tags
1.2
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
hdl/ccn_pack.vhd
+11
-0
11 additions, 0 deletions
hdl/ccn_pack.vhd
hdl/top_ccn_packeter.vhd
+3
-0
3 additions, 0 deletions
hdl/top_ccn_packeter.vhd
rdl/ccn_packeter.rdl
+11
-0
11 additions, 0 deletions
rdl/ccn_packeter.rdl
with
25 additions
and
0 deletions
hdl/ccn_pack.vhd
+
11
−
0
View file @
1cd250a4
...
@@ -23,11 +23,14 @@ entity ccn_pack is
...
@@ -23,11 +23,14 @@ entity ccn_pack is
packet_timeout
:
in
std_logic_vector
(
15
downto
0
);
packet_timeout
:
in
std_logic_vector
(
15
downto
0
);
expect_pkt_cnt
:
in
std_logic_vector
(
7
downto
0
);
expect_pkt_cnt
:
in
std_logic_vector
(
7
downto
0
);
timeref
:
in
std_logic_vector
(
63
downto
0
);
timeref
:
in
std_logic_vector
(
63
downto
0
);
latch_seq
:
in
std_logic
;
-- Status
-- Status
status_err_seq
:
out
std_logic
;
status_err_seq
:
out
std_logic
;
status_err_timeout
:
out
std_logic
;
status_err_timeout
:
out
std_logic
;
status_frame_count
:
out
std_logic_vector
(
31
downto
0
);
status_frame_count
:
out
std_logic_vector
(
31
downto
0
);
latched_seq1
:
out
std_logic_vector
(
15
downto
0
);
latched_seq2
:
out
std_logic_vector
(
15
downto
0
);
-- AXIS Packet input
-- AXIS Packet input
s_axis_tdata
:
in
std_logic_vector
(
G_S_TDATA_W
-1
downto
0
);
s_axis_tdata
:
in
std_logic_vector
(
G_S_TDATA_W
-1
downto
0
);
...
@@ -150,10 +153,18 @@ begin
...
@@ -150,10 +153,18 @@ begin
prev_seq_r
<=
(
others
=>
'0'
);
prev_seq_r
<=
(
others
=>
'0'
);
new_seq_valid_r
<=
'0'
;
new_seq_valid_r
<=
'0'
;
m_tvalid_r
<=
'0'
;
m_tvalid_r
<=
'0'
;
latched_seq1
<=
(
others
=>
'0'
);
latched_seq2
<=
(
others
=>
'0'
);
elsif
rising_edge
(
aclk
)
then
elsif
rising_edge
(
aclk
)
then
if
(
pkt_reg_tvalid
and
pkt_reg_tready
)
=
'1'
then
if
(
pkt_reg_tvalid
and
pkt_reg_tready
)
=
'1'
then
prev_seq_r
<=
pkt_reg_tuser
;
prev_seq_r
<=
pkt_reg_tuser
;
new_seq_valid_r
<=
'1'
;
new_seq_valid_r
<=
'1'
;
if
latch_seq
=
'0'
and
(
pkt_reg_tuser
/=
prev_seq_r
)
then
latched_seq1
<=
std_logic_vector
(
resize
(
unsigned
(
pkt_reg_tuser
),
16
));
latched_seq2
<=
std_logic_vector
(
resize
(
unsigned
(
prev_seq_r
),
16
));
end
if
;
end
if
;
end
if
;
m_tvalid_r
<=
pkt_reg_tvalid
;
m_tvalid_r
<=
pkt_reg_tvalid
;
end
if
;
end
if
;
...
...
This diff is collapsed.
Click to expand it.
hdl/top_ccn_packeter.vhd
+
3
−
0
View file @
1cd250a4
...
@@ -120,11 +120,14 @@ begin
...
@@ -120,11 +120,14 @@ begin
packet_timeout
=>
addrmap_o
.
timeout
.
data
.
data
,
packet_timeout
=>
addrmap_o
.
timeout
.
data
.
data
,
expect_pkt_cnt
=>
addrmap_o
.
npacket
.
data
.
data
,
expect_pkt_cnt
=>
addrmap_o
.
npacket
.
data
.
data
,
timeref
=>
timeref
,
timeref
=>
timeref
,
latch_seq
=>
addrmap_o
.
control
.
latchseq
.
data
(
0
),
-- Status
-- Status
status_err_seq
=>
s_err_seq
,
status_err_seq
=>
s_err_seq
,
status_err_timeout
=>
s_err_timeout
,
status_err_timeout
=>
s_err_timeout
,
status_frame_count
=>
addrmap_i
.
packeter_count
.
data
.
data
,
status_frame_count
=>
addrmap_i
.
packeter_count
.
data
.
data
,
latched_seq1
=>
addrmap_i
.
latched_seq1
.
data
.
data
,
latched_seq2
=>
addrmap_i
.
latched_seq2
.
data
.
data
,
-- AXIS Packet input
-- AXIS Packet input
s_axis_tdata
=>
s_axis_tdata
,
s_axis_tdata
=>
s_axis_tdata
,
...
...
This diff is collapsed.
Click to expand it.
rdl/ccn_packeter.rdl
+
11
−
0
View file @
1cd250a4
...
@@ -48,6 +48,7 @@ addrmap ccn_packeter {
...
@@ -48,6 +48,7 @@ addrmap ccn_packeter {
desc="Packeter control.";
desc="Packeter control.";
default hw=r; default sw=rw;
default hw=r; default sw=rw;
field {desc="Enable the BPM packeter.";} ENABLE;
field {desc="Enable the BPM packeter.";} ENABLE;
field {desc="Latch sequence registers";} LATCHSEQ;
} CONTROL;
} CONTROL;
reg {
reg {
...
@@ -79,4 +80,14 @@ addrmap ccn_packeter {
...
@@ -79,4 +80,14 @@ addrmap ccn_packeter {
field {desc="Start the BPM packeter.";} RESET;
field {desc="Start the BPM packeter.";} RESET;
} RESET_ERROR;
} RESET_ERROR;
reg {
desc="Latched sequence register 1";
field {hw=w; sw=r;} data[16];
} LATCHED_SEQ1;
reg {
desc="Latched sequence register 2";
field {hw=w; sw=r;} data[16];
} LATCHED_SEQ2;
};
};
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