Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CTU CAN FD IP Core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
14
Issues
14
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
canbus
CTU CAN FD IP Core
Commits
f46ba77e
Commit
f46ba77e
authored
Apr 04, 2020
by
Ille, Ondrej, Ing.
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
src: Gate RTR flag when CAN FD flag is sampled!
parent
8675be17
Pipeline
#18732
passed with stages
in 20 minutes and 44 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
4 deletions
+14
-4
src/can_core/rx_shift_reg.vhd
src/can_core/rx_shift_reg.vhd
+14
-4
No files found.
src/can_core/rx_shift_reg.vhd
View file @
f46ba77e
...
...
@@ -193,6 +193,9 @@ architecture rtl of rx_shift_reg is
-- Shift register input selector demuxed
signal
rx_shift_in_sel_demuxed
:
std_logic_vector
(
3
downto
0
);
signal
rec_is_rtr_i
:
std_logic
;
signal
rec_frame_type_i
:
std_logic
;
begin
-- Internal reset: Async reset + reset by design!
...
...
@@ -295,13 +298,17 @@ begin
rx_store_proc
:
process
(
clk_sys
,
res_n_i
)
begin
if
(
res_n_i
=
G_RESET_POLARITY
)
then
rec_is_rtr
<=
'0'
;
rec_is_rtr
_i
<=
'0'
;
elsif
(
rising_edge
(
clk_sys
))
then
if
(
rx_store_rtr
=
'1'
)
then
rec_is_rtr
<=
rx_data_nbs
;
rec_is_rtr
_i
<=
rx_data_nbs
;
end
if
;
end
if
;
end
process
;
-- RTR flag can't be active at the same time as FDF. FDF has priority!
rec_is_rtr
<=
rec_is_rtr_i
when
(
rec_frame_type_i
=
NORMAL_CAN
)
else
NO_RTR_FRAME
;
---------------------------------------------------------------------------
-- Store EDL/FDF bit (Extended data length or Flexible data-rate format)
...
...
@@ -309,14 +316,17 @@ begin
edl_store_proc
:
process
(
clk_sys
,
res_n_i
)
begin
if
(
res_n_i
=
G_RESET_POLARITY
)
then
rec_frame_type
<=
'0'
;
rec_frame_type
_i
<=
'0'
;
elsif
(
rising_edge
(
clk_sys
))
then
if
(
rx_store_edl
=
'1'
)
then
rec_frame_type
<=
rx_data_nbs
;
rec_frame_type
_i
<=
rx_data_nbs
;
end
if
;
end
if
;
end
process
;
rec_frame_type
<=
rec_frame_type_i
;
---------------------------------------------------------------------------
-- Store ESI bit (Error state indicator)
---------------------------------------------------------------------------
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment