small updates

diff --git a/soda_source/compile_periph_frankfurt.pl b/soda_source/compile_periph_frankfurt.pl
index d39feb7a8c6691995398a3841e5422cb7e5d0fe5..1cc699eb2bc588ec94bdd44ecb01999eb3d84bc9 100755 (executable)
--- a/soda_source/compile_periph_frankfurt.pl
+++ b/soda_source/compile_periph_frankfurt.pl
@@ -9,7 +9,7 @@ use strict;
 ###################################################################################
 #Settings for this project
 my $TOPNAME                      = "trb3_periph_sodasource";  #Name of top-level entity
-my $lattice_path                 = '/d/jspc29/lattice/diamond/2.1_x64';
+my $lattice_path                 = '/d/jspc29/lattice/diamond/2.01';
 my $synplify_path                = '/d/jspc29/lattice/synplify/G-2012.09-SP1/';
 my $lm_license_file_for_synplify = "27000\@lxcad01.gsi.de";
 #my $lm_license_file_for_par      = "1702\@hadeb05.gsi.de";
@@ -115,8 +115,8 @@ execute($c);
 system("rm $TOPNAME.ncd");
 
 
-#$c=qq|$lattice_path/ispfpga/bin/lin/multipar -pr "$TOPNAME.prf" -o "mpar_$TOPNAME.rpt" -log "mpar_$TOPNAME.log" -p "../$TOPNAME.p2t"  "$tpmap.ncd" "$TOPNAME.ncd"|;
-$c=qq|$lattice_path/ispfpga/bin/lin/par -f "../$TOPNAME.p2t"  "$tpmap.ncd" "$TOPNAME.ncd" "$TOPNAME.prf"|;
+$c=qq|$lattice_path/ispfpga/bin/lin/multipar -pr "$TOPNAME.prf" -o "mpar_$TOPNAME.rpt" -log "mpar_$TOPNAME.log" -p "../$TOPNAME.p2t"  "$tpmap.ncd" "$TOPNAME.ncd"|;
+#$c=qq|$lattice_path/ispfpga/bin/lin/par -f "../$TOPNAME.p2t"  "$tpmap.ncd" "$TOPNAME.ncd" "$TOPNAME.prf"|;
 execute($c);
 
 # IOR IO Timing Report

diff --git a/soda_source/trb3_periph_sodasource.p2t b/soda_source/trb3_periph_sodasource.p2t
new file mode 100644 (file)
index 0000000..5e8d0d9
--- /dev/null
+++ b/soda_source/trb3_periph_sodasource.p2t
@@ -0,0 +1,21 @@
+-w
+-i 15
+-l 5
+-n 1
+-y
+-s 12
+-t 24
+-c 1
+-e 2
+#-g guidefile.ncd
+-m nodelist.txt
+# -w
+# -i 6
+# -l 5
+# -n 1
+# -t 1
+# -s 1
+# -c 0
+# -e 0
+#
+-exp parCDP=1:parCDR=1:parPlcInLimit=0:parPlcInNeighborSize=1:parPathBased=ON:parHold=ON:parHoldLimit=10000:paruseNBR=1

diff --git a/soda_source/trb3_periph_sodasource.vhd b/soda_source/trb3_periph_sodasource.vhd
index 174ae67be62983f3c21263119cd894cade2da82e..f5a02e3645a43ed53e58cbec04a9cca590575bd7 100644 (file)
--- a/soda_source/trb3_periph_sodasource.vhd
+++ b/soda_source/trb3_periph_sodasource.vhd
@@ -727,14 +727,15 @@ begin
 ---------------------------------------------------------------------------
 THE_SODA_SOURCE : med_ecp3_sfp_sync
   generic map(
-    SERDES_NUM  => 0     --number of serdes in quad
+    SERDES_NUM  => 0,    --number of serdes in quad
+    MASTER_CLOCK_SWITCH => c_NO,
+    IS_SYNC_SLAVE => c_NO
     )
   port map(
     CLK                => clk_200_internal, --clk_200_i,
     SYSCLK             => clk_100_i,
     RESET              => reset_i,
     CLEAR              => clear_i,
-    CLK_EN             => '1',
     --Internal Connection for TrbNet data -> not used a.t.m.
     MED_DATA_IN        => (others => '0'),
     MED_PACKET_NUM_IN  => (others => '0'),

diff --git a/soda_source/version.vhd b/soda_source/version.vhd
index 42d40d4514efaeaed0d4a9376214106775a6c7fe..cb2aa0fd3349f96787b7879dd06420dfa67903b6 100644 (file)
--- a/soda_source/version.vhd
+++ b/soda_source/version.vhd
@@ -8,6 +8,6 @@ use ieee.numeric_std.all;
 
 package version is
 
-    constant VERSION_NUMBER_TIME  : integer   := 1361206385;
+    constant VERSION_NUMBER_TIME  : integer   := 1361540878;
 
 end package version;