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
043983a0
Commit
043983a0
authored
Dec 30, 2018
by
Ille, Ondrej, Ing.
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated rx buffer to integer instead of natural to allow
for negative values.
parent
d3d4f250
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
23 deletions
+23
-23
src/lib/can_components.vhd
src/lib/can_components.vhd
+6
-6
src/rx_buffer/rx_buffer.vhd
src/rx_buffer/rx_buffer.vhd
+7
-7
src/rx_buffer/rx_buffer_pointers.vhd
src/rx_buffer/rx_buffer_pointers.vhd
+10
-10
No files found.
src/lib/can_components.vhd
View file @
043983a0
...
@@ -321,12 +321,12 @@ package can_components is
...
@@ -321,12 +321,12 @@ package can_components is
signal
inc_extra_wr_ptr
:
in
std_logic
;
signal
inc_extra_wr_ptr
:
in
std_logic
;
signal
read_increment
:
in
std_logic
;
signal
read_increment
:
in
std_logic
;
signal
drv_bus
:
in
std_logic_vector
(
1023
downto
0
);
signal
drv_bus
:
in
std_logic_vector
(
1023
downto
0
);
signal
read_pointer
:
out
natural
range
0
to
buff_size
-
1
;
signal
read_pointer
:
out
integer
range
0
to
buff_size
-
1
;
signal
read_pointer_inc_1
:
out
natural
range
0
to
buff_size
-
1
;
signal
read_pointer_inc_1
:
out
integer
range
0
to
buff_size
-
1
;
signal
write_pointer
:
out
natural
range
0
to
buff_size
-
1
;
signal
write_pointer
:
out
integer
range
0
to
buff_size
-
1
;
signal
write_pointer_raw
:
out
natural
range
0
to
buff_size
-
1
;
signal
write_pointer_raw
:
out
integer
range
0
to
buff_size
-
1
;
signal
write_pointer_extra_ts
:
out
natural
range
0
to
buff_size
-
1
;
signal
write_pointer_extra_ts
:
out
integer
range
0
to
buff_size
-
1
;
signal
rx_mem_free_int
:
out
natural
range
-1
to
buff_size
+
1
signal
rx_mem_free_int
:
out
integer
range
-1
to
buff_size
+
1
);
);
end
component
;
end
component
;
...
...
src/rx_buffer/rx_buffer.vhd
View file @
043983a0
...
@@ -309,32 +309,32 @@ architecture rtl of rx_buffer is
...
@@ -309,32 +309,32 @@ architecture rtl of rx_buffer is
----------------------------------------------------------------------------
----------------------------------------------------------------------------
-- Read Pointer (access from SW)
-- Read Pointer (access from SW)
signal
read_pointer
:
natural
range
0
to
buff_size
-
1
;
signal
read_pointer
:
integer
range
0
to
buff_size
-
1
;
-- Read pointer incremented by 1 (combinationally)
-- Read pointer incremented by 1 (combinationally)
signal
read_pointer_inc_1
:
natural
range
0
to
buff_size
-
1
;
signal
read_pointer_inc_1
:
integer
range
0
to
buff_size
-
1
;
-- Write pointer (committed, available to SW, after frame was stored)
-- Write pointer (committed, available to SW, after frame was stored)
signal
write_pointer
:
natural
range
0
to
buff_size
-
1
;
signal
write_pointer
:
integer
range
0
to
buff_size
-
1
;
-- Write pointer RAW. Changing during frame, as frame is continously stored
-- Write pointer RAW. Changing during frame, as frame is continously stored
-- to the buffer. When frame is sucesfully received, it is updated to
-- to the buffer. When frame is sucesfully received, it is updated to
-- write pointer!
-- write pointer!
signal
write_pointer_raw
:
natural
range
0
to
buff_size
-
1
;
signal
write_pointer_raw
:
integer
range
0
to
buff_size
-
1
;
-- Extra write pointer which is used for storing timestamp at the end of
-- Extra write pointer which is used for storing timestamp at the end of
-- data frame!
-- data frame!
signal
write_pointer_extra_ts
:
natural
range
0
to
buff_size
-
1
;
signal
write_pointer_extra_ts
:
integer
range
0
to
buff_size
-
1
;
-- Final pointer to memory. "write_pointer_raw" and
-- Final pointer to memory. "write_pointer_raw" and
-- "write_pointer_extra_ts" are multiplexed based on RX FSM!
-- "write_pointer_extra_ts" are multiplexed based on RX FSM!
signal
memory_write_pointer
:
natural
range
0
to
buff_size
-
1
;
signal
memory_write_pointer
:
integer
range
0
to
buff_size
-
1
;
-- Data that will be written to the RX Buffer memory!
-- Data that will be written to the RX Buffer memory!
signal
memory_write_data
:
std_logic_vector
(
31
downto
0
);
signal
memory_write_data
:
std_logic_vector
(
31
downto
0
);
-- Number of free memory words available to SW after frame was committed.
-- Number of free memory words available to SW after frame was committed.
signal
rx_mem_free_int
:
natural
range
-1
to
buff_size
+
1
;
signal
rx_mem_free_int
:
integer
range
-1
to
buff_size
+
1
;
----------------------------------------------------------------------------
----------------------------------------------------------------------------
----------------------------------------------------------------------------
----------------------------------------------------------------------------
...
...
src/rx_buffer/rx_buffer_pointers.vhd
View file @
043983a0
...
@@ -113,28 +113,28 @@ entity rx_buffer_pointers is
...
@@ -113,28 +113,28 @@ entity rx_buffer_pointers is
-- Pointer outputs
-- Pointer outputs
------------------------------------
------------------------------------
-- Read Pointer (access from SW)
-- Read Pointer (access from SW)
signal
read_pointer
:
out
natural
range
0
to
buff_size
-
1
;
signal
read_pointer
:
out
integer
range
0
to
buff_size
-
1
;
-- Read pointer incremented by 1 (combinationally)
-- Read pointer incremented by 1 (combinationally)
signal
read_pointer_inc_1
:
out
natural
range
0
to
buff_size
-
1
;
signal
read_pointer_inc_1
:
out
integer
range
0
to
buff_size
-
1
;
-- Write pointer (committed, available to SW, after frame was stored)
-- Write pointer (committed, available to SW, after frame was stored)
signal
write_pointer
:
out
natural
range
0
to
buff_size
-
1
;
signal
write_pointer
:
out
integer
range
0
to
buff_size
-
1
;
-- Write pointer RAW. Changing during frame, as frame is continously stored
-- Write pointer RAW. Changing during frame, as frame is continously stored
-- to the buffer. When frame is sucesfully received, it is updated to
-- to the buffer. When frame is sucesfully received, it is updated to
-- write pointer!
-- write pointer!
signal
write_pointer_raw
:
out
natural
range
0
to
buff_size
-
1
;
signal
write_pointer_raw
:
out
integer
range
0
to
buff_size
-
1
;
-- Extra write pointer which is used for storing timestamp at the end of
-- Extra write pointer which is used for storing timestamp at the end of
-- data frame!
-- data frame!
signal
write_pointer_extra_ts
:
out
natural
range
0
to
buff_size
-
1
;
signal
write_pointer_extra_ts
:
out
integer
range
0
to
buff_size
-
1
;
------------------------------------
------------------------------------
-- Mem. free outputs
-- Mem. free outputs
------------------------------------
------------------------------------
-- Number of free memory words available for user
-- Number of free memory words available for user
signal
rx_mem_free_int
:
out
natural
range
-1
to
buff_size
+
1
signal
rx_mem_free_int
:
out
integer
range
-1
to
buff_size
+
1
);
);
end
entity
;
end
entity
;
...
@@ -152,19 +152,19 @@ architecture rtl of rx_buffer_pointers is
...
@@ -152,19 +152,19 @@ architecture rtl of rx_buffer_pointers is
signal
drv_erase_rx
:
std_logic
;
signal
drv_erase_rx
:
std_logic
;
-- Raw value of number of free memory words.
-- Raw value of number of free memory words.
signal
rx_mem_free_raw
:
natural
range
-1
to
buff_size
+
1
;
signal
rx_mem_free_raw
:
integer
range
-1
to
buff_size
+
1
;
-- Number of free memory words calculated during frame storing before commit
-- Number of free memory words calculated during frame storing before commit
-- combinationally incremented by 1.
-- combinationally incremented by 1.
signal
rx_mem_free_raw_inc_1
:
natural
range
-1
to
buff_size
+
1
;
signal
rx_mem_free_raw_inc_1
:
integer
range
-1
to
buff_size
+
1
;
-- Number of free memory words calculated during frame storing before commit
-- Number of free memory words calculated during frame storing before commit
-- combinationally decremented by 1.
-- combinationally decremented by 1.
signal
rx_mem_free_raw_dec_1
:
natural
range
-1
to
buff_size
+
1
;
signal
rx_mem_free_raw_dec_1
:
integer
range
-1
to
buff_size
+
1
;
-- Number of free memory words available to SW, combinationally icnremented
-- Number of free memory words available to SW, combinationally icnremented
-- by 1.
-- by 1.
signal
rx_mem_free_int_inc_1
:
natural
range
-1
to
buff_size
+
1
;
signal
rx_mem_free_int_inc_1
:
integer
range
-1
to
buff_size
+
1
;
begin
begin
...
...
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