Enable trb3 central hub without GbE again.

diff --git a/trb3_gbe/config_compile_frankfurt.pl b/trb3_gbe/config_compile_frankfurt.pl
new file mode 100644 (file)
index 0000000..511871c
--- /dev/null
+++ b/trb3_gbe/config_compile_frankfurt.pl
@@ -0,0 +1,18 @@
+TOPNAME                      => "trb3_central_gbe",
+lm_license_file_for_synplify => "27020\@jspc29", #"27000\@lxcad01.gsi.de";
+lm_license_file_for_par      => "1702\@hadeb05.gsi.de",
+lattice_path                 => '/d/jspc29/lattice/diamond/3.8_x64',
+synplify_path                => '/d/jspc29/lattice/synplify/L-2016.09-1/',
+
+#synplify_command             => "/opt/lattice/diamond/3.5_x64/bin/lin64/synpwrap -fg -options",
+# synplify_command             => "/opt/synplicity/K-2015.09/bin/synplify_premier_dp",
+
+nodelist_file                => '../nodes_lxhadeb07.txt',
+
+include_TDC                  => 0,
+include_GBE                  => 1,
+
+
+twr_number_of_errors         => 20,
+firefox_open                 => 0,
+

diff --git a/trb3_gbe/trb3_central_gbe.lpf b/trb3_gbe/trb3_central_gbe.lpf
new file mode 120000 (symlink)
index 0000000..e03b2d5
--- /dev/null
+++ b/trb3_gbe/trb3_central_gbe.lpf
@@ -0,0 +1 @@
+trb3_central_constraints.lpf
\ No newline at end of file

diff --git a/trb3_gbe/trb3_central_gbe.prj b/trb3_gbe/trb3_central_gbe.prj
index accecc8cf90185fd1b15fe97f8c9dd23cd29687d..7b6aa4c5afa08a402130b62c55a314e5fae6ec49 100644 (file)
--- a/trb3_gbe/trb3_central_gbe.prj
+++ b/trb3_gbe/trb3_central_gbe.prj
@@ -68,6 +68,7 @@ add_file -vhdl -lib work "../../trbnet/special/trb_net_reset_handler.vhd"
 add_file -vhdl -lib work "../../trbnet/special/spi_flash_and_fpga_reload.vhd"
 add_file -vhdl -lib work "../../trbnet/lattice/ecp3/lattice_ecp2m_fifo.vhd"
 add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_18x1k_oreg.vhd"
+add_file -vhdl -lib work "../../trbnet/lattice/ecp3/fifo/fifo_18x8k_oreg.vhd"
 add_file -vhdl -lib work "../../trbnet/special/uart_rec.vhd"
 add_file -vhdl -lib work "../../trbnet/special/uart_trans.vhd"
 add_file -vhdl -lib work "../../trbnet/special/uart.vhd"

diff --git a/trb3_gbe/trb3_central_gbe.vhd b/trb3_gbe/trb3_central_gbe.vhd
index 491defeb4fc37b95f1fbfbf427de89e9327093a5..07c6aa6e93d8a47d96fb0d7a8658308b5eba53be 100644 (file)
--- a/trb3_gbe/trb3_central_gbe.vhd
+++ b/trb3_gbe/trb3_central_gbe.vhd
@@ -507,71 +507,71 @@ THE_MEDIA_ONBOARD : trb_net16_med_ecp3_sfp_4
 ---------------------------------------------------------------------------
 -- The TrbNet Hub
 ---------------------------------------------------------------------------
