Only handle BERR when not in BERR_HIGH_WAIT

src/vme_data_bus.vhd

@@ -257,6 +257,7 @@ architecture rtl of vme_data_bus is
   signal timeout_cnt : integer range 0 to 255 := TIMEOUT_CNT_MAX;
 
   signal last_ds	        : std_logic_vector(1 downto 0);
+  signal last_berr              : std_logic;
   
 begin
 
@@ -664,6 +665,7 @@ begin
           busy <= '0';
 
         when BERR_HIGH_WAIT =>
+          --if (last_berr_n = '1' and vme_berr_n_i = '1') then
           if (vme_berr_n_i = '1') then
             state <= IDLE;
           end if;          
@@ -687,6 +689,7 @@ begin
 
           -- Data present (error)
           int_data_strobe <= c_DATA_PRESENT;
+          int_go_consumed_strobe <= '1';
           int_err_code <= (
             c_ERR_BERR_I => not vme_berr_n_i,
             c_ERR_TIMEOUT_I => '1',
@@ -731,15 +734,16 @@ begin
       -- drives the data strobe(s) low in response to data transfer
       -- acknowledgments from the Slave
 
-      last_ds <= vme_ds_n_i;
-      if (last_ds /= vme_ds_n_i or -- 
+      
+      if (last_ds_n /= vme_ds_n_i or -- 
           state    = IDLE or
           state    = IDLE_DELAY or
           state    = TIMEOUT or
           state    = TIMEOUT_WAIT) then
         -- Things are good, or we have fired (no need to fire again).
         timeout_cnt <= TIMEOUT_CNT_MAX;
-      elsif (vme_berr_n_i & int_timeout_n /= "11") then
+      elsif ((state /= BERR_HIGH_WAIT and vme_berr_n_i = '0') or
+             int_timeout_n = '0')
         state <= TIMEOUT;
       elsif (timeout_cnt = 0) then
         -- We have been operating for too long, timeout.
@@ -747,7 +751,10 @@ begin
       else
         timeout_cnt <= timeout_cnt - 1;
       end if;
-      
+
+
+      last_ds_n <= vme_ds_n_i;
+      last_berr_n <= vme_berr_n_i
     end if;
   end process;