From 807037e0845ee5b8cc0fa3b87e335e1f68d04da4 Mon Sep 17 00:00:00 2001 From: Zanting <zanting> Date: Thu, 28 Jan 2016 09:03:19 +0000 Subject: [PATCH] Added technology generic --- libraries/dsp/st/src/vhdl/st_calc.vhd | 10 ++++++---- libraries/dsp/st/src/vhdl/st_sst.vhd | 19 ++++++++++++------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/libraries/dsp/st/src/vhdl/st_calc.vhd b/libraries/dsp/st/src/vhdl/st_calc.vhd index bf82beafa1..d2f51499b5 100644 --- a/libraries/dsp/st/src/vhdl/st_calc.vhd +++ b/libraries/dsp/st/src/vhdl/st_calc.vhd @@ -235,8 +235,9 @@ BEGIN -- accumulator memory for real part ram_re: ENTITY common_lib.common_ram_r_w GENERIC MAP ( - g_ram => c_mem_acc, - g_init_file => "UNUSED" + g_technology => g_technology, + g_ram => c_mem_acc, + g_init_file => "UNUSED" ) PORT MAP ( rst => rst, @@ -280,8 +281,9 @@ BEGIN -- dual port memory ram_im: ENTITY common_lib.common_ram_r_w GENERIC MAP ( - g_ram => c_mem_acc, - g_init_file => "UNUSED" + g_technology => g_technology, + g_ram => c_mem_acc, + g_init_file => "UNUSED" ) PORT MAP ( rst => rst, diff --git a/libraries/dsp/st/src/vhdl/st_sst.vhd b/libraries/dsp/st/src/vhdl/st_sst.vhd index 84be668b41..b21195656a 100644 --- a/libraries/dsp/st/src/vhdl/st_sst.vhd +++ b/libraries/dsp/st/src/vhdl/st_sst.vhd @@ -19,12 +19,13 @@ -- ------------------------------------------------------------------------------- -LIBRARY IEEE, common_lib, mm_lib, dp_lib; +LIBRARY IEEE, common_lib, mm_lib, technology_lib, dp_lib; USE IEEE.std_logic_1164.ALL; USE common_lib.common_pkg.ALL; USE common_lib.common_mem_pkg.ALL; USE common_lib.common_field_pkg.ALL; USE dp_lib.dp_stream_pkg.ALL; +USE technology_lib.technology_select_pkg.ALL; -- Purpose: -- Store the (auto)power statistics of a complex input stream with @@ -54,6 +55,7 @@ USE dp_lib.dp_stream_pkg.ALL; ENTITY st_sst IS GENERIC ( + g_technology : NATURAL := c_tech_select_default; g_nof_stat : NATURAL := 512; -- nof accumulators g_xst_enable : BOOLEAN := FALSE; -- when set to true, an extra memory is instantiated to hold the imaginary part of the cross-correlation results g_in_data_w : NATURAL := 18; -- width o dth edata to be accumulated @@ -203,6 +205,7 @@ BEGIN st_calc : ENTITY work.st_calc GENERIC MAP ( + g_technology => g_technology, g_nof_mux => 1, g_nof_stat => g_nof_stat, g_in_dat_w => g_in_data_w, @@ -231,9 +234,10 @@ BEGIN stat_reg_re : ENTITY common_lib.common_ram_crw_crw_ratio GENERIC MAP ( - g_ram_a => c_mm_ram, - g_ram_b => c_stat_ram, - g_init_file => "UNUSED" + g_technology => g_technology, + g_ram_a => c_mm_ram, + g_ram_b => c_stat_ram, + g_init_file => "UNUSED" ) PORT MAP ( rst_a => mm_rst, @@ -282,9 +286,10 @@ BEGIN stat_reg_im : ENTITY common_lib.common_ram_crw_crw_ratio GENERIC MAP ( - g_ram_a => c_mm_ram, - g_ram_b => c_stat_ram, - g_init_file => "UNUSED" + g_technology => g_technology, + g_ram_a => c_mm_ram, + g_ram_b => c_stat_ram, + g_init_file => "UNUSED" ) PORT MAP ( rst_a => mm_rst, -- GitLab