--- gen_normal_hub : if USE_ETHERNET = c_NO generate
--- 
---   THE_HUB : trb_net16_hub_base
---     generic map (
---       MII_NUMBER             => INTERFACE_NUM,
---       MII_IS_UPLINK          => IS_UPLINK,
---       MII_IS_DOWNLINK        => IS_DOWNLINK,
---       MII_IS_UPLINK_ONLY     => IS_UPLINK_ONLY, 
---       INT_NUMBER             => INTERNAL_NUM,
---       INT_CHANNELS           => INTERNAL_CHANNELS,
---       HARDWARE_VERSION       => HARDWARE_INFO,
---       INCLUDED_FEATURES      => INCLUDED_FEATURES,
---       HUB_USED_CHANNELS      => USED_CHANNELS,      
---       INIT_ENDPOINT_ID       => INIT_ENDPOINT_ID,
---       INIT_ADDRESS           => INIT_ADDRESS,
---       CLOCK_FREQUENCY        => CLOCK_FREQUENCY,
---       BROADCAST_SPECIAL_ADDR => BROADCAST_SPECIAL_ADDR
---       )
---     port map (
---       CLK    => clk_sys_i,
---       RESET  => reset_i,
---       CLK_EN => '1',
--- 
---       --Media interfacces
---       MED_DATAREADY_OUT(5*1-1 downto 0)   => med_dataready_out,
---       MED_DATA_OUT(5*16-1 downto 0)       => med_data_out,
---       MED_PACKET_NUM_OUT(5*3-1 downto 0)  => med_packet_num_out,
---       MED_READ_IN(5*1-1 downto 0)         => med_read_in,
---       MED_DATAREADY_IN(5*1-1 downto 0)    => med_dataready_in,
---       MED_DATA_IN(5*16-1 downto 0)        => med_data_in,
---       MED_PACKET_NUM_IN(5*3-1 downto 0)   => med_packet_num_in,
---       MED_READ_OUT(5*1-1 downto 0)        => med_read_out,
---       MED_STAT_OP(5*16-1 downto 0)        => med_stat_op,
---       MED_CTRL_OP(5*16-1 downto 0)        => med_ctrl_op,
--- 
---       COMMON_STAT_REGS                => common_stat_regs,
---       COMMON_CTRL_REGS                => common_ctrl_regs,
---       MY_ADDRESS_OUT                  => my_address,
---       TIMER_TICKS_OUT                 => timer_ticks,
--- 
---       --REGIO INTERFACE
---       REGIO_ADDR_OUT                  => regio_addr_out,
---       REGIO_READ_ENABLE_OUT           => regio_read_enable_out,
---       REGIO_WRITE_ENABLE_OUT          => regio_write_enable_out,
---       REGIO_DATA_OUT                  => regio_data_out,
---       REGIO_DATA_IN                   => regio_data_in,
---       REGIO_DATAREADY_IN              => regio_dataready_in,
---       REGIO_NO_MORE_DATA_IN           => regio_no_more_data_in,
---       REGIO_WRITE_ACK_IN              => regio_write_ack_in,
---       REGIO_UNKNOWN_ADDR_IN           => regio_unknown_addr_in,
---       REGIO_TIMEOUT_OUT               => regio_timeout_out,
--- 
---       ONEWIRE                         => TEMPSENS,
---       ONEWIRE_MONITOR_OUT             => open,
---       --Status ports (for debugging)
---       MPLEX_CTRL            => (others => '0'),
---       CTRL_DEBUG            => (others => '0'),
---       STAT_DEBUG            => open
---       );
---       
---   reset_via_gbe <= '0';    
---   gbe_unknown   <= '1';
--- end generate;
--- 
--- gen_ethernet_hub : if USE_ETHERNET = c_YES generate
+gen_normal_hub : if USE_ETHERNET = c_NO generate
+
+  THE_HUB : trb_net16_hub_base
+    generic map (
+      MII_NUMBER             => INTERFACE_NUM,
+      MII_IS_UPLINK          => IS_UPLINK,
+      MII_IS_DOWNLINK        => IS_DOWNLINK,
+      MII_IS_UPLINK_ONLY     => IS_UPLINK_ONLY, 
+      INT_NUMBER             => INTERNAL_NUM,
+      INT_CHANNELS           => INTERNAL_CHANNELS,
+      HARDWARE_VERSION       => HARDWARE_INFO,
+      INCLUDED_FEATURES      => INCLUDED_FEATURES,
+      HUB_USED_CHANNELS      => USED_CHANNELS,      
+      INIT_ENDPOINT_ID       => INIT_ENDPOINT_ID,
+      INIT_ADDRESS           => INIT_ADDRESS,
+      CLOCK_FREQUENCY        => CLOCK_FREQUENCY,
+      BROADCAST_SPECIAL_ADDR => BROADCAST_SPECIAL_ADDR
+      )
+    port map (
+      CLK    => clk_sys_i,
+      RESET  => reset_i,
+      CLK_EN => '1',
+
+      --Media interfacces
+      MED_DATAREADY_OUT(5*1-1 downto 0)   => med_dataready_out,
+      MED_DATA_OUT(5*16-1 downto 0)       => med_data_out,
+      MED_PACKET_NUM_OUT(5*3-1 downto 0)  => med_packet_num_out,
+      MED_READ_IN(5*1-1 downto 0)         => med_read_in,
+      MED_DATAREADY_IN(5*1-1 downto 0)    => med_dataready_in,
+      MED_DATA_IN(5*16-1 downto 0)        => med_data_in,
+      MED_PACKET_NUM_IN(5*3-1 downto 0)   => med_packet_num_in,
+      MED_READ_OUT(5*1-1 downto 0)        => med_read_out,
+      MED_STAT_OP(5*16-1 downto 0)        => med_stat_op,
+      MED_CTRL_OP(5*16-1 downto 0)        => med_ctrl_op,
+
+      COMMON_STAT_REGS                => common_stat_regs,
+      COMMON_CTRL_REGS                => common_ctrl_regs,
+      MY_ADDRESS_OUT                  => my_address,
+      TIMER_TICKS_OUT                 => timer_ticks,
+
+      --REGIO INTERFACE
+      REGIO_ADDR_OUT                  => regio_addr_out,
+      REGIO_READ_ENABLE_OUT           => regio_read_enable_out,
+      REGIO_WRITE_ENABLE_OUT          => regio_write_enable_out,
+      REGIO_DATA_OUT                  => regio_data_out,
+      REGIO_DATA_IN                   => regio_data_in,
+      REGIO_DATAREADY_IN              => regio_dataready_in,
+      REGIO_NO_MORE_DATA_IN           => regio_no_more_data_in,
+      REGIO_WRITE_ACK_IN              => regio_write_ack_in,
+      REGIO_UNKNOWN_ADDR_IN           => regio_unknown_addr_in,
+      REGIO_TIMEOUT_OUT               => regio_timeout_out,
+
+      ONEWIRE                         => TEMPSENS,
+      ONEWIRE_MONITOR_OUT             => open,
+      --Status ports (for debugging)
+      MPLEX_CTRL            => (others => '0'),
+      CTRL_DEBUG            => (others => '0'),
+      STAT_DEBUG            => open
+      );
+      
+  reset_via_gbe <= '0';    
+  gbe_unknown   <= '1';
+end generate;
+
+gen_ethernet_hub : if USE_ETHERNET = c_YES generate
 
 
   THE_HUB: trb_net16_hub_streaming_port_sctrl
@@ -756,7 +756,7 @@ THE_MEDIA_ONBOARD : trb_net16_med_ecp3_sfp_4
       ); 
 
   gbe_unknown <= '0';
---end generate;
+end generate;
 
 ---------------------------------------------------------------------------
 -- Bus Handler