From 463ada68efb4e35a67c3286a750eda3d02b5fa1f Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Wed, 8 May 2024 14:18:13 +0200 Subject: [PATCH] update mdc design files after media interface changes --- DBO/mdctdc.vhd | 83 +++++++++++++++++++++++++------------------------- OEP/mdcoep.vhd | 21 ++++++++----- 2 files changed, 55 insertions(+), 49 deletions(-) diff --git a/DBO/mdctdc.vhd b/DBO/mdctdc.vhd index 67e668d..255497e 100644 --- a/DBO/mdctdc.vhd +++ b/DBO/mdctdc.vhd @@ -331,11 +331,11 @@ GPIO(1) <= sd_txdis_i or prepare_for_reload_i; --------------------------------------------------------------------------- -- LED --------------------------------------------------------------------------- - LED(0) <= med2int(0).stat_op(15); --med2int(0).stat_op(9) and not led_off; --Link active - LED(2) <= reset_i; --(med2int(0).stat_op(10) or med2int(0).stat_op(11)) and not led_off; --TX/RX - LED(1) <= med2int(0).stat_op(13); -- (FLASH_SELECT) and not led_off; - IO(1) <= GPIO(0) when rising_edge(clk_sys); --LOS - IO(2) <= med2int(0).stat_op(4); --rx_allow + LED(0) <= med2int(0).stat_op(9) and not led_off; --Link active + LED(2) <= (med2int(0).stat_op(10) or med2int(0).stat_op(11)) and not led_off; --TX/RX + LED(1) <= med2int(0).stat_op(15); -- (FLASH_SELECT) and not led_off; + IO(1) <= med2int(0).stat_op(4); --rx_allow + IO(2) <= med2int(0).stat_op(9); --tx_allow -------------------------------------------------------------------------- -- Controls @@ -345,48 +345,49 @@ GPIO(1) <= sd_txdis_i or prepare_for_reload_i; TEST <= additional_reg(27 downto 24) or (calibration_pulse & calibration_pulse & calibration_pulse & calibration_pulse); --"0000"; -------------------------------------------------------------------------------- --- TDC -------------------------------------------------------------------------------- -THE_TDC : entity work.TDC_FF - - port map( - CLK_FAST => CLK_TDC, - CLK_SYS => clk_sys, - RESET_IN => reset_i, - SIGNAL_IN => hit_in_i(31 downto 0), - TRIGGER_IN => TRG, - CALIBRATION_OUT => calibration_pulse, - - BUS_RX => bustdc_rx, - BUS_TX => bustdc_tx, +-- ------------------------------------------------------------------------------- +-- -- TDC +-- ------------------------------------------------------------------------------- + THE_TDC : entity work.TDC_FF - READOUT_RX => readout_rx, - READOUT_TX => readout_tx(0 to 1) - - ); + port map( + CLK_FAST => CLK_TDC, + CLK_SYS => clk_sys, + RESET_IN => reset_i, + SIGNAL_IN => hit_in_i(31 downto 0), + TRIGGER_IN => TRG, + CALIBRATION_OUT => calibration_pulse, + + BUS_RX => bustdc_rx, + BUS_TX => bustdc_tx, + + READOUT_RX => readout_rx, + READOUT_TX => readout_tx(0 to 1) + + ); ------------------------------------------------------------------------------- -- THE automatic SPI ------------------------------------------------------------------------------- -THE_SPI : entity work.pasttrec_spi + THE_SPI : entity work.pasttrec_spi generic map( - SPI_BUNCHES => 2, - SPI_PASTTREC_PER_BUNCH => 2, - SPI_CHIP_IDs => x"000000" & "1001" & "1001" - )port map( - CLK => clk_sys, - BUS_RX => busspi_rx, - BUS_TX => busspi_tx, - - RST_IN => reset_i, - - SPI_CS_OUT => open, - SPI_SDI_IN => MISO, - SPI_SDO_OUT => MOSI, - SPI_SCK_OUT => SCK, - SPI_RST_OUT => RSTN - ); + SPI_BUNCHES => 2, + SPI_PASTTREC_PER_BUNCH => 2, + SPI_CHIP_IDs => x"000000" & "1001" & "1001" + ) + port map( + CLK => clk_sys, + BUS_RX => busspi_rx, + BUS_TX => busspi_tx, + + RST_IN => reset_i, + + SPI_CS_OUT => open, + SPI_SDI_IN => MISO, + SPI_SDO_OUT => MOSI, + SPI_SCK_OUT => SCK, + SPI_RST_OUT => RSTN + ); ------------------------------------------------------------------------------- diff --git a/OEP/mdcoep.vhd b/OEP/mdcoep.vhd index 0caf2e9..d56cd15 100644 --- a/OEP/mdcoep.vhd +++ b/OEP/mdcoep.vhd @@ -141,7 +141,7 @@ begin THE_MEDIA_INTERFACE : entity work.med_ecp5_sfp_sync_2 generic map( - USE_NEW_ECP5_RESET => c_NO, + USE_NEW_ECP5_RESET => c_YES, DUAL => 0, IS_SYNC_SLAVE => (c_YES,c_NO) ) @@ -181,7 +181,7 @@ begin --------------------------------------------------------------------------- THE_DOWN_INTERFACE_2 : entity work.med_ecp5_sfp_sync_2 generic map( - USE_NEW_ECP5_RESET => c_NO, + USE_NEW_ECP5_RESET => c_YES, DUAL => 1, IS_SYNC_SLAVE => (c_NO,c_NO) @@ -399,12 +399,17 @@ trigger_inputs_i <= (others => '0'); -- IO(8) <= hub_stat_debug(9); --IO(7) <= hub_stat_debug(8); --IO(8) <= hub_stat_debug(9); -IO(3) <= int2med(0).dataready; -IO(4) <= med2int(0).stat_op(15); -IO(5) <= GPIO(1) when rising_edge(clk_sys); -IO(6) <= med2int(1).stat_op(4); -IO(7) <= med2int(0).dataready; -IO(8) <= med2int(0).stat_op(4); +-- IO(3) <= int2med(0).dataready; +-- IO(4) <= med2int(0).stat_op(15); +-- IO(5) <= GPIO(1) when rising_edge(clk_sys); +-- IO(6) <= med2int(1).stat_op(4); +-- IO(7) <= med2int(0).dataready; +-- IO(8) <= med2int(0).stat_op(4); + +IO(3) <= med2int(0).stat_op(4); +IO(4) <= med2int(1).stat_op(4); +IO(5) <= med2int(2).stat_op(4); +IO(6) <= med2int(3).stat_op(4); --------------------------------------------------------------------------- -- LED -- 2.43.0