From: palka <palka>
Date: Mon, 16 Jun 2008 07:53:33 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: oldGBE~552
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=516d54335e06a7d9541c667314c627e3178691ec;p=trbnet.git

*** empty log message ***
---

diff --git a/optical_link/flexi_PCS_synch.vhd b/optical_link/flexi_PCS_synch.vhd
index dd2d56b..6fe762d 100644
--- a/optical_link/flexi_PCS_synch.vhd
+++ b/optical_link/flexi_PCS_synch.vhd
@@ -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,
diff --git a/optical_link/hub.vhd b/optical_link/hub.vhd
index d402f74..e1680b2 100644
--- a/optical_link/hub.vhd
+++ b/optical_link/hub.vhd
@@ -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