From e9b00721cabe7159d4e5c0bb2accefed1168ba98 Mon Sep 17 00:00:00 2001
From: Eric Kooistra <kooistra@astron.nl>
Date: Thu, 31 Aug 2023 09:43:33 +0200
Subject: [PATCH] Move overloaded func_reorder_transpose() to more logical
place.
---
.../base/reorder/src/vhdl/reorder_pkg.vhd | 34 +++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/libraries/base/reorder/src/vhdl/reorder_pkg.vhd b/libraries/base/reorder/src/vhdl/reorder_pkg.vhd
index dc310b6389..f0cb42898d 100644
--- a/libraries/base/reorder/src/vhdl/reorder_pkg.vhd
+++ b/libraries/base/reorder/src/vhdl/reorder_pkg.vhd
@@ -136,6 +136,12 @@ package reorder_pkg is
transpose : t_reorder_transpose)
return t_reorder_transpose;
+ -- Variant with nof_words_per_data = 1
+ function func_reorder_transpose(nof_blocks_per_packet : natural;
+ nof_data_per_block : natural;
+ transpose : t_reorder_transpose)
+ return t_reorder_transpose;
+
-- Alternative implementation using a look up list:
-- func_reorder_transpose_look_up() = func_reorder_transpose()
function func_reorder_transpose_look_up(nof_blocks_per_packet : natural;
@@ -144,12 +150,6 @@ package reorder_pkg is
transpose : t_reorder_transpose)
return t_reorder_transpose;
- -- Variant with nof_words_per_data = 1
- function func_reorder_transpose(nof_blocks_per_packet : natural;
- nof_data_per_block : natural;
- transpose : t_reorder_transpose)
- return t_reorder_transpose;
-
-----------------------------------------------------------------------------
-- Reorder identity
-- . so no reordering, same out as in, but delayed due to dual page
@@ -358,6 +358,17 @@ package body reorder_pkg is
return v;
end;
+ function func_reorder_transpose(nof_blocks_per_packet : natural;
+ nof_data_per_block : natural;
+ transpose : t_reorder_transpose)
+ return t_reorder_transpose is
+ begin
+ return func_reorder_transpose(nof_blocks_per_packet,
+ nof_data_per_block,
+ 1,
+ transpose);
+ end;
+
function func_reorder_transpose_look_up(nof_blocks_per_packet : natural;
nof_data_per_block : natural;
nof_words_per_data : natural;
@@ -388,17 +399,6 @@ package body reorder_pkg is
return v;
end;
- function func_reorder_transpose(nof_blocks_per_packet : natural;
- nof_data_per_block : natural;
- transpose : t_reorder_transpose)
- return t_reorder_transpose is
- begin
- return func_reorder_transpose(nof_blocks_per_packet,
- nof_data_per_block,
- 1,
- transpose);
- end;
-
function func_reorder_identity(nof_ch_per_packet : natural;
identity : t_reorder_identity)
return t_reorder_identity is
--
GitLab