From: Jan Michel Date: Thu, 18 Apr 2013 12:25:43 +0000 (+0200) Subject: reset now working stably X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=020f4015f5aaf0d1e4c1a18094255c30a6728861;p=soda.git reset now working stably --- diff --git a/soda_slave/trb3_periph_sodaslave.p2t b/soda_slave/trb3_periph_sodaslave.p2t index 5e8d0d9..3942b0a 100644 --- a/soda_slave/trb3_periph_sodaslave.p2t +++ b/soda_slave/trb3_periph_sodaslave.p2t @@ -4,7 +4,7 @@ -n 1 -y -s 12 --t 24 +-t 23 -c 1 -e 2 #-g guidefile.ncd diff --git a/soda_source/trb3_periph_sodasource.p2t b/soda_source/trb3_periph_sodasource.p2t index 790dc90..5e8d0d9 100644 --- a/soda_source/trb3_periph_sodasource.p2t +++ b/soda_source/trb3_periph_sodasource.p2t @@ -4,7 +4,7 @@ -n 1 -y -s 12 --t 25 +-t 24 -c 1 -e 2 #-g guidefile.ncd diff --git a/soda_source/trb3_periph_sodasource.vhd b/soda_source/trb3_periph_sodasource.vhd index 5b95bff..51b0a3b 100644 --- a/soda_source/trb3_periph_sodasource.vhd +++ b/soda_source/trb3_periph_sodasource.vhd @@ -516,7 +516,7 @@ THE_SODA_SOURCE : med_ecp3_sfp_sync SD_REFCLK_N_IN => '0', SD_PRSNT_N_IN => SFP_MOD0(1), SD_LOS_IN => SFP_LOS(1), - SD_TXDIS_OUT => SFP_TXDIS(1), + SD_TXDIS_OUT => open, SCI_DATA_IN => sci2_data_in, SCI_DATA_OUT => sci2_data_out, @@ -532,6 +532,7 @@ THE_SODA_SOURCE : med_ecp3_sfp_sync CTRL_DEBUG => (others => '0') ); + SFP_TXDIS(1) <= reset_i; --------------------------------------------------------------------------- -- The Soda Source @@ -562,6 +563,7 @@ THE_SODA_SOURCE : med_ecp3_sfp_sync -- Test Connector --------------------------------------------------------------------------- TEST_LINE(15 downto 0) <= med_stat_debug(79 downto 64); + --------------------------------------------------------------------------- -- Test Circuits ---------------------------------------------------------------------------