]> jspc29.x-matter.uni-frankfurt.de Git - trbnet.git/commitdiff
seems to work
authorhadaq <hadaq>
Fri, 3 Apr 2009 10:01:08 +0000 (10:01 +0000)
committerhadaq <hadaq>
Fri, 3 Apr 2009 10:01:08 +0000 (10:01 +0000)
optical_link/flexi_PCS_channel_synch.vhd
optical_link/hub.vhd

index f6b0b42903d5887fb55823ea2c8c22413b0c0fc4..aec9a8aa5968fadbb5f5ad41bc5274c3ad7aaec4 100644 (file)
@@ -446,12 +446,12 @@ begin
     if rising_edge(RX_CLK) then
       if RESET = '1' then
         fifo_data_in <= (others => '0');
-      elsif SYNC_CURRENT = NORMAL_OPERATION_2 then
+      elsif SYNC_CURRENT = NORMAL_OPERATION_2 and CV="00" then
         fifo_data_in <= '0' & (not RX_K(0)) & RXD;
         fifo_wr_en <= not RX_K(0);
-      elsif SYNC_CURRENT = NORMAL_OPERATION_1 then
+      elsif SYNC_CURRENT = NORMAL_OPERATION_1 and CV="00" then
         fifo_data_in <= '0' & (not RX_K(1)) & RXD(7 downto 0) & rxd_synch_i(15 downto 8);
-        fifo_wr_en <= not RX_K(1);
+        fifo_wr_en <= not rx_k_synch_i(1);
       else
         fifo_data_in <= (others => '0');
         fifo_wr_en <= '0';
index 8c0bc65427ce6656b7b4cf14a3b4e405e3dc3a1d..ee86ec5bbea6136ca16540de1991c4a87bd01615 100644 (file)
@@ -728,7 +728,7 @@ begin
    generic map (
        NUMBER_OF_BITS => 17)
    port map (
-       CLK       => LVDS_CLK_200P,
+       CLK       => LVDS_CLK_200P,      
        RESET     => '0',
        COUNT_OUT => free_counter,
        UP_IN     => '1',