commit for push/pull

diff --git a/mimosis/par.p2t b/mimosis/par.p2t
index 2ce03814717be0456d58e05b92e61d59f03108c2..5a046a094a7ce23cc06df47c2a8fcc0670de601a 100644 (file)
--- a/mimosis/par.p2t
+++ b/mimosis/par.p2t
@@ -4,7 +4,7 @@
 #-m nodelist.txt       # Controlled by the compile.pl script.
 #-n 1                          # Controlled by the compile.pl script.
 -s 10
--t 10
+-t 34
 -c 2
 -e 2
 -i 10

diff --git a/mimosis/trb5sc_mimosis.vhd b/mimosis/trb5sc_mimosis.vhd
index 9814b6631b6d68bdcc8bdd06c1b0bf8f89d0db2d..a8c2792aca07ca8fe3ccf15111ce4d7bc9a1ab3c 100644 (file)
--- a/mimosis/trb5sc_mimosis.vhd
+++ b/mimosis/trb5sc_mimosis.vhd
@@ -10,6 +10,7 @@ use work.trb_net_components.all;
 use work.trb3_components.all;\r
 use work.med_sync_define.all;\r
 \r
+\r
 entity trb5sc_mimosis is\r
   port(\r
     CLK_200  : in std_logic;\r
@@ -203,9 +204,9 @@ begin
   H3(3) <= clk_320;\r
 \r
   -- For IPHC Proxy\r
-  -- RJ(0) <= clk_40;\r
+  RJ(0) <= clk_40;\r
   -- For IKF Proxy\r
-  H1(4) <= clk_40;\r
+  -- H1(4) <= clk_40;\r
 \r
 ---------------------------------------------------------------------------\r
 -- TrbNet Uplink\r
@@ -558,7 +559,6 @@ begin
   LED_ADDON_SFP_ORANGE(1) <= '0';\r
 \r
 \r
-\r
 -----------------------------------------------------------------------------\r
 ---- GbE\r
 -----------------------------------------------------------------------------\r
@@ -695,43 +695,6 @@ begin
 --end process;\r
 \r
 \r
----------------------------------------------------------------------------\r
--- Output stage\r
----------------------------------------------------------------------------\r
-  -- THE_OUT : entity work.testout\r
-  --   port map(\r
-  --     clkout => open,\r
-  --     refclk => clk_160,\r
-  --     reset  => reset_i,\r
-  --     data   => out_data,\r
-  --     data_cflag => open,\r
-  --     data_direction => (others => '0'),\r
-  --     data_loadn     => (others => '1'),\r
-  --     data_move      => (others => '0'),\r
-  --     dout           => out_i\r
-  --     );\r
-\r
-  -- PROC_OUT : process\r
-  --   variable cnt : integer range 0 to 7;\r
-  -- begin\r
-  --   wait until rising_edge(clk_160);\r
-  --   cnt := cnt + 1;\r
-  --   case cnt is\r
-  --     when 0 => out_data <= x"ffff";\r
-  --     when 1 => out_data <= x"ffff";\r
-  --     when 2 => out_data <= x"ffff";\r
-  --     when 3 => out_data <= x"0000";\r
-  --     when 4 => out_data <= x"5555";\r
-  --     when 5 => out_data <= x"5555";\r
-  --     when 6 => out_data <= x"5555";\r
-  --     when 7 => out_data <= x"5555";\r
-  --   end case;\r
-  -- end process;\r
-\r
-  -- H3(3 downto 0) <= out_i(3 downto 0);\r
-  -- H4(3 downto 0) <= out_i(7 downto 4);\r
-\r
-\r
 ---------------------------------------------------------------------------\r
 -- Input stage\r
 ---------------------------------------------------------------------------\r

diff --git a/pinout/trb5sc_hdmi.lpf b/pinout/trb5sc_hdmi.lpf
index 6c89d07bcdf29487b56bd90102a11d3632a5222d..ace0ab9eefcf09bf613c47f0afb603a33b4f614e 100644 (file)
--- a/pinout/trb5sc_hdmi.lpf
+++ b/pinout/trb5sc_hdmi.lpf
@@ -88,8 +88,10 @@ LOCATE COMP "H5[3]" SITE "R32" ;    #was "FE_DIFF[6]"
 LOCATE COMP "H7[3]" SITE "W30" ;    #was "FE_DIFF[7]" 
 #LOCATE COMP "H5[4]" SITE "T32" ;    #was "FE_DIFF[8]" 
 
+# H5
 # LOCATE COMP "MIMOSIS_SCL" SITE "U32" ;    #was "FE_DIFF[8]"
 # LOCATE COMP "MIMOSIS_SDA" SITE "T32" ;    #was "FE_DIFF[8]"
+# H3
 LOCATE COMP "MIMOSIS_SCL" SITE "C2" ;    #was "FE_DIFF[8]"
 LOCATE COMP "MIMOSIS_SDA" SITE "B1" ;    #was "FE_DIFF[8]"
 IOBUF  PORT  "MIMOSIS_SCL"      IO_TYPE=LVCMOS25 ;
@@ -120,8 +122,8 @@ LOCATE COMP "H2[0]" SITE "H27" ;   #was "FE_DIFF[30]"
 # LOCATE COMP "FE_DIFF[31]" SITE "K27" ;   #was "FE_DIFF[31]"
 LOCATE COMP "H3[3]" SITE "D4" ;    #was "FE_DIFF[32]"
 LOCATE COMP "H3[4]" SITE "B1" ;    #was "FE_DIFF[34]"
-# LOCATE COMP "H3[2]" SITE "F3" ;    #was "FE_DIFF[36]"
-LOCATE COMP "H3_2" SITE "F3" ;    #was "FE_DIFF[36]"
+LOCATE COMP "H3[2]" SITE "F3" ;    #was "FE_DIFF[36]"
+# LOCATE COMP "H3_2" SITE "F3" ;    #was "FE_DIFF[36]"
 LOCATE COMP "H3[1]" SITE "F2" ;    #was "FE_DIFF[38]"
 LOCATE COMP "H3[0]" SITE "H2" ;    #was "FE_DIFF[40]"
 # LOCATE COMP "FE_DIFF[41]" SITE "J3" ;    #was "FE_DIFF[41]"
@@ -153,6 +155,11 @@ DEFINE PORT GROUP "H2_group" "H2*" ;
 IOBUF GROUP "H2_group" IO_TYPE=LVDS DIFFRESISTOR=100 ;
 DEFINE PORT GROUP "H3_group" "H3*" ;
 IOBUF GROUP "H3_group" IO_TYPE=LVDS DIFFRESISTOR=100 ;
+
+# IOBUF PORT "H3_0" IO_TYPE=LVDS DIFFRESISTOR=100;
+# IOBUF PORT "H3_2" IO_TYPE=LVDS DIFFRESISTOR=100;
+# IOBUF PORT "H3_3" IO_TYPE=LVDS DIFFRESISTOR=100;
+
 DEFINE PORT GROUP "H4_group" "H4*" ;
 IOBUF GROUP "H4_group" IO_TYPE=LVDS DIFFRESISTOR=100 ;
 DEFINE PORT GROUP "H5_group" "H5*" ;