From 040332fab8b814a3eaa0e387e9ad35a6c6a7c782 Mon Sep 17 00:00:00 2001
From: Reinier van der Walle <walle@astron.nl>
Date: Wed, 24 Aug 2022 16:02:10 +0200
Subject: [PATCH] processed review comments

---
 .../lofar2_unb2b_ring/lofar2_unb2b_ring.fpga.yaml  | 14 +++++++-------
 .../lofar2_unb2c_ring/lofar2_unb2c_ring.fpga.yaml  | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/applications/lofar2/designs/lofar2_unb2b_ring/lofar2_unb2b_ring.fpga.yaml b/applications/lofar2/designs/lofar2_unb2b_ring/lofar2_unb2b_ring.fpga.yaml
index 3a814a4657..62cfbcc4f6 100644
--- a/applications/lofar2/designs/lofar2_unb2b_ring/lofar2_unb2b_ring.fpga.yaml
+++ b/applications/lofar2/designs/lofar2_unb2b_ring/lofar2_unb2b_ring.fpga.yaml
@@ -74,7 +74,7 @@ peripherals:
   - peripheral_name: dp/dp_bsn_monitor_v2
     peripheral_group: ring_rx
     number_of_peripherals: c_nof_lanes
-    peripheral_span: ceil_pow2(c_nof_rx_monitors) * 8 * MM_BUS_SIZE 
+    peripheral_span: ceil_pow2(c_nof_rx_monitors) * 8 * MM_BUS_SIZE  # number_of_ports = ceil_pow2(c_nof_rx_monitors), mm_port_span = 8 words
     parameter_overrides:
       - { name: g_nof_streams, value: c_nof_rx_monitors }
     mm_port_names:
@@ -83,7 +83,7 @@ peripherals:
   - peripheral_name: dp/dp_bsn_monitor_v2
     peripheral_group: ring_tx
     number_of_peripherals: c_nof_lanes
-    peripheral_span: ceil_pow2(c_nof_tx_monitors) * 8 * MM_BUS_SIZE 
+    peripheral_span: ceil_pow2(c_nof_tx_monitors) * 8 * MM_BUS_SIZE  # number_of_ports = ceil_pow2(c_nof_tx_monitors), mm_port_span = 8 words
     parameter_overrides:
       - { name: g_nof_streams, value: c_nof_tx_monitors }
     mm_port_names:
@@ -91,27 +91,27 @@ peripherals:
 
   - peripheral_name: ring/ring_lane_info
     number_of_peripherals: c_nof_lanes
-    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
 
   - peripheral_name: dp/dp_xonoff
     peripheral_group: lane
     number_of_peripherals: c_nof_lanes
-    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_DP_XONOFF_LANE
 
   - peripheral_name: dp/dp_xonoff
     peripheral_group: local
     number_of_peripherals: c_nof_lanes
-    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_DP_XONOFF_LOCAL
 
   - peripheral_name: dp/dp_block_validate_err
     number_of_peripherals: c_nof_lanes
-    peripheral_span: ceil_pow2(c_nof_err_counts + 3) * MM_BUS_SIZE
+    peripheral_span: ceil_pow2(c_nof_err_counts + 3) * MM_BUS_SIZE # number_of_ports = 1, mm_port_span = ceil_pow2(c_nof_err_counts + 3) words
     parameter_overrides:
       - { name: g_nof_err_counts, value: c_nof_err_counts }
     mm_port_names:
@@ -119,7 +119,7 @@ peripherals:
 
   - peripheral_name: dp/dp_block_validate_bsn_at_sync
     number_of_peripherals: c_nof_lanes
-    peripheral_span: 4 * MM_BUS_SIZE
+    peripheral_span: 4 * MM_BUS_SIZE # number_of_ports = 1, mm_port_span = 4 words
     mm_port_names:
       - REG_DP_BLOCK_VALIDATE_BSN_AT_SYNC
 
diff --git a/applications/lofar2/designs/lofar2_unb2c_ring/lofar2_unb2c_ring.fpga.yaml b/applications/lofar2/designs/lofar2_unb2c_ring/lofar2_unb2c_ring.fpga.yaml
index 37037abf09..c67e335267 100644
--- a/applications/lofar2/designs/lofar2_unb2c_ring/lofar2_unb2c_ring.fpga.yaml
+++ b/applications/lofar2/designs/lofar2_unb2c_ring/lofar2_unb2c_ring.fpga.yaml
@@ -74,7 +74,7 @@ peripherals:
   - peripheral_name: dp/dp_bsn_monitor_v2
     peripheral_group: ring_rx
     number_of_peripherals: c_nof_lanes
-    peripheral_span: ceil_pow2(c_nof_rx_monitors) * 8 * MM_BUS_SIZE 
+    peripheral_span: ceil_pow2(c_nof_rx_monitors) * 8 * MM_BUS_SIZE  # number_of_ports = ceil_pow2(c_nof_rx_monitors), mm_port_span = 8 words
     parameter_overrides:
       - { name: g_nof_streams, value: c_nof_rx_monitors }
     mm_port_names:
@@ -83,7 +83,7 @@ peripherals:
   - peripheral_name: dp/dp_bsn_monitor_v2
     peripheral_group: ring_tx
     number_of_peripherals: c_nof_lanes
-    peripheral_span: ceil_pow2(c_nof_tx_monitors) * 8 * MM_BUS_SIZE 
+    peripheral_span: ceil_pow2(c_nof_tx_monitors) * 8 * MM_BUS_SIZE  # number_of_ports = ceil_pow2(c_nof_tx_monitors), mm_port_span = 8 words
     parameter_overrides:
       - { name: g_nof_streams, value: c_nof_tx_monitors }
     mm_port_names:
@@ -91,27 +91,27 @@ peripherals:
 
   - peripheral_name: ring/ring_lane_info
     number_of_peripherals: c_nof_lanes
-    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
 
   - peripheral_name: dp/dp_xonoff
     peripheral_group: lane
     number_of_peripherals: c_nof_lanes
-    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_DP_XONOFF_LANE
 
   - peripheral_name: dp/dp_xonoff
     peripheral_group: local
     number_of_peripherals: c_nof_lanes
-    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_DP_XONOFF_LOCAL
 
   - peripheral_name: dp/dp_block_validate_err
     number_of_peripherals: c_nof_lanes
-    peripheral_span: ceil_pow2(c_nof_err_counts + 3) * MM_BUS_SIZE
+    peripheral_span: ceil_pow2(c_nof_err_counts + 3) * MM_BUS_SIZE # number_of_ports = 1, mm_port_span = ceil_pow2(c_nof_err_counts + 3) words
     parameter_overrides:
       - { name: g_nof_err_counts, value: c_nof_err_counts }
     mm_port_names:
@@ -119,7 +119,7 @@ peripherals:
 
   - peripheral_name: dp/dp_block_validate_bsn_at_sync
     number_of_peripherals: c_nof_lanes
-    peripheral_span: 4 * MM_BUS_SIZE
+    peripheral_span: 4 * MM_BUS_SIZE # number_of_ports = 1, mm_port_span = 4 words
     mm_port_names:
       - REG_DP_BLOCK_VALIDATE_BSN_AT_SYNC
 
-- 
GitLab