From 20e0e69ed657cad10cb4f9b03aa28cb0f139db0c Mon Sep 17 00:00:00 2001
From: Reinier van der Walle <walle@astron.nl>
Date: Wed, 24 Aug 2022 12:57:15 +0200
Subject: [PATCH] processed review comments
---
.../disturb2_unb2b_station.fpga.yaml | 7 ++++---
.../lofar2_unb2b_sdp_station.fpga.yaml | 2 +-
.../lofar2_unb2c_sdp_station.fpga.yaml | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/applications/disturb2/designs/disturb2_unb2b_station/disturb2_unb2b_station.fpga.yaml b/applications/disturb2/designs/disturb2_unb2b_station/disturb2_unb2b_station.fpga.yaml
index 2a10dfa4f6..5aed850106 100644
--- a/applications/disturb2/designs/disturb2_unb2b_station/disturb2_unb2b_station.fpga.yaml
+++ b/applications/disturb2/designs/disturb2_unb2b_station/disturb2_unb2b_station.fpga.yaml
@@ -14,6 +14,7 @@ parameters:
- { name: c_N_pn_lb, value: 16 }
- { name: c_S_pn, value: 12 }
- { name: c_Q_fft, value: 2 }
+ - { name: c_P_sum, value: 2 }
- { name: c_P_sq, value: 1 + c_N_pn_lb // 2 } # = 1 + 16 // 2 = 9, on revision xsub_one only first X_sq cell is used
- { name: c_X_sq, value: c_S_pn * c_S_pn } # = 144
- { name: c_N_crosslets, value: 7 }
@@ -370,7 +371,7 @@ peripherals:
number_of_peripherals: c_N_beamsets
peripheral_span: ceil_pow2(c_P_sum) * 2 * MM_BUS_SIZE # number_of_ports = c_P_sum, mm_port_span = 2 words
parameter_overrides:
- - { name: g_nof_streams, value: 2 }
+ - { name: g_nof_streams, value: c_P_sum }
mm_port_names:
- REG_BSN_ALIGN_V2_BF
@@ -379,7 +380,7 @@ peripherals:
number_of_peripherals: c_N_beamsets
peripheral_span: ceil_pow2(c_P_sum) * 8 * MM_BUS_SIZE # number_of_ports = c_P_sum, mm_port_span = 8 words
parameter_overrides:
- - { name: g_nof_streams, value: 2 }
+ - { name: g_nof_streams, value: c_P_sum }
mm_port_names:
- REG_BSN_MONITOR_V2_RX_ALIGN_BF
@@ -395,7 +396,7 @@ peripherals:
- peripheral_name: ring/ring_lane_info
peripheral_group: bf
number_of_peripherals: c_N_beamsets
- peripheral_span: 2 * MM_BUS_SIZE
+ peripheral_span: 2 * MM_BUS_SIZE # number_of_ports = 1, mm_port_span = 2 words
mm_port_names:
- REG_RING_LANE_INFO_BF
diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.fpga.yaml b/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.fpga.yaml
index 0e7f017663..26b558380e 100644
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.fpga.yaml
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.fpga.yaml
@@ -394,7 +394,7 @@ peripherals:
- peripheral_name: ring/ring_lane_info
peripheral_group: bf
number_of_peripherals: c_N_beamsets
- peripheral_span: 2 * MM_BUS_SIZE
+ peripheral_span: 2 * MM_BUS_SIZE # number_of_ports = 1, mm_port_span = 2 words
mm_port_names:
- REG_RING_LANE_INFO_BF
diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/lofar2_unb2c_sdp_station.fpga.yaml b/applications/lofar2/designs/lofar2_unb2c_sdp_station/lofar2_unb2c_sdp_station.fpga.yaml
index 1b3fae928a..3155c2a507 100644
--- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/lofar2_unb2c_sdp_station.fpga.yaml
+++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/lofar2_unb2c_sdp_station.fpga.yaml
@@ -394,7 +394,7 @@ peripherals:
- peripheral_name: ring/ring_lane_info
peripheral_group: bf
number_of_peripherals: c_N_beamsets
- peripheral_span: 2 * MM_BUS_SIZE
+ peripheral_span: 2 * MM_BUS_SIZE # number_of_ports = 1, mm_port_span = 2 words
mm_port_names:
- REG_RING_LANE_INFO_BF
--
GitLab