From a6209f3142a43e680eb7ed3049a2e9fd2fd6df23 Mon Sep 17 00:00:00 2001
From: Eric Kooistra <kooistra@astron.nl>
Date: Fri, 12 Mar 2021 16:26:09 +0100
Subject: [PATCH] Correct reorder_col_wide by using number_of_peripherals array
level.
---
.../lofar2_unb2b_beamformer.fpga.yaml | 3 +--
libraries/base/reorder/reorder.peripheral.yaml | 9 +++------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/applications/lofar2/designs/lofar2_unb2b_beamformer/lofar2_unb2b_beamformer.fpga.yaml b/applications/lofar2/designs/lofar2_unb2b_beamformer/lofar2_unb2b_beamformer.fpga.yaml
index 123017ea4a..ac11f10e23 100644
--- a/applications/lofar2/designs/lofar2_unb2b_beamformer/lofar2_unb2b_beamformer.fpga.yaml
+++ b/applications/lofar2/designs/lofar2_unb2b_beamformer/lofar2_unb2b_beamformer.fpga.yaml
@@ -197,12 +197,11 @@ peripherals:
- REG_SDP_INFO
- peripheral_name: reorder/reorder_col_wide
+ number_of_peripherals: c_N_beamsets
parameter_overrides:
- - { name: g_nof_instances, value: c_N_beamsets }
- { name: g_wb_factor, value: c_P_pfb }
- { name: g_nof_ch_in, value: c_N_sub * c_Q_fft }
- { name: g_nof_ch_sel, value: c_S_sub_bf * c_Q_fft }
slave_port_names:
- RAM_SS_SS_WIDE
-
diff --git a/libraries/base/reorder/reorder.peripheral.yaml b/libraries/base/reorder/reorder.peripheral.yaml
index efd54e4b2b..77d3417d71 100644
--- a/libraries/base/reorder/reorder.peripheral.yaml
+++ b/libraries/base/reorder/reorder.peripheral.yaml
@@ -13,11 +13,8 @@ peripherals:
selected data is passed on. The index fields specify the order and the index of
the input data that is passed on.
There are g_wb_factor parallel data streams. All data streams can be reordered
- independently. The selections for are stored as [g_wb_factor][g_nof_ch_sel].
- Use g_nof_instances > 1 to have an array of multiple instances of the reorder_col_wide."
+ independently."
parameters:
- # Parameters of pi_ss_ss_wide.py
- - { name: g_nof_instances, value: 1 }
# Parameters of reorder_col_wide.vhd / reorder_col.vhd
- { name: g_wb_factor, value: 1 }
- { name: g_nof_ch_in, value: 256 }
@@ -27,11 +24,11 @@ peripherals:
- slave_name: RAM_SS_SS_WIDE
slave_description: ""
slave_type: RAM
- number_of_slaves: g_nof_instances
+ number_of_slaves: g_wb_factor
fields:
- - field_name: index
field_description: ""
width: ceil_log2(g_nof_ch_in)
address_offset: 0x0
- number_of_fields: g_nof_ch_sel * g_wb_factor
+ number_of_fields: g_nof_ch_sel
--
GitLab