From 96ee32d1bc40ff0d8198abd7feb0de0be6cb2e38 Mon Sep 17 00:00:00 2001
From: Erik Kooistra <kooistra@astron.nl>
Date: Fri, 8 Dec 2017 12:04:43 +0000
Subject: [PATCH] Renamed t_sel_table into t_reorder_table, because type is
from reorder library.
---
.../src/vhdl/node_apertif_unb1_correlator_mesh.vhd | 4 ++--
libraries/base/reorder/src/vhdl/mms_reorder_rewire.vhd | 2 +-
libraries/base/reorder/src/vhdl/reorder_pkg.vhd | 4 ++--
libraries/base/reorder/src/vhdl/reorder_rewire.vhd | 2 +-
libraries/base/reorder/tb/vhdl/tb_mms_reorder_rewire.vhd | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/node_apertif_unb1_correlator_mesh.vhd b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/node_apertif_unb1_correlator_mesh.vhd
index f89c620d5c..d88b148655 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/node_apertif_unb1_correlator_mesh.vhd
+++ b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/node_apertif_unb1_correlator_mesh.vhd
@@ -367,7 +367,7 @@ END node_apertif_unb1_correlator_mesh;
ARCHITECTURE str OF node_apertif_unb1_correlator_mesh IS
- CONSTANT c_sel_apertif_cor: t_sel_table :=
+ CONSTANT c_sel_table: t_reorder_table :=
(
--FN0 FN1 FN2 FN3 BN0 BN1 BN2 BN3
( 19, 10, 13, 16, 8 , 8 , 8 , 8 , 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), -- Local processing output 0
@@ -723,7 +723,7 @@ BEGIN
---------------------------------------------------------------------------------------
u_rewire : ENTITY reorder_lib.reorder_rewire
GENERIC MAP(
- g_select_table => c_sel_apertif_cor,
+ g_select_table => c_sel_table,
g_nof_streams => c_distr_nof_streams,
g_sel_in_w => ceil_log2(c_nof_nodes)
)
diff --git a/libraries/base/reorder/src/vhdl/mms_reorder_rewire.vhd b/libraries/base/reorder/src/vhdl/mms_reorder_rewire.vhd
index c2ed2bc2ef..e58a737bd1 100644
--- a/libraries/base/reorder/src/vhdl/mms_reorder_rewire.vhd
+++ b/libraries/base/reorder/src/vhdl/mms_reorder_rewire.vhd
@@ -57,7 +57,7 @@ USE work.reorder_pkg.ALL;
ENTITY mms_reorder_rewire IS
GENERIC (
- g_select_table : t_sel_table := c_sel_table;
+ g_select_table : t_reorder_table := c_reorder_table;
g_nof_streams : NATURAL := 8;
g_sel_in_w : NATURAL := 3;
g_use_sel_table : BOOLEAN := TRUE
diff --git a/libraries/base/reorder/src/vhdl/reorder_pkg.vhd b/libraries/base/reorder/src/vhdl/reorder_pkg.vhd
index f829e8f3f0..26346a2cf3 100644
--- a/libraries/base/reorder/src/vhdl/reorder_pkg.vhd
+++ b/libraries/base/reorder/src/vhdl/reorder_pkg.vhd
@@ -38,9 +38,9 @@ PACKAGE reorder_pkg IS
CONSTANT c_reorder_seq : t_reorder_seq := (64, 16, 4, 1, 0, 5);
CONSTANT c_reorder_seq_same : t_reorder_seq := (64, 64, 1, 1, 0, 4);
- TYPE t_sel_table IS ARRAY(INTEGER RANGE 0 TO 31, INTEGER RANGE 0 TO 31) OF NATURAL;
+ TYPE t_reorder_table IS ARRAY(INTEGER RANGE 0 TO 31, INTEGER RANGE 0 TO 31) OF NATURAL;
- CONSTANT c_sel_table: t_sel_table :=
+ CONSTANT c_reorder_table: t_reorder_table :=
(
(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
diff --git a/libraries/base/reorder/src/vhdl/reorder_rewire.vhd b/libraries/base/reorder/src/vhdl/reorder_rewire.vhd
index b3c329641a..589a941c9f 100644
--- a/libraries/base/reorder/src/vhdl/reorder_rewire.vhd
+++ b/libraries/base/reorder/src/vhdl/reorder_rewire.vhd
@@ -57,7 +57,7 @@ USE work.reorder_pkg.ALL;
ENTITY reorder_rewire IS
GENERIC(
- g_select_table : t_sel_table := c_sel_table;
+ g_select_table : t_reorder_table := c_reorder_table;
g_nof_streams : NATURAL := 8;
g_sel_in_w : NATURAL := 3;
g_use_sel_table : BOOLEAN := TRUE
diff --git a/libraries/base/reorder/tb/vhdl/tb_mms_reorder_rewire.vhd b/libraries/base/reorder/tb/vhdl/tb_mms_reorder_rewire.vhd
index 78fd104b15..b9627f72e4 100644
--- a/libraries/base/reorder/tb/vhdl/tb_mms_reorder_rewire.vhd
+++ b/libraries/base/reorder/tb/vhdl/tb_mms_reorder_rewire.vhd
@@ -109,7 +109,7 @@ ARCHITECTURE tb OF tb_mms_reorder_rewire IS
);
END COMPONENT;
- CONSTANT c_sel_table: t_sel_table :=
+ CONSTANT c_sel_table: t_reorder_table :=
(
--FN0 FN1 FN2 FN3 BN0 BN1 BN2 BN3
( 19, 10, 13, 16, 8 , 8 , 8 , 8 , 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), -- Local processing output 0
--
GitLab