From 7718683c8ad4e64f5f85dee1a1b1c8a7fdc26e22 Mon Sep 17 00:00:00 2001 From: Andreas Neiser Date: Wed, 25 Feb 2015 08:57:46 +0100 Subject: [PATCH] Remove hierarchical stuff --- ADC/source/adc_handler.vhd | 16 ++++++++-------- ADC/source/adc_processor_cfd.vhd | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ADC/source/adc_handler.vhd b/ADC/source/adc_handler.vhd index 2353af4..9cc7edb 100644 --- a/ADC/source/adc_handler.vhd +++ b/ADC/source/adc_handler.vhd @@ -31,10 +31,10 @@ entity adc_handler is end entity; architecture adc_handler_arch of adc_handler is - attribute syn_keep : boolean; - attribute syn_preserve : boolean; - attribute syn_hier : string; - attribute syn_hier of adc_handler_arch : architecture is "hard"; +-- attribute syn_keep : boolean; +-- attribute syn_preserve : boolean; +-- attribute syn_hier : string; +-- attribute syn_hier of adc_handler_arch : architecture is "hard"; type psa_data_t is array (0 to DEVICES - 1) of std_logic_vector(8 downto 0); @@ -45,10 +45,10 @@ architecture adc_handler_arch of adc_handler is signal ctrl_reg : std_logic_vector(31 downto 0); signal strobe_reg : std_logic_vector(31 downto 0); - attribute syn_keep of ctrl_reg : signal is true; - attribute syn_preserve of ctrl_reg : signal is true; - attribute syn_keep of strobe_reg : signal is true; - attribute syn_preserve of strobe_reg : signal is true; +-- attribute syn_keep of ctrl_reg : signal is true; +-- attribute syn_preserve of ctrl_reg : signal is true; +-- attribute syn_keep of strobe_reg : signal is true; +-- attribute syn_preserve of strobe_reg : signal is true; signal buffer_ctrl_reg : std_logic_vector(31 downto 0); signal adc_restart : std_logic; diff --git a/ADC/source/adc_processor_cfd.vhd b/ADC/source/adc_processor_cfd.vhd index 62ebc0a..5ab9e27 100644 --- a/ADC/source/adc_processor_cfd.vhd +++ b/ADC/source/adc_processor_cfd.vhd @@ -31,14 +31,14 @@ entity adc_processor_cfd is end entity adc_processor_cfd; architecture arch of adc_processor_cfd is - attribute syn_hier : string; - attribute syn_keep : boolean; - attribute syn_preserve : boolean; - attribute syn_hier of arch : architecture is "hard"; +-- attribute syn_hier : string; +-- attribute syn_keep : boolean; +-- attribute syn_preserve : boolean; +-- attribute syn_hier of arch : architecture is "hard"; signal CONF_adc, CONF_sys : cfg_cfd_t := cfg_cfd_t_INIT; - attribute syn_keep of CONF_adc, CONF_sys : signal is true; - attribute syn_preserve of CONF_adc, CONF_sys : signal is true; +-- attribute syn_keep of CONF_adc, CONF_sys : signal is true; +-- attribute syn_preserve of CONF_adc, CONF_sys : signal is true; signal trigger_gen, trigger_mask : std_logic_vector(CHANNELS - 1 downto 0); type debug_t is array (CHANNELS - 1 downto 0) of debug_cfd_t; -- 2.43.0