From 7da83c34458031d1efbc74f6b90fa2e81aca09f2 Mon Sep 17 00:00:00 2001 From: donker <donker@astron.nl> Date: Tue, 11 Jan 2022 07:01:23 +0100 Subject: [PATCH] L2SDP-515, after repairing this bug, changed fixed value to parameter value. --- libraries/base/dp/dp.peripheral.yaml | 4 ++-- libraries/base/util/util.peripheral.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/base/dp/dp.peripheral.yaml b/libraries/base/dp/dp.peripheral.yaml index c6099df21d..3d1ad44d25 100644 --- a/libraries/base/dp/dp.peripheral.yaml +++ b/libraries/base/dp/dp.peripheral.yaml @@ -78,7 +78,7 @@ peripherals: field_description: | "When enable_stream = 0 the data stream is stopped, else when 1 then the data stream is passed on. Toggling the data stream on or off happens at block or packet boundaries." - number_of_fields: 1 #g_nof_streams #sel_a_b(g_combine_streams, 1, g_nof_streams) + number_of_fields: g_nof_streams # sel_a_b(g_combine_streams, 1, g_nof_streams) address_offset: 0x0 mm_width: 1 access_mode: RW @@ -431,7 +431,7 @@ peripherals: fields: - - field_name: err_count_index field_description: "The total amount of discarded DP blocks per bit in the in_sosi.err field (g_nof_err_counts-1 DOWNTO 0)." - number_of_fields: 8 #g_nof_err_counts + number_of_fields: g_nof_err_counts address_offset: 0 access_mode: RO - - field_name: total_discarded_blocks diff --git a/libraries/base/util/util.peripheral.yaml b/libraries/base/util/util.peripheral.yaml index 2a4a753577..8406cf5175 100644 --- a/libraries/base/util/util.peripheral.yaml +++ b/libraries/base/util/util.peripheral.yaml @@ -9,21 +9,21 @@ peripherals: peripheral_description: "Heater component, see util_heater.vhd" parameters: - { name: c_nof_mac4_max, value: 800 } - - { name: c_reg_nof_words, value: c_nof_mac4_max // 32 } # = 25 + - { name: c_reg_nof_words, value: c_nof_mac4_max // 32 } # = 25 for c_nof_mac4_max=800 mm_ports: # MM port for util_heater.vhd - mm_port_name: REG_HEATER mm_port_type: REG - mm_port_span: ceil_pow2(25) * MM_BUS_SIZE #ceil_pow2(c_reg_nof_words) * MM_BUS_SIZE + mm_port_span: ceil_pow2(25) * MM_BUS_SIZE # ceil_pow2(c_reg_nof_words) * MM_BUS_SIZE mm_port_description: "Heater control." fields: - - field_name: enable field_description: | "The heater elements can be enabled or disabled via this MM register. Each heater element consists of a MAC4. A MAC4 uses 4 18x18 multipliers. - The MM register allows enabling 0, 1, more or all MAC4 under SW control. + The MM register allows enabling 0, 1, more or all MAC4 under SW control. In this way it is possible to vary the power consumption during run time." - number_of_fields: 25 #c_reg_nof_words + number_of_fields: c_reg_nof_words address_offset: 0x0 -- GitLab