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
4f84d370
Commit
4f84d370
authored
Dec 10, 2018
by
Ille, Ondrej, Ing.
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolved remains of conflict fix.
parent
46e1ebb7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
25 deletions
+5
-25
src/CAN_top_level.vhd
src/CAN_top_level.vhd
+1
-0
src/Registers_Memory_Interface/canfd_registers.vhd
src/Registers_Memory_Interface/canfd_registers.vhd
+4
-25
No files found.
src/CAN_top_level.vhd
View file @
4f84d370
...
...
@@ -81,6 +81,7 @@ USE IEEE.numeric_std.ALL;
USE
WORK
.
CANconstants
.
ALL
;
use
work
.
CANcomponents
.
ALL
;
use
work
.
CAN_FD_register_map
.
all
;
use
work
.
cmn_lib
.
all
;
entity
CAN_top_level
is
generic
(
...
...
src/Registers_Memory_Interface/canfd_registers.vhd
View file @
4f84d370
...
...
@@ -303,11 +303,6 @@ architecture rtl of canfd_registers is
signal
error_state
:
error_state_type
;
signal
OP_State
:
oper_mode_type
;
-- TODO: This will be removed upon merge with branch "Design decoupling"
type
t_aux_txtb_state_vector
is
array
(
0
to
TXT_BUFFER_COUNT
-
1
)
of
std_logic_vector
(
3
downto
0
);
signal
txtb_state
:
t_aux_txtb_state_vector
;
---------------------------------------------------------------------------
--
...
...
@@ -557,10 +552,10 @@ begin
status_comb
(
RXS_IND
mod
8
)
<=
'1'
when
(
OP_State
=
reciever
)
else
'0'
;
status_comb
(
TXNF_IND
mod
8
)
<=
'1'
when
(
txtb_
fsms
(
0
)
=
txt_empty
or
txtb_
fsms
(
1
)
=
txt_empty
or
txtb_
fsms
(
2
)
=
txt_empty
or
txtb_
fsms
(
3
)
=
txt_empty
)
status_comb
(
TXNF_IND
mod
8
)
<=
'1'
when
(
txtb_
state
(
0
)
=
TXT_ETY
or
txtb_
state
(
1
)
=
TXT_ETY
or
txtb_
state
(
2
)
=
TXT_ETY
or
txtb_
state
(
3
)
=
TXT_ETY
)
else
'0'
;
...
...
@@ -1244,22 +1239,6 @@ begin
txtb_state
(
3
);
end
block
tx_status_block
;
---------------------------------------------------------------------------
-- Auxiliarly state decoders, this will be removed upon merge with
-- design decomposition branch
-- Encoding Buffer FSM to output values read from TXT Buffer status register.
---------------------------------------------------------------------------
buf_dec_gen
:
for
i
in
0
to
TXT_BUFFER_COUNT
-
1
generate
with
txtb_fsms
(
i
)
select
txtb_state
(
i
)
<=
TXT_RDY
when
txt_ready
,
TXT_TRAN
when
txt_tx_prog
,
TXT_ABTP
when
txt_ab_prog
,
TXT_TOK
when
txt_ok
,
TXT_ERR
when
txt_error
,
TXT_ABT
when
txt_aborted
,
TXT_ETY
when
txt_empty
;
end
generate
;
---------------------------------------------------------------------------
...
...
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