From: Adrian Weber Date: Thu, 6 Feb 2020 11:51:20 +0000 (+0100) Subject: Trb3Sc hub_cts changes from 21. Feb. 2019; change config to 1 GBE X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=7dfa84d2ada30f4ee54e2a1f6c55ef9ea77c3fc8;p=trb3sc.git Trb3Sc hub_cts changes from 21. Feb. 2019; change config to 1 GBE --- diff --git a/hub_cts/code/trb3sc_tools_mRICH.vhd b/hub_cts/code/trb3sc_tools_mRICH.vhd index 637177e..cda97bf 100644 --- a/hub_cts/code/trb3sc_tools_mRICH.vhd +++ b/hub_cts/code/trb3sc_tools_mRICH.vhd @@ -242,10 +242,14 @@ end generate; BUS_DATA_OUT => busspi_tx.data, -- SPI connections SPI_CS_OUT(15 downto 0) => spi_cs, - SPI_SDI_IN => spi_sdi, - SPI_SDO_OUT => spi_sdo, - SPI_SCK_OUT => spi_sck - ); + SPI_SDI_IN(0) => spi_sdi, + SPI_SDI_IN(15 downto 1) => b"000000000000000", + SPI_SDO_OUT(0) => spi_sdo, + SPI_SDO_OUT(15 downto 1) => open, + SPI_SCK_OUT(0) => spi_sck, + SPI_SCK_OUT(15 downto 1) => open, + SPI_CLR_OUT => open + ); SPI_CS_OUT <= spi_cs; SPI_CLK_OUT <= (others => spi_sck); SPI_MOSI_OUT <= (others => spi_sdo); diff --git a/hub_cts/config.vhd b/hub_cts/config.vhd index e101028..92e5414 100644 --- a/hub_cts/config.vhd +++ b/hub_cts/config.vhd @@ -68,7 +68,7 @@ package config is constant TRIGGER_COIN_COUNT : integer := 1; constant TRIGGER_PULSER_COUNT : integer := 3; constant TRIGGER_RAND_PULSER : integer := 1; - constant TRIGGER_ADDON_COUNT : integer := 2; + constant TRIGGER_ADDON_COUNT : integer := 4; constant PERIPH_TRIGGER_COUNT : integer := 0; constant ADDON_LINE_COUNT : integer := 18; constant CTS_OUTPUT_MULTIPLEXERS : integer := 1; diff --git a/hub_cts/trb3sc_hubcts.prj b/hub_cts/trb3sc_hubcts.prj index ced8cdf..4c7ca0e 100644 --- a/hub_cts/trb3sc_hubcts.prj +++ b/hub_cts/trb3sc_hubcts.prj @@ -220,8 +220,8 @@ add_file -vhdl -lib work "../../trbnet/gbe_trb/protocols/trb_net16_gbe_response_ add_file -vhdl -lib work "../../trbnet/gbe_trb/protocols/trb_net16_gbe_response_constructor_TrbNetData.vhd" add_file -vhdl -lib work "../../trbnet/gbe_trb/protocols/trb_net16_gbe_response_constructor_KillPing.vhd" add_file -vhdl -lib work "../../trbnet/gbe_trb/protocols/trb_net16_gbe_response_constructor_Forward.vhd" -add_file -vhdl -lib work "../../trbnet/gbe_trb/media/serdes_gbe_4ch.vhd" -add_file -verilog -lib work "../../trbnet/gbe_trb/media/sgmii_channel_smi.v" +add_file -vhdl -lib work "../../trbnet/gbe_trb/media/serdes_gbe_1ch.vhd"#_4ch.vhd" +add_file -verilog -lib work "../../trbnet/gbe_trb/media/ecp5/sgmii_channel_smi.v" #sgmii_channel_smi.v" add_file -verilog -lib work "../../trbnet/gbe_trb/media/reset_controller_pcs.v" add_file -verilog -lib work "../../trbnet/gbe_trb/media/reset_controller_cdr.v" add_file -verilog -lib work "../../trbnet/gbe_trb/media/register_interface_hb.v"