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
16
Issues
16
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
d398fd38
Commit
d398fd38
authored
Sep 28, 2018
by
Ille, Ondrej, Ing.
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated FR_TYPE_IND for FDF_IND, ID_TYPE_IND for IDE_IND.
parent
4c2afd15
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
src/Buffers_Message_Handling/rxBuffer.vhd
src/Buffers_Message_Handling/rxBuffer.vhd
+2
-2
src/Buffers_Message_Handling/txArbitrator.vhd
src/Buffers_Message_Handling/txArbitrator.vhd
+2
-2
test/lib/CANtestLib.vhd
test/lib/CANtestLib.vhd
+4
-4
test/unit/TX_Arbitrator/TX_Arbitrator_tb.vhd
test/unit/TX_Arbitrator/TX_Arbitrator_tb.vhd
+2
-2
No files found.
src/Buffers_Message_Handling/rxBuffer.vhd
View file @
d398fd38
...
...
@@ -634,8 +634,8 @@ begin
frame_form_w
(
DLC_H
downto
DLC_L
)
<=
rec_dlc_in
;
frame_form_w
(
4
)
<=
'0'
;
frame_form_w
(
RTR_IND
)
<=
rec_is_rtr
;
frame_form_w
(
ID
_TYPE_IND
)
<=
rec_ident_type_in
;
frame_form_w
(
F
R_TYPE_IND
)
<=
rec_frame_type_in
;
frame_form_w
(
ID
E_IND
)
<=
rec_ident_type_in
;
frame_form_w
(
F
DF_IND
)
<=
rec_frame_type_in
;
frame_form_w
(
TBF_IND
)
<=
'1'
;
-- All frames have the timestamp
frame_form_w
(
BRS_IND
)
<=
rec_brs
;
frame_form_w
(
ESI_RESVD_IND
)
<=
rec_esi
;
...
...
src/Buffers_Message_Handling/txArbitrator.vhd
View file @
d398fd38
...
...
@@ -514,8 +514,8 @@ begin
if
(
fsm_wait_state
)
then
fsm_wait_state
<=
false
;
else
tran_frame_type_com
<=
txtb_selected_input
(
F
R_TYPE
_IND
);
tran_ident_type_com
<=
txtb_selected_input
(
ID
_TYP
E_IND
);
tran_frame_type_com
<=
txtb_selected_input
(
F
DF
_IND
);
tran_ident_type_com
<=
txtb_selected_input
(
IDE_IND
);
tran_dlc_com
<=
txtb_selected_input
(
DLC_H
downto
DLC_L
);
tran_is_rtr_com
<=
txtb_selected_input
(
RTR_IND
);
...
...
test/lib/CANtestLib.vhd
View file @
d398fd38
...
...
@@ -3321,8 +3321,8 @@ package body CANtestLib is
w_data
:
=
(
OTHERS
=>
'0'
);
w_data
(
DLC_H
downto
DLC_L
)
:
=
frame
.
dlc
;
w_data
(
RTR_IND
)
:
=
frame
.
rtr
;
w_data
(
ID
_TYPE_IND
)
:
=
frame
.
ident_type
;
w_data
(
F
R_TYPE_IND
)
:
=
frame
.
frame_format
;
w_data
(
ID
E_IND
)
:
=
frame
.
ident_type
;
w_data
(
F
DF_IND
)
:
=
frame
.
frame_format
;
w_data
(
TBF_IND
)
:
=
'1'
;
w_data
(
BRS_IND
)
:
=
frame
.
brs
;
w_data
(
ESI_RESVD_IND
)
:
=
'0'
;
-- ESI is receive only
...
...
@@ -3431,8 +3431,8 @@ package body CANtestLib is
-- Parse frame format word
frame
.
dlc
:
=
frm_fmt_word
(
DLC_H
downto
DLC_L
);
frame
.
rtr
:
=
frm_fmt_word
(
RTR_IND
);
frame
.
ident_type
:
=
frm_fmt_word
(
ID
_TYP
E_IND
);
frame
.
frame_format
:
=
frm_fmt_word
(
F
R_TYPE
_IND
);
frame
.
ident_type
:
=
frm_fmt_word
(
IDE_IND
);
frame
.
frame_format
:
=
frm_fmt_word
(
F
DF
_IND
);
frame
.
brs
:
=
frm_fmt_word
(
BRS_IND
);
frame
.
rwcnt
:
=
to_integer
(
unsigned
(
frm_fmt_word
(
RWCNT_H
downto
RWCNT_L
)));
...
...
test/unit/TX_Arbitrator/TX_Arbitrator_tb.vhd
View file @
d398fd38
...
...
@@ -447,9 +447,9 @@ begin
mod_is_rtr
<=
shadow_mem
(
high_prio_buf_index
)(
0
)
(
RTR_IND
);
mod_ident_type_out
<=
shadow_mem
(
high_prio_buf_index
)(
0
)
(
ID
_TYP
E_IND
);
(
IDE_IND
);
mod_frame_type_out
<=
shadow_mem
(
high_prio_buf_index
)(
0
)
(
F
R_TYPE
_IND
);
(
F
DF
_IND
);
mod_brs_out
<=
shadow_mem
(
high_prio_buf_index
)(
0
)
(
BRS_IND
);
mod_frame_com
<=
'1'
;
...
...
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