Commit 4c3d5acd authored by Dimitris Lampridis's avatar Dimitris Lampridis

drive unused wb signal outputs to zero

parent f98f833b
...@@ -40,11 +40,10 @@ use work.wishbone_pkg.all; ...@@ -40,11 +40,10 @@ use work.wishbone_pkg.all;
use work.fmc_adc_100Ms_csr_wbgen2_pkg.all; use work.fmc_adc_100Ms_csr_wbgen2_pkg.all;
entity fmc_adc_100Ms_core is entity fmc_adc_100Ms_core is
generic( generic (
g_MULTISHOT_RAM_SIZE : natural := 2048; g_MULTISHOT_RAM_SIZE : natural := 2048;
g_WB_CSR_MODE : t_wishbone_interface_mode := PIPELINED; g_WB_CSR_MODE : t_wishbone_interface_mode := PIPELINED;
g_WB_CSR_GRANULARITY : t_wishbone_address_granularity := BYTE g_WB_CSR_GRANULARITY : t_wishbone_address_granularity := BYTE);
);
port ( port (
-- Clock, reset -- Clock, reset
sys_clk_i : in std_logic; sys_clk_i : in std_logic;
...@@ -93,14 +92,12 @@ entity fmc_adc_100Ms_core is ...@@ -93,14 +92,12 @@ entity fmc_adc_100Ms_core is
gpio_ssr_ch2_o : out std_logic_vector(6 downto 0); -- Channel 2 solid state relays control gpio_ssr_ch2_o : out std_logic_vector(6 downto 0); -- Channel 2 solid state relays control
gpio_ssr_ch3_o : out std_logic_vector(6 downto 0); -- Channel 3 solid state relays control gpio_ssr_ch3_o : out std_logic_vector(6 downto 0); -- Channel 3 solid state relays control
gpio_ssr_ch4_o : out std_logic_vector(6 downto 0); -- Channel 4 solid state relays control gpio_ssr_ch4_o : out std_logic_vector(6 downto 0); -- Channel 4 solid state relays control
gpio_si570_oe_o : out std_logic -- Si570 (programmable oscillator) output enable gpio_si570_oe_o : out std_logic); -- Si570 (programmable oscillator) output enable
);
end fmc_adc_100Ms_core;
end fmc_adc_100Ms_core;
architecture rtl of fmc_adc_100Ms_core is architecture rtl of fmc_adc_100Ms_core is
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
-- Components declaration -- Components declaration
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
...@@ -659,6 +656,10 @@ begin ...@@ -659,6 +656,10 @@ begin
regs_i => csr_regin, regs_i => csr_regin,
regs_o => csr_regout); regs_o => csr_regout);
-- drive unused wb outputs
wb_csr_out.err <= '0';
wb_csr_out.rty <= '0';
csr_regin.sta_fsm_i <= acq_fsm_state; csr_regin.sta_fsm_i <= acq_fsm_state;
csr_regin.sta_serdes_pll_i <= locked_out; csr_regin.sta_serdes_pll_i <= locked_out;
csr_regin.sta_serdes_synced_i <= serdes_synced; csr_regin.sta_serdes_synced_i <= serdes_synced;
......
...@@ -49,11 +49,10 @@ package fmc_adc_100Ms_core_pkg is ...@@ -49,11 +49,10 @@ package fmc_adc_100Ms_core_pkg is
-- Components declaration -- Components declaration
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
component fmc_adc_100Ms_core component fmc_adc_100Ms_core
generic( generic (
g_MULTISHOT_RAM_SIZE : natural := 2048; g_MULTISHOT_RAM_SIZE : natural := 2048;
g_WB_CSR_MODE : t_wishbone_interface_mode := PIPELINED; g_WB_CSR_MODE : t_wishbone_interface_mode := PIPELINED;
g_WB_CSR_GRANULARITY : t_wishbone_address_granularity := BYTE g_WB_CSR_GRANULARITY : t_wishbone_address_granularity := BYTE);
);
port ( port (
-- Clock, reset -- Clock, reset
sys_clk_i : in std_logic; sys_clk_i : in std_logic;
...@@ -102,14 +101,8 @@ package fmc_adc_100Ms_core_pkg is ...@@ -102,14 +101,8 @@ package fmc_adc_100Ms_core_pkg is
gpio_ssr_ch2_o : out std_logic_vector(6 downto 0); -- Channel 2 solid state relays control gpio_ssr_ch2_o : out std_logic_vector(6 downto 0); -- Channel 2 solid state relays control
gpio_ssr_ch3_o : out std_logic_vector(6 downto 0); -- Channel 3 solid state relays control gpio_ssr_ch3_o : out std_logic_vector(6 downto 0); -- Channel 3 solid state relays control
gpio_ssr_ch4_o : out std_logic_vector(6 downto 0); -- Channel 4 solid state relays control gpio_ssr_ch4_o : out std_logic_vector(6 downto 0); -- Channel 4 solid state relays control
gpio_si570_oe_o : out std_logic -- Si570 (programmable oscillator) output enable gpio_si570_oe_o : out std_logic); -- Si570 (programmable oscillator) output enable
);
end component fmc_adc_100Ms_core;
end fmc_adc_100Ms_core_pkg;
package body fmc_adc_100Ms_core_pkg is
end component fmc_adc_100Ms_core;
end fmc_adc_100Ms_core_pkg; end fmc_adc_100Ms_core_pkg;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment