From f474967a9ef78fe62472ecae580c22cd2b6bb7d6 Mon Sep 17 00:00:00 2001 From: Reinier van der Walle <walle@astron.nl> Date: Mon, 14 Feb 2022 15:36:31 +0100 Subject: [PATCH] processed review comments --- applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd index 49b0eaab36..a97a3e1d94 100644 --- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd +++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd @@ -109,7 +109,7 @@ PACKAGE sdp_pkg is CONSTANT c_sdp_W_bf_weight : NATURAL := 16; -- = w in s(w, p), s = signed CONSTANT c_sdp_W_bf_weight_fraction : NATURAL := 14; -- = p in s(w, p) CONSTANT c_sdp_W_bf_weight_magnitude : NATURAL := c_sdp_W_bf_weight - c_sdp_W_bf_weight_fraction - 1; -- = 1 - CONSTANT c_sdp_N_ring_mac10g : NATURAL := 3; -- for sdp_station_xsub_ring design. + CONSTANT c_sdp_N_ring_nof_mac10g : NATURAL := 3; -- for sdp_station_xsub_ring design. -- Derived constants CONSTANT c_sdp_FS_adc : NATURAL := 2**(c_sdp_W_adc - 1); -- full scale FS corresponds to amplitude 1.0 @@ -495,8 +495,8 @@ PACKAGE sdp_pkg is CONSTANT c_sdp_reg_dp_block_validate_err_addr_w : NATURAL := ceil_log2(c_sdp_N_ring_lanes_max) + 4; CONSTANT c_sdp_reg_dp_block_validate_bsn_at_sync_addr_w : NATURAL := ceil_log2(c_sdp_N_ring_lanes_max) + 2; CONSTANT c_sdp_reg_ring_info_addr_w : NATURAL := 2; - CONSTANT c_sdp_reg_tr_10GbE_mac_addr_w : NATURAL := ceil_log2(c_sdp_N_ring_mac10g) + 13; - CONSTANT c_sdp_reg_tr_10GbE_eth10g_addr_w : NATURAL := ceil_log2(c_sdp_N_ring_mac10g) + 1; + CONSTANT c_sdp_reg_tr_10GbE_mac_addr_w : NATURAL := ceil_log2(c_sdp_N_ring_nof_mac10g) + 13; + CONSTANT c_sdp_reg_tr_10GbE_eth10g_addr_w : NATURAL := ceil_log2(c_sdp_N_ring_nof_mac10g) + 1; CONSTANT c_sdp_reg_diag_bg_addr_w : NATURAL := 3; CONSTANT c_sdp_ram_diag_bg_addr_w : NATURAL := 7; -- GitLab