Skip to content
Snippets Groups Projects
Commit 96ee32d1 authored by Eric Kooistra's avatar Eric Kooistra
Browse files

Renamed t_sel_table into t_reorder_table, because type is from reorder library.

parent fb10dfb1
No related branches found
No related tags found
No related merge requests found
...@@ -367,7 +367,7 @@ END node_apertif_unb1_correlator_mesh; ...@@ -367,7 +367,7 @@ END node_apertif_unb1_correlator_mesh;
ARCHITECTURE str OF node_apertif_unb1_correlator_mesh IS 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 --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 ( 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 ...@@ -723,7 +723,7 @@ BEGIN
--------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------
u_rewire : ENTITY reorder_lib.reorder_rewire u_rewire : ENTITY reorder_lib.reorder_rewire
GENERIC MAP( GENERIC MAP(
g_select_table => c_sel_apertif_cor, g_select_table => c_sel_table,
g_nof_streams => c_distr_nof_streams, g_nof_streams => c_distr_nof_streams,
g_sel_in_w => ceil_log2(c_nof_nodes) g_sel_in_w => ceil_log2(c_nof_nodes)
) )
......
...@@ -57,7 +57,7 @@ USE work.reorder_pkg.ALL; ...@@ -57,7 +57,7 @@ USE work.reorder_pkg.ALL;
ENTITY mms_reorder_rewire IS ENTITY mms_reorder_rewire IS
GENERIC ( 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_nof_streams : NATURAL := 8;
g_sel_in_w : NATURAL := 3; g_sel_in_w : NATURAL := 3;
g_use_sel_table : BOOLEAN := TRUE g_use_sel_table : BOOLEAN := TRUE
......
...@@ -38,9 +38,9 @@ PACKAGE reorder_pkg IS ...@@ -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 : t_reorder_seq := (64, 16, 4, 1, 0, 5);
CONSTANT c_reorder_seq_same : t_reorder_seq := (64, 64, 1, 1, 0, 4); 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),
(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),
......
...@@ -57,7 +57,7 @@ USE work.reorder_pkg.ALL; ...@@ -57,7 +57,7 @@ USE work.reorder_pkg.ALL;
ENTITY reorder_rewire IS ENTITY reorder_rewire IS
GENERIC( 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_nof_streams : NATURAL := 8;
g_sel_in_w : NATURAL := 3; g_sel_in_w : NATURAL := 3;
g_use_sel_table : BOOLEAN := TRUE g_use_sel_table : BOOLEAN := TRUE
......
...@@ -109,7 +109,7 @@ ARCHITECTURE tb OF tb_mms_reorder_rewire IS ...@@ -109,7 +109,7 @@ ARCHITECTURE tb OF tb_mms_reorder_rewire IS
); );
END COMPONENT; END COMPONENT;
CONSTANT c_sel_table: t_sel_table := CONSTANT c_sel_table: t_reorder_table :=
( (
--FN0 FN1 FN2 FN3 BN0 BN1 BN2 BN3 --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 ( 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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment