]> jspc29.x-matter.uni-frankfurt.de Git - trbnet.git/commitdiff
*** empty log message ***
authorpalka <palka>
Mon, 16 Jun 2008 07:53:33 +0000 (07:53 +0000)
committerpalka <palka>
Mon, 16 Jun 2008 07:53:33 +0000 (07:53 +0000)
optical_link/flexi_PCS_synch.vhd
optical_link/hub.vhd

index dd2d56b2c3a54b7fba8112c532a8aa37e88f238b..6fe762d3ef8b28003e1351c070fbf4f5f5c13942 100644 (file)
@@ -12,6 +12,7 @@ entity flexi_PCS_synch is
   generic (
     HOW_MANY_CHANNELS      :     positive);
   port (
+    SYSTEM_CLK             : in  std_logic;
     CLK                    : in  std_logic_vector(((HOW_MANY_CHANNELS+3)/4)-1 downto 0);
     RX_CLK                 : in  std_logic_vector(((HOW_MANY_CHANNELS+3)/4)*4-1 downto 0);
     RESET                  : in  std_logic;
@@ -65,7 +66,7 @@ begin
 
     SYNCH :flexi_PCS_channel_synch
       port map (
-          SYSTEM_CLK       => CLK(0),
+          SYSTEM_CLK       => SYSTEM_CLK,
           TX_CLK           => CLK(bit_index/4),      --4 different channles clk
           RX_CLK           => RX_CLK(bit_index),                              
           RESET            => RESET,
index d402f743b539e6f30bf0bf86b2b8bfb9bfa54384..e1680b245f6ad645d9cc452cd4f91905ba71ab43 100644 (file)
@@ -637,6 +637,7 @@ begin
      generic map (
        HOW_MANY_CHANNELS      => HOW_MANY_CHANNELS)
      port map (
+       SYSTEM_CLK             => LVDS_CLK_200P,
        CLK                    => ref_pclk,--,
        RX_CLK                 => rx_clk_i,
        RESET                  => global_reset_i,
@@ -659,8 +660,10 @@ begin
        MED_STAT_OP            => med_stat_op_i,
        MED_CTRL_OP            => med_ctrl_op_i
        );
-  ADO_TTL(34 downto 19) <= med_read_in_i(0) & flexi_pcs_synch_status_i(2 downto 1) & med_packet_num_out_i(1 downto 0) & rx_k_i(1 downto 0) & rxd_i(3 downto 0) & med_dataready_out_i(0) & med_data_out_i(3 downto 0);
-  ADO_TTL(15 downto 0) <= med_read_out_i(0) & flexi_pcs_synch_status_i(7 downto 6) & med_packet_num_in_i(1 downto 0) & tx_k_i(1 downto 0) & txd_synch_i(3 downto 0) & med_dataready_in_i(0) & med_data_in_i(3 downto 0);
+--  ADO_TTL(34 downto 19) <= med_read_in_i(0) & flexi_pcs_synch_status_i(2 downto 1) & med_packet_num_out_i(1 downto 0) & rx_k_i(1 downto 0) & rxd_i(3 downto 0) & med_dataready_out_i(0) & med_data_out_i(3 downto 0);
+ADO_TTL(34 downto 19) <= med_dataready_out_i(0)& med_data_out_i(14 downto 0);
+-- ADO_TTL(15 downto 0) <= med_read_out_i(0) & flexi_pcs_synch_status_i(7 downto 6) & med_packet_num_in_i(1 downto 0) & tx_k_i(1 downto 0) & txd_synch_i(3 downto 0) & med_dataready_in_i(0) & med_data_in_i(3 downto 0);
+ ADO_TTL(15 downto 0) <= rx_k_i(1 downto 0) & rxd_i(13 downto 0);
 --  med_data_in_i(15 downto 0) <= hub_register_0e_and_0d;
 --  med_read_in_i <= (others => '1');     --test