few updates to project files, software versions and media interface placement

diff --git a/backplanemaster/trb3sc_master.prj b/backplanemaster/trb3sc_master.prj
index a8922211ec1b0f064b495339c5a8b18a6d5e4add..902d5460920b1096c1925b2db86dccaf1a30dc8c 100644 (file)
--- a/backplanemaster/trb3sc_master.prj
+++ b/backplanemaster/trb3sc_master.prj
@@ -44,6 +44,7 @@ project -result_file "workdir/trb3sc_master.edf"
 
 #implementation attributes
 
+set_option -vhdl2008 1
 set_option -vlog_std v2001
 set_option -project_relative_includes 1
 impl -active "workdir"

diff --git a/cts/trb3sc_cts.prj b/cts/trb3sc_cts.prj
index 2fd46e2725d1a984dc5982eae46114827364e148..5728558a9b321229db0daa180c836e020888f6c2 100644 (file)
--- a/cts/trb3sc_cts.prj
+++ b/cts/trb3sc_cts.prj
@@ -116,6 +116,7 @@ add_file -vhdl -lib work "../../trbnet/special/spi_slim.vhd"
 add_file -vhdl -lib work "../../trbnet/special/spi_databus_memory.vhd"
 add_file -vhdl -lib work "../../trbnet/special/fpga_reboot.vhd"
 add_file -vhdl -lib work "../../trb3sc/code/trb3sc_tools.vhd"
+add_file -vhdl -lib work "../../trb3sc/code/common_i2c.vhd"
 add_file -vhdl -lib work "../../trb3sc/code/debuguart.vhd"
 add_file -vhdl -lib work "../../trbnet/special/uart.vhd"
 add_file -vhdl -lib work "../../trbnet/special/uart_rec.vhd"
@@ -124,6 +125,15 @@ add_file -vhdl -lib work "../../trbnet/special/spi_ltc2600.vhd"
 add_file -vhdl -lib work "../../trbnet/basics/ram_dp_19x8_preset.vhd"
 add_file -vhdl -lib work "../../trb3sc/code/adc_controller.vhd"
 
+add_file -vhdl -lib work "../../trbnet/special/trb_net_i2cwire.vhd"
+add_file -vhdl -lib work "../../vhdlbasics/interface/i2c_gstart.vhd"
+add_file -vhdl -lib work "../../vhdlbasics/interface/i2c_sendb.vhd"
+add_file -vhdl -lib work "../../vhdlbasics/interface/i2c_slim.vhd"
+
+add_file -vhdl -lib work "../../vhdlbasics/interface/i2c_gstart2.vhd"
+add_file -vhdl -lib work "../../vhdlbasics/interface/i2c_sendb2.vhd"
+add_file -vhdl -lib work "../../vhdlbasics/interface/i2c_slim2.vhd"
+
 #SlowControl files
 add_file -vhdl -lib work "../../trbnet/trb_net16_regio_bus_handler.vhd"
 add_file -vhdl -lib work "../../trbnet/trb_net16_regio_bus_handler_record.vhd"

diff --git a/cts/trb3sc_cts.vhd b/cts/trb3sc_cts.vhd
index 124d62a4be20899221fa2715880b8d13d1d6938d..09d0f30575275953d199e925dd031ff0bfeff602 100644 (file)
--- a/cts/trb3sc_cts.vhd
+++ b/cts/trb3sc_cts.vhd
@@ -49,14 +49,14 @@ entity trb3sc_cts is
     SFP_MOD2             : inout std_logic_vector( 1 downto 0) := (others => 'Z');
     SFP_TX_DIS           : out   std_logic_vector( 1 downto 0) := (others => '0');  
 
-    LED_HUB_LINKOK       : out   std_logic_vector(8*USE_ADDON-1 downto 1);
-    LED_HUB_RX           : out   std_logic_vector(8*USE_ADDON-1 downto 1);
-    LED_HUB_TX           : out   std_logic_vector(8*USE_ADDON-1 downto 1);
-    HUB_MOD0             : in    std_logic_vector(8*USE_ADDON-1 downto 1);
-    HUB_MOD1             : inout std_logic_vector(8*USE_ADDON-1 downto 1);
-    HUB_MOD2             : inout std_logic_vector(8*USE_ADDON-1 downto 1);
-    HUB_TXDIS            : out   std_logic_vector(8*USE_ADDON-1 downto 1);
-    HUB_LOS              : in    std_logic_vector(8*USE_ADDON-1 downto 1);
+    LED_HUB_LINKOK       : out   std_logic_vector(8*USE_ADDON downto 1);
+    LED_HUB_RX           : out   std_logic_vector(8*USE_ADDON downto 1);
+    LED_HUB_TX           : out   std_logic_vector(8*USE_ADDON downto 1);
+    HUB_MOD0             : in    std_logic_vector(8*USE_ADDON downto 1);
+    HUB_MOD1             : inout std_logic_vector(8*USE_ADDON downto 1);
+    HUB_MOD2             : inout std_logic_vector(8*USE_ADDON downto 1);
+    HUB_TXDIS            : out   std_logic_vector(8*USE_ADDON downto 1);
+    HUB_LOS              : in    std_logic_vector(8*USE_ADDON downto 1);
 
     --Lines to slaves
     BACK_MASTER_READY    : out   std_logic_vector(9*USE_BACKPLANE-1 downto 0);
@@ -963,7 +963,7 @@ end generate;
         RESET_IN          => reset_i,
         
         TIMER_CLOCK_IN    => timer.tick_us, 
-        TIMER_RESET_IN    => RJ_IO_IN(0),
+        TIMER_RESET_IN    => RJ_IO_IN(1),
 
         TRIGGER_IN         => cts_trigger_out,
         BUSRDO_RX          => cts_rdo_rx,

diff --git a/hub/config_compile_frankfurt.pl b/hub/config_compile_frankfurt.pl
index e6790b2c0835223e780964e678724336a7bbe026..00517ccea3d736807de2e96eddef40add4ee97e0 100644 (file)
--- a/hub/config_compile_frankfurt.pl
+++ b/hub/config_compile_frankfurt.pl
@@ -2,7 +2,7 @@ TOPNAME                      => "trb3sc_hub",
 lm_license_file_for_synplify => "27020\@jspc29", #"27000\@lxcad01.gsi.de";
 lm_license_file_for_par      => "1710\@jspc29",
 lattice_path                 => '/d/jspc29/lattice/diamond/3.12',
-synplify_path                => '/d/jspc29/lattice/synplify/S-2021.09-SP2',
+synplify_path                => '/d/jspc29/lattice/synplify/T-2022.09-SP2',
 #synplify_path                => '/d/jspc29/lattice/synplify/L-2016.09-1/',
 #synplify_command             => "/d/jspc29/lattice/diamond/3.5_x64/bin/lin64/synpwrap -fg -options",
 #synplify_command             => "/d/jspc29/lattice/synplify/J-2014.09-SP2/bin/synplify_premier_dp",

diff --git a/hub/trb3sc_hub.lpf b/hub/trb3sc_hub.lpf
index 98bc436f726de42a7f6ab690c683f5e86a3350b7..d2fc98c1b24eb59b7a9959f01b5e0c4dee137c4f 100644 (file)
--- a/hub/trb3sc_hub.lpf
+++ b/hub/trb3sc_hub.lpf
@@ -7,7 +7,7 @@ LOCATE COMP "gen_GBE.GBE/physical_impl_gen.physical/impl_gen.gbe_serdes/PCSD_INS
 
 
 
-REGION         "MEDIA_DOWN1" "R102C20D" 13 120;
+REGION         "MEDIA_DOWN1" "R102C20D" 14 150;
 LOCATE UGROUP  "gen_PCSA.THE_MEDIA_PCSA/media_interface_group" REGION "MEDIA_DOWN1" ; 
 LOCATE UGROUP  "gen_PCSB_BKPL.THE_MEDIA_4_PCSB/media_interface_group" REGION "MEDIA_DOWN1" ;   
 LOCATE UGROUP  "gen_PCSB_noBKPL.THE_MEDIA_4_PCSB/media_interface_group" REGION "MEDIA_DOWN1" ; 
@@ -73,7 +73,10 @@ MAXDELAY   TO ASIC  THE_MEDIA_4_PCSC/THE_SERDES/PCSD_INST PIN SCIRD 15 ns;
 MULTICYCLE TO ASIC  gen_PCSD.THE_MEDIA_4_PCSD/THE_SERDES/PCSD_INST PIN SCIRD 15 ns;
 MAXDELAY   TO ASIC  gen_PCSD.THE_MEDIA_4_PCSD/THE_SERDES/PCSD_INST PIN SCIRD 15 ns;
 
