Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
canbus
CTU CAN FD IP Core
Commits
64ad450e
Commit
64ad450e
authored
Jul 18, 2018
by
Ille, Ondrej, Ing.
Committed by
Martin Jeřábek
Sep 28, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
White space removal.
parent
84e808b6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
15 deletions
+15
-15
src/CAN_Core/protocolControl.vhd
src/CAN_Core/protocolControl.vhd
+15
-15
No files found.
src/CAN_Core/protocolControl.vhd
View file @
64ad450e
...
...
@@ -749,7 +749,7 @@ begin
-----------------------------------
PC_State_out
<=
PC_State
;
alc
<=
alc_r
;
data_tx
<=
data_tx_r
;
data_tx
<=
data_tx_r
;
arbitration_lost
<=
arbitration_lost_r
;
crc_enable
<=
crc_enable_r
;
stuff_enable
<=
stuff_enable_r
;
...
...
@@ -922,13 +922,13 @@ begin
stuff_enable_r
<=
'0'
;
fixed_stuff_r
<=
'0'
;
stuff_length_r
<=
std_logic_vector
(
to_unsigned
(
BASE_STUFF_LENGTH
,
3
));
to_unsigned
(
BASE_STUFF_LENGTH
,
3
));
--Configuring Bit Destuffing
destuff_enable_r
<=
'0'
;
fixed_destuff_r
<=
'0'
;
destuff_length_r
<=
std_logic_vector
(
to_unsigned
(
BASE_STUFF_LENGTH
,
3
));
to_unsigned
(
BASE_STUFF_LENGTH
,
3
));
stuff_error_enable_r
<=
'0'
;
inc_one_r
<=
'0'
;
...
...
@@ -2017,7 +2017,7 @@ begin
end
if
;
----------------------------------------------------------------------------
----------------------------------------------------------------------------
----------------------------------------------------------------------------
-- Data Phase
----------------------------------------------------------------------------
...
...
@@ -2146,7 +2146,7 @@ begin
----------------------------------------------------------------
-- Data pointer counts till 0 (end of data field).
----------------------------------------------------------------
----------------------------------------------------------------
if
(
data_pointer
>
0
)
then
data_pointer
<=
data_pointer
-
1
;
else
...
...
@@ -2167,7 +2167,7 @@ begin
end
if
;
----------------------------------------------------------------------------
----------------------------------------------------------------------------
----------------------------------------------------------------------------
-- CRC field
----------------------------------------------------------------------------
...
...
@@ -2239,7 +2239,7 @@ begin
----------------------------------------------------------------
-- Stuff count field + stuff parity
----------------------------------------------------------------
----------------------------------------------------------------
when
stuff_count
=>
if
(
OP_State
=
transciever
)
then
...
...
@@ -2312,7 +2312,7 @@ begin
end
if
;
----------------------------------------------------------------------------
----------------------------------------------------------------------------
----------------------------------------------------------------------------
-- CRC Delimiter, Acknowledge and Acknowledge delimiter
----------------------------------------------------------------------------
...
...
@@ -2561,7 +2561,7 @@ begin
end
if
;
----------------------------------------------------------------------------
----------------------------------------------------------------------------
----------------------------------------------------------------------------
-- End of frame
----------------------------------------------------------------------------
...
...
@@ -2641,7 +2641,7 @@ begin
end
if
;
----------------------------------------------------------------------------
----------------------------------------------------------------------------
----------------------------------------------------------------------------
-- Interframe space
----------------------------------------------------------------------------
...
...
@@ -2714,7 +2714,7 @@ begin
--------------------------------------------------------
else
if
(
control_pointer_non_zero
)
then
PC_State
<=
overload
;
PC_State
<=
overload
;
else
PC_State
<=
sof
;
crc_enable_r
<=
'1'
;
...
...
@@ -2800,7 +2800,7 @@ begin
end
if
;
----------------------------------------------------------------------------
----------------------------------------------------------------------------
----------------------------------------------------------------------------
-- Error frame
----------------------------------------------------------------------------
...
...
@@ -3065,7 +3065,7 @@ begin
end
if
;
----------------------------------------------------------------------------
----------------------------------------------------------------------------
----------------------------------------------------------------------------
-- Overload frame
----------------------------------------------------------------------------
...
...
@@ -3195,7 +3195,7 @@ begin
end
if
;
----------------------------------------------------------------------------
----------------------------------------------------------------------------
----------------------------------------------------------------------------
-- Unit is turned off
----------------------------------------------------------------------------
...
...
@@ -3214,7 +3214,7 @@ begin
end
if
;
----------------------------------------------------------------------------
----------------------------------------------------------------------------
----------------------------------------------------------------------------
-- Unknown state
----------------------------------------------------------------------------
...
...
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