From 3cfc3f084bf4a41623d2a97b8cb1d9363a0abd5e Mon Sep 17 00:00:00 2001
From: Eric Kooistra <kooistra@astron.nl>
Date: Tue, 15 Feb 2022 17:38:47 +0100
Subject: [PATCH] Use ring_lib prefix _ring in t_ring_lane_info name and in
c_ring_lane_info_field_arr name.
---
libraries/base/ring/src/vhdl/ring_lane.vhd | 2 +-
.../base/ring/src/vhdl/ring_lane_info.vhd | 4 ++--
.../base/ring/src/vhdl/ring_lane_info_reg.vhd | 18 +++++++++---------
libraries/base/ring/src/vhdl/ring_pkg.vhd | 6 +++---
.../base/ring/tb/vhdl/tb_ring_lane_info.vhd | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/libraries/base/ring/src/vhdl/ring_lane.vhd b/libraries/base/ring/src/vhdl/ring_lane.vhd
index 73ab5af32b..e0ccc75d9f 100644
--- a/libraries/base/ring/src/vhdl/ring_lane.vhd
+++ b/libraries/base/ring/src/vhdl/ring_lane.vhd
@@ -92,7 +92,7 @@ END ring_lane;
ARCHITECTURE str OF ring_lane IS
CONSTANT c_lane_direction : STD_LOGIC := sel_a_b(g_lane_direction, '1', '0');
- SIGNAL lane_info : t_lane_info;
+ SIGNAL lane_info : t_ring_lane_info;
BEGIN
diff --git a/libraries/base/ring/src/vhdl/ring_lane_info.vhd b/libraries/base/ring/src/vhdl/ring_lane_info.vhd
index 64404d410a..4cb4e6c23d 100644
--- a/libraries/base/ring/src/vhdl/ring_lane_info.vhd
+++ b/libraries/base/ring/src/vhdl/ring_lane_info.vhd
@@ -53,14 +53,14 @@ ENTITY ring_lane_info IS
lane_direction : IN STD_LOGIC;
-- sdp info
- lane_info : OUT t_lane_info
+ lane_info : OUT t_ring_lane_info
);
END ring_lane_info;
ARCHITECTURE str OF ring_lane_info IS
- SIGNAL lane_info_ro: t_lane_info; -- ro = read only
+ SIGNAL lane_info_ro: t_ring_lane_info; -- ro = read only
BEGIN
diff --git a/libraries/base/ring/src/vhdl/ring_lane_info_reg.vhd b/libraries/base/ring/src/vhdl/ring_lane_info_reg.vhd
index 48c7041424..584785ace3 100644
--- a/libraries/base/ring/src/vhdl/ring_lane_info_reg.vhd
+++ b/libraries/base/ring/src/vhdl/ring_lane_info_reg.vhd
@@ -50,19 +50,19 @@ ENTITY ring_lane_info_reg IS
reg_miso : OUT t_mem_miso;
-- sdp info
- lane_info_ro : IN t_lane_info; -- ro = read only
- lane_info : OUT t_lane_info
+ lane_info_ro : IN t_ring_lane_info; -- ro = read only
+ lane_info : OUT t_ring_lane_info
);
END ring_lane_info_reg;
ARCHITECTURE str OF ring_lane_info_reg IS
- SIGNAL mm_fields_in : STD_LOGIC_VECTOR(field_slv_in_len(c_lane_info_field_arr)-1 DOWNTO 0);
- SIGNAL mm_fields_out : STD_LOGIC_VECTOR(field_slv_out_len(c_lane_info_field_arr)-1 DOWNTO 0);
+ SIGNAL mm_fields_in : STD_LOGIC_VECTOR(field_slv_in_len(c_ring_lane_info_field_arr)-1 DOWNTO 0);
+ SIGNAL mm_fields_out : STD_LOGIC_VECTOR(field_slv_out_len(c_ring_lane_info_field_arr)-1 DOWNTO 0);
- SIGNAL lane_info_rd : t_lane_info;
- SIGNAL lane_info_wr : t_lane_info;
+ SIGNAL lane_info_rd : t_ring_lane_info;
+ SIGNAL lane_info_wr : t_ring_lane_info;
BEGIN
@@ -81,7 +81,7 @@ BEGIN
u_mm_fields: ENTITY mm_lib.mm_fields
GENERIC MAP(
g_use_slv_in_val => FALSE, -- use FALSE to save logic when always slv_in_val='1'
- g_field_arr => c_lane_info_field_arr
+ g_field_arr => c_ring_lane_info_field_arr
)
PORT MAP (
mm_clk => mm_clk,
@@ -100,9 +100,9 @@ BEGIN
);
-- add "RO" fields to mm_fields
- mm_fields_in(field_hi(c_lane_info_field_arr, "lane_direction") DOWNTO field_lo(c_lane_info_field_arr, "lane_direction")) <= slv(lane_info_rd.lane_direction);
+ mm_fields_in(field_hi(c_ring_lane_info_field_arr, "lane_direction") DOWNTO field_lo(c_ring_lane_info_field_arr, "lane_direction")) <= slv(lane_info_rd.lane_direction);
-- get "RW" fields from mm_fields
- lane_info_wr.transport_nof_hops <= mm_fields_out(field_hi(c_lane_info_field_arr, "transport_nof_hops") DOWNTO field_lo(c_lane_info_field_arr, "transport_nof_hops"));
+ lane_info_wr.transport_nof_hops <= mm_fields_out(field_hi(c_ring_lane_info_field_arr, "transport_nof_hops") DOWNTO field_lo(c_ring_lane_info_field_arr, "transport_nof_hops"));
END str;
diff --git a/libraries/base/ring/src/vhdl/ring_pkg.vhd b/libraries/base/ring/src/vhdl/ring_pkg.vhd
index 13d0d929bf..41ecf785ce 100644
--- a/libraries/base/ring/src/vhdl/ring_pkg.vhd
+++ b/libraries/base/ring/src/vhdl/ring_pkg.vhd
@@ -35,15 +35,15 @@ USE common_lib.common_network_layers_pkg.ALL;
PACKAGE ring_pkg is
-- lane info, see https://support.astron.nl/confluence/x/jyu7Ag
- TYPE t_lane_info IS RECORD
+ TYPE t_ring_lane_info IS RECORD
transport_nof_hops : STD_LOGIC_VECTOR(c_word_w-1 DOWNTO 0);
lane_direction : STD_LOGIC;
END RECORD;
- CONSTANT c_lane_info_rst : t_lane_info :=
+ CONSTANT c_ring_lane_info_rst : t_ring_lane_info :=
( (OTHERS => '0'), '0' );
- CONSTANT c_lane_info_field_arr : t_common_field_arr(1 DOWNTO 0) :=
+ CONSTANT c_ring_lane_info_field_arr : t_common_field_arr(1 DOWNTO 0) :=
( (field_name_pad("transport_nof_hops"), "RW", 32, field_default(0)),
(field_name_pad("lane_direction"), "RO", 1, field_default(0)) );
diff --git a/libraries/base/ring/tb/vhdl/tb_ring_lane_info.vhd b/libraries/base/ring/tb/vhdl/tb_ring_lane_info.vhd
index 7b152204a3..09d06a669b 100644
--- a/libraries/base/ring/tb/vhdl/tb_ring_lane_info.vhd
+++ b/libraries/base/ring/tb/vhdl/tb_ring_lane_info.vhd
@@ -67,7 +67,7 @@ ARCHITECTURE tb OF tb_ring_lane_info IS
-- signals used to change settings of ring_lane_info
SIGNAL lane_direction : STD_LOGIC := '0';
- SIGNAL lane_info : t_lane_info;
+ SIGNAL lane_info : t_ring_lane_info;
-- signals used for response of mm bus
SIGNAL mm_natural_response : NATURAL;
--
GitLab