From 0a9fcb7af65d89646ee0ed91e7ad2bac4eec4f63 Mon Sep 17 00:00:00 2001 From: Ingo Froehlich Date: Fri, 3 Jul 2020 11:39:00 +0200 Subject: [PATCH] small fixes to make it compile again --- combiner/combiner.prj | 2 +- combiner/config.vhd | 5 ++++- dirich/config.vhd | 5 ++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/combiner/combiner.prj b/combiner/combiner.prj index eb8b23b..7351b3e 100644 --- a/combiner/combiner.prj +++ b/combiner/combiner.prj @@ -181,7 +181,7 @@ add_file -vhdl -lib work "../../trbnet/basics/pulse_stretch.vhd" #Hub add_file -vhdl -lib work "../../trbnet/trb_net16_api_ipu_streaming.vhd" -add_file -vhdl -lib work "../../trbnet/trb_net16_hub_streaming_port.vhd" +#add_file -vhdl -lib work "../../trbnet/trb_net16_hub_streaming_port.vhd" add_file -vhdl -lib work "../../trbnet/trb_net16_hub_streaming_port_sctrl_record.vhd" add_file -vhdl -lib work "../../trbnet/trb_net16_hub_base.vhd" add_file -vhdl -lib work "../../trbnet/trb_net16_hub_logic_2.vhd" diff --git a/combiner/config.vhd b/combiner/config.vhd index 13fd3ba..ff1ecc8 100644 --- a/combiner/config.vhd +++ b/combiner/config.vhd @@ -38,8 +38,11 @@ package config is constant INCLUDE_GBE : integer := c_NO; + --Retransmission constant USE_RETRANSMISSION : integer := c_YES; - + + --Misc + constant FPGA_TYPE : integer := 3; --3: ECP3, 5: ECP5 ------------------------------------------------------------------------------ --End of design configuration diff --git a/dirich/config.vhd b/dirich/config.vhd index f7a290b..cd5287b 100644 --- a/dirich/config.vhd +++ b/dirich/config.vhd @@ -13,9 +13,7 @@ package config is constant DIRICH_VERSION : integer := 2; --1 or 2. --TDC settings - constant BOARD : string := "dirich"; -- Options: dirich, trb3 - constant FPGA_TYPE : integer := 5; --3: ECP3, 5: ECP5 constant NUM_TDC_MODULES : integer range 1 to 4 := 1; -- number of tdc modules to implement constant NUM_TDC_CHANNELS : integer range 1 to 65 := 33; -- number of tdc channels per module constant NUM_TDC_CHANNELS_POWER2 : integer range 0 to 6 := 5; --the nearest power of two, for convenience reasons @@ -63,7 +61,8 @@ package config is constant USE_RETRANSMISSION : integer := c_YES; --Misc - constant FPGA_SIZE : string := "85KUM"; + constant FPGA_SIZE : string := "85KUM"; + constant FPGA_TYPE : integer := 5; --3: ECP3, 5: ECP5 ------------------------------------------------------------------------------ --End of design configuration -- 2.43.0