-
+# PROHIBIT PRIMARY   NET "gen_hub_no_gbe.THE_HUB/stat_busycntexcl_ack";
+# PROHIBIT SECONDARY NET "gen_hub_no_gbe.THE_HUB/stat_busycntexcl_ack";
+# PROHIBIT PRIMARY   NET "gen_hub_no_gbe.THE_HUB/stat_busycntincl_ack";
+# PROHIBIT SECONDARY NET "gen_hub_no_gbe.THE_HUB/stat_busycntincl_ack";
 
 # PROHIBIT PRIMARY   NET "THE_MEDIA_INTERFACE/clk_rx_full" ;
 # PROHIBIT SECONDARY NET "THE_MEDIA_INTERFACE/clk_rx_full" ;

diff --git a/hub/trb3sc_hub.prj b/hub/trb3sc_hub.prj
index 2f217a28fa5cf87ec24c879b88cb31ad95a82699..6627f17530b1066bf5458ccfa3c7973703c1997f 100644 (file)
--- a/hub/trb3sc_hub.prj
+++ b/hub/trb3sc_hub.prj
@@ -14,6 +14,7 @@ set_option -default_enum_encoding sequential
 set_option -symbolic_fsm_compiler 1
 set_option -top_module "trb3sc_hub"
 set_option -resource_sharing false
+set_option -vhdl2008 true
 
 # map options
 set_option -frequency 120

diff --git a/hub/trb3sc_hub.vhd b/hub/trb3sc_hub.vhd
index 7d1108d9210738146211864b13d0f48a21e38922..defb25ae0d93ff1aa9e6fb8b884d166b7a30553b 100644 (file)
--- a/hub/trb3sc_hub.vhd
+++ b/hub/trb3sc_hub.vhd
@@ -868,14 +868,14 @@ end generate;
                         not  (med2int(8).stat_op(10) or med2int(8).stat_op(11) or not med2int(8).stat_op(9))    when INCLUDE_GBE = 1 and USE_BACKPLANE = 1 else
                              '1';
 
-  TEST_LINE(0) <= med2int(INTERFACE_NUM-1).stat_op(13);
-  TEST_LINE(1) <= med2int(INTERFACE_NUM-1).stat_op(15);
-  TEST_LINE(2) <= clear_i;
-  TEST_LINE(3) <= reset_i;
+  --TEST_LINE(0) <= med2int(INTERFACE_NUM-1).stat_op(13);
+  --TEST_LINE(1) <= med2int(INTERFACE_NUM-1).stat_op(15);
+  --TEST_LINE(2) <= clear_i;
+  --TEST_LINE(3) <= reset_i;
 --   TEST_LINE(4) <= time_counter(26);
 --   TEST_LINE(5) <= BACK_GPIO(1);
 --   TEST_LINE(6) <= sfp_txdis_i;
-  TEST_LINE(7) <= med2int(INTERFACE_NUM-1).stat_op(9);
+  --TEST_LINE(7) <= med2int(INTERFACE_NUM-1).stat_op(9);
     
   
 end architecture;

diff --git a/pinout/trb3sc_hub_ctsrj.lpf b/pinout/trb3sc_hub_ctsrj.lpf
index bb731465d789eea34143f0476fa45a164b49db92..b1b9a7e14b3c5555108a03cdaa1d7f310238ef19 100644 (file)
--- a/pinout/trb3sc_hub_ctsrj.lpf
+++ b/pinout/trb3sc_hub_ctsrj.lpf
@@ -283,7 +283,7 @@ IOBUF  PORT "ADC_DOUT" IO_TYPE=LVTTL33 PULLMODE=UP ;
 # RJ-45 connectors\r
 #################################################################\r
 LOCATE COMP "RJ_IO_0"                      SITE "R28";\r
-LOCATE COMP "RJ_IO_1"                      SITE "R31";\r
+#LOCATE COMP "RJ_IO_1"                      SITE "R31";\r
 LOCATE COMP "RJ_IO_2"                      SITE "R26";\r
 LOCATE COMP "RJ_IO_3"                      SITE "R34";\r
 #LOCATE COMP "RJ_IO_1_N"                      SITE "R27";\r
@@ -291,7 +291,7 @@ LOCATE COMP "RJ_IO_3"                      SITE "R34";
 #LOCATE COMP "RJ_IO_3_N"                      SITE "R25";\r
 #LOCATE COMP "RJ_IO_4_N"                      SITE "R33";\r
 IOBUF  PORT "RJ_IO_0" IO_TYPE=LVDS25 ;\r
-IOBUF  PORT "RJ_IO_1" IO_TYPE=LVDS25 ;\r
+#IOBUF  PORT "RJ_IO_1" IO_TYPE=LVDS25 ;\r
 IOBUF  PORT "RJ_IO_2" IO_TYPE=LVDS25E ;\r
 IOBUF  PORT "RJ_IO_3" IO_TYPE=LVDS25E ;\r
 \r