dirich5s1 fixes, mt

diff --git a/dirich5s/dirich5s.prj b/dirich5s/dirich5s.prj
index 52dc5946aca5d7db1b54ecdfcc0fbd5fda02c7c2..682e22572c2eb5a70fdf10221c1d98102f2775d5 100644 (file)
--- a/dirich5s/dirich5s.prj
+++ b/dirich5s/dirich5s.prj
@@ -131,10 +131,10 @@ add_file -vhdl -lib work "../../trbnet/trb_net16_addresses.vhd"
 add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/med_sync_define.vhd"
 add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/rx_control.vhd"
 add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/tx_control.vhd"
-#add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/rx_reset_fsm.vhd"
-#add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/tx_reset_fsm.vhd"
-add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/main_rx_reset_RS.vhd"
-add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/main_tx_reset_RS.vhd"
+add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/rx_reset_fsm.vhd"
+add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/tx_reset_fsm.vhd"
+#add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/main_rx_reset_RS.vhd"
+#add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/main_tx_reset_RS.vhd"
 add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/sci_reader.vhd"
 add_file -vhdl -lib work "../../trbnet/media_interfaces/sync/med_sync_control.vhd"
 add_file -vhdl -lib work "../../trbnet/media_interfaces/med_ecp5_sfp_sync.vhd"

diff --git a/dirich5s/dirich5s.vhd b/dirich5s/dirich5s.vhd
index e070043448a0bf3639e371ca77000cfc873149e3..935f5f5517a2c0cc4badfe445c8774943fe780e4 100644 (file)
--- a/dirich5s/dirich5s.vhd
+++ b/dirich5s/dirich5s.vhd
@@ -410,7 +410,7 @@ port map (
   TEST_LINE(1) <= med_stat_debug(15); -- RX_CV_ERROR, same as rx_error
   TEST_LINE(2) <= med_stat_debug(2); -- RX_LOS
   TEST_LINE(3) <= med_stat_debug(13); -- RX_LSM
-  TEST_LINE(4) <= med_stat_debug(14); -- CDR_LOL
+--  TEST_LINE(4) <= med_stat_debug(14); -- CDR_LOL
 --  TEST_LINE(8 downto 5) <= med_stat_debug(19 downto 16); -- rx_fsm_state
 
 

diff --git a/dirich5s/nodelist_hades69.txt b/dirich5s/nodelist_hades69.txt
index 3e2ff5b6bdca59ffadd679ea0851e50f0bef0348..3a168d78cd96d7505df0e68eedcedad6c1c20421 100644 (file)
--- a/dirich5s/nodelist_hades69.txt
+++ b/dirich5s/nodelist_hades69.txt
@@ -4,4 +4,4 @@
 SYSTEM = linux
 CORENUM = 24
 ENV = /home/hadaq/bin/diamond_env
-WORKDIR = /home/hadaq/vhdl_new_serdes_reset/dirich/dirich5s/workdir
+WORKDIR = /home/hadaq/vhdl_dirich5d1/dirich/dirich5s/workdir

diff --git a/dirich5s/par.p2t b/dirich5s/par.p2t
index 02a58675064ac21687b739eecd972ae0dca2be58..c52379717a08b3e829eb7c7fe1fb98baedaa53d4 100644 (file)
--- a/dirich5s/par.p2t
+++ b/dirich5s/par.p2t
@@ -4,7 +4,7 @@
 #-m nodelist.txt       # Controlled by the compile.pl script.
 #-n 2                          # Controlled by the compile.pl script.
 -s 10
--t 1
+-t 25
 -c 2
 -e 2
 -i 10