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
371fa51d
Commit
371fa51d
authored
3 years ago
by
BRONES Romain
Browse files
Options
Downloads
Patches
Plain Diff
Increase counter bit width to 32
* Allow the possibility of counting above 65535
parent
ef3908b5
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_protocol_electron.vhd
+8
-8
8 additions, 8 deletions
hdl/combpm_protocol_electron.vhd
hdl/top_combpm_electron.vhd
+8
-8
8 additions, 8 deletions
hdl/top_combpm_electron.vhd
rdl/combpm_ctrl.rdl
+10
-6
10 additions, 6 deletions
rdl/combpm_ctrl.rdl
with
26 additions
and
22 deletions
hdl/combpm_protocol_electron.vhd
+
8
−
8
View file @
371fa51d
...
...
@@ -31,10 +31,10 @@ entity combpm_protocol_electron is
-- Status and control interface
soft_reset
:
in
std_logic
;
frame_seq_cnt
:
out
std_logic_vector
(
15
downto
0
);
frame_valid_cnt
:
out
std_logic_vector
(
1
5
downto
0
);
frame_invalid_cnt
:
out
std_logic_vector
(
1
5
downto
0
);
frame_valid_rate
:
out
std_logic_vector
(
1
5
downto
0
);
frame_invalid_rate
:
out
std_logic_vector
(
1
5
downto
0
);
frame_valid_cnt
:
out
std_logic_vector
(
3
1
downto
0
);
frame_invalid_cnt
:
out
std_logic_vector
(
3
1
downto
0
);
frame_valid_rate
:
out
std_logic_vector
(
3
1
downto
0
);
frame_invalid_rate
:
out
std_logic_vector
(
3
1
downto
0
);
cnt_seq_mismatch
:
out
std_logic
;
seq_discontinuity
:
out
std_logic
;
frame_error
:
out
std_logic
...
...
@@ -85,10 +85,10 @@ architecture rtl of combpm_protocol_electron is
signal
last_cnt_seq_r
:
unsigned
(
15
downto
0
);
signal
cnt_frame_seq_r
:
unsigned
(
15
downto
0
);
signal
cnt_valid_r
:
unsigned
(
1
5
downto
0
);
signal
cnt_invalid_r
:
unsigned
(
1
5
downto
0
);
signal
rate_valid_r
:
unsigned
(
1
5
downto
0
);
signal
rate_invalid_r
:
unsigned
(
1
5
downto
0
);
signal
cnt_valid_r
:
unsigned
(
3
1
downto
0
);
signal
cnt_invalid_r
:
unsigned
(
3
1
downto
0
);
signal
rate_valid_r
:
unsigned
(
3
1
downto
0
);
signal
rate_invalid_r
:
unsigned
(
3
1
downto
0
);
signal
packet
:
t_combpm_axis_packet
;
...
...
This diff is collapsed.
Click to expand it.
hdl/top_combpm_electron.vhd
+
8
−
8
View file @
371fa51d
...
...
@@ -168,10 +168,10 @@ architecture struct of top_combpm_electron is
signal
soft_reset
:
std_logic
;
signal
frame_seq_cnt
:
std_logic_vector
(
15
downto
0
);
signal
frame_valid_cnt
:
std_logic_vector
(
1
5
downto
0
);
signal
frame_invalid_cnt
:
std_logic_vector
(
1
5
downto
0
);
signal
frame_valid_rate
:
std_logic_vector
(
1
5
downto
0
);
signal
frame_invalid_rate
:
std_logic_vector
(
1
5
downto
0
);
signal
frame_valid_cnt
:
std_logic_vector
(
3
1
downto
0
);
signal
frame_invalid_cnt
:
std_logic_vector
(
3
1
downto
0
);
signal
frame_valid_rate
:
std_logic_vector
(
3
1
downto
0
);
signal
frame_invalid_rate
:
std_logic_vector
(
3
1
downto
0
);
signal
cnt_seq_mismatch
:
std_logic
;
signal
seq_discontinuity
:
std_logic
;
signal
frame_error
:
std_logic
;
...
...
@@ -256,10 +256,10 @@ begin
protocol_frameerror_i
=>
frame_error
,
protocol_seqframecnterror_i
=>
cnt_seq_mismatch
,
protocol_seqframediscont_i
=>
seq_discontinuity
,
framecnt_
validframecnt_i
=>
frame_valid_cnt
,
framecnt_
invalidframecnt_i
=>
frame_invalid_cnt
,
framerate_
validframerate_i
=>
frame_valid_rate
,
framerate_
invalidframerate_i
=>
frame_invalid_rate
,
validframecnt_
cnt_
i
=>
frame_valid_cnt
,
invalidframecnt_
cnt_
i
=>
frame_invalid_cnt
,
validframerate_
rate_
i
=>
frame_valid_rate
,
invalidframerate_
rate_
i
=>
frame_invalid_rate
,
frameseq_framecnt_i
=>
frame_seq_cnt
,
clk
=>
usrclk
,
...
...
This diff is collapsed.
Click to expand it.
rdl/combpm_ctrl.rdl
+
10
−
6
View file @
371fa51d
...
...
@@ -124,13 +124,15 @@ addrmap combpm_ctrl {
field {
desc="Valid frame counter";
hw=w;sw=r;
} VALIDFRAMECNT[16];
} CNT[32];
} VALIDFRAMECNT;
reg {
field {
desc="Invalid frame counter";
hw=w;sw=r;
}
INVALIDFRAME
CNT[
16
];
} FRAMECNT;
} CNT[
32
];
}
INVALID
FRAMECNT;
reg {
name="Protocol frame rate";
...
...
@@ -138,13 +140,15 @@ addrmap combpm_ctrl {
field {
desc="Valid frame rate";
hw=w;sw=r;
} VALIDFRAMERATE[16];
} RATE[32];
} VALIDFRAMERATE;
reg {
field {
desc="Invalid frame rate";
hw=w;sw=r;
}
INVALIDFRAME
RATE[
16
];
} FRAMERATE;
} RATE[
32
];
}
INVALID
FRAMERATE;
reg {
name="Protocol frame sequence";
...
...
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