small fixes to make it compile again

diff --git a/combiner/combiner.prj b/combiner/combiner.prj
index eb8b23b6c3fcc3dea4294f756d5ef8944cddece0..7351b3e8f806e2aafbabc517478e5337648b5334 100644 (file)
--- 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 13fd3ba2d4a2af54ced81538aedafa701be6c61c..ff1ecc8746a08082c797fc15a5a99ca34c1408c7 100644 (file)
--- 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 f7a290b7c9d89e4189435c1597b8aaf16faef2f1..cd5287b1f84029ab5da3a005a06be3db901de9da 100644 (file)
--- 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