small changes to different files, Jan

diff --git a/trb_net_ibuf.vhd b/trb_net_ibuf.vhd
index b635a0bfe2209cfd7e27f0fcf7406428a6a97a65..c4195dd6a254c48994a234fed36b5ef46b91998e 100644 (file)
--- a/trb_net_ibuf.vhd
+++ b/trb_net_ibuf.vhd
@@ -34,7 +34,7 @@ entity trb_net_ibuf is
     CTRL_LOCKED:       in  STD_LOGIC_VECTOR (15 downto 0);
     STAT_BUFFER:       out STD_LOGIC_VECTOR (31 downto 0)
     );
-END trb_net_ibuf;
+end trb_net_ibuf;
 
 architecture trb_net_ibuf_arch of trb_net_ibuf is
 
@@ -80,7 +80,7 @@ end component;
     -- Status and control port
     STAT_BUFFER:       out STD_LOGIC
     );
-  END component;
+  end component;
 
 signal fifo_data_in : std_logic_vector(50 downto 0);
 signal fifo_data_out : std_logic_vector(50 downto 0);
@@ -140,12 +140,12 @@ signal next_rec_buffer_size_out, current_rec_buffer_size_out
       if MED_DATAREADY_IN = '1' and reg_read_out= '1' then
         if MED_DATA_IN(TYPE_POSITION) = TYPE_ACK then
           -- BUGBUG: this causes trouble if the IBUF is full
-          got_ack_internal <=   '1';    
+          got_ack_internal <=   '1';
           if MED_DATA_IN(F1_POSITION) = F1_CHECK_ACK then
             next_rec_buffer_size_out <= MED_DATA_IN(BUFFER_SIZE_POSITION);
           end if;
         -- elsif fifo_full = '0' and is_locked = '0' then
-          elsif fifo_full = '0' then    -- still ACKs may come even when locked
+        elsif fifo_full = '0' then    -- still ACKs may come even when locked
           fifo_write <=  '1';
           next_read_out <=  '1';
         elsif fifo_full = '1' then

diff --git a/trb_net_med_8bit_fast.vhd b/trb_net_med_8bit_fast.vhd
index d163cf009da384d5bd1c6c0e228b24c102ba6f5d..d5591bccc80edb3f2cc00075fa937678f21889ea 100644 (file)
--- a/trb_net_med_8bit_fast.vhd
+++ b/trb_net_med_8bit_fast.vhd
@@ -82,7 +82,7 @@ entity trb_net_med_8bit_fast is
     INT_PACKET_NR_IN:  in  STD_LOGIC_VECTOR (1 downto 0);
     INT_READ_OUT:      out STD_LOGIC; -- offered word is read
     INT_ERROR_IN:      in  STD_LOGIC_VECTOR (2 downto 0);  -- Status bits
-    
+
     --  Media direction port
     -- in this case for the cable => 32 lines in total
     MED_DATA_OUT:             out STD_LOGIC_VECTOR (12 downto 0); -- Data word 

diff --git a/trb_net_passive_apimbuf.vhd b/trb_net_passive_apimbuf.vhd
index 383e6f910d26db0bbe7930162d45300d0bcd0239..9f8baaa58f914d209785e185d133e48da0397544 100644 (file)
--- a/trb_net_passive_apimbuf.vhd
+++ b/trb_net_passive_apimbuf.vhd
@@ -17,7 +17,7 @@ entity trb_net_passive_apimbuf is
                                                  -- for the direction to
                                                  -- internal world
            FIFO_TO_APL_DEPTH : integer := 3;     -- direction to application
-           FIFO_TERM_BUFFER_DEPTH  : integer := 0  -- fifo for auto-answering of
+           FIFO_TERM_BUFFER_DEPTH  : integer := 1  -- fifo for auto-answering of
                                                -- the master path, if set to 0
                                                -- no buffer is used at all
            );   

diff --git a/trb_net_trigger_reader.vhd b/trb_net_trigger_reader.vhd
index 17203833a9f0d33b993f1037fe42f7a61dbecbdd..ee9fc5dddb87a415c6ffabfffef189de62b17d2a 100644 (file)
--- a/trb_net_trigger_reader.vhd
+++ b/trb_net_trigger_reader.vhd
@@ -137,13 +137,7 @@ architecture trb_net_trigger_reader_arch of trb_net_trigger_reader is
       next_fifo_write_enable_in <= '0';
       next_fifo_data_in <= (others => '0');
       next_APL_SEND_OUT <= '0';
-      buf_STAT_TRIGGER_READER(3 downto 1) <= (others => '0');
-      buf_STAT_TRIGGER_READER(2) <= APL_DATAREADY_IN;
-      if APL_TYP_IN = TYPE_TRM then
-        buf_STAT_TRIGGER_READER(1) <= '1';
-      end if;
       if APL_TYP_IN = TYPE_TRM and APL_DATAREADY_IN = '1' and buf_APL_READ_OUT = '1' then
-        buf_STAT_TRIGGER_READER(3) <= '1';
         next_fifo_data_in(7 downto 0) <= APL_SEQNR_IN;
         next_fifo_data_in(39 downto 8)<= timecounter;
         next_fifo_write_enable_in <= '1';
@@ -171,8 +165,8 @@ architecture trb_net_trigger_reader_arch of trb_net_trigger_reader is
       end if;
     end process;
 
-buf_STAT_TRIGGER_READER(4) <= buf_APL_SEND_OUT;
-buf_STAT_TRIGGER_READER(5) <= next_APL_SEND_OUT;
+buf_STAT_TRIGGER_READER(1) <= fifo_write_enable_in;
+buf_STAT_TRIGGER_READER(2) <= fifo_read;
 
 STAT_TRIGGER_READER <= buf_STAT_TRIGGER_READER;
 
@@ -190,13 +184,13 @@ STAT_TRIGGER_READER <= buf_STAT_TRIGGER_READER;
     begin
       next_trigger_num_is_read <= trigger_num_is_read;
       next_trigger_time_is_read <= trigger_time_is_read;
-      next_fifo_read <= '0';
+      fifo_read <= '0';
       next_TRB_TRIGGER_READ_ERROR <= '0';
 
       if trigger_num_is_read = '1' and trigger_time_is_read = '1' then
         next_trigger_num_is_read <= '0';
         next_trigger_time_is_read <= '0';
-        fifo_read <= '1';
+        next_fifo_read <= '1';
         next_TRB_TRIGGER_READ_ERROR <= buf_TRB_TRIGGER_READ_ERROR;
       end if;
 
@@ -222,6 +216,7 @@ STAT_TRIGGER_READER <= buf_STAT_TRIGGER_READER;
     end process;
 
 
+
   process(CLK)
     begin
       if rising_edge(CLK) then