Commit 412f22b1 authored by Michael Munch's avatar Michael Munch
Browse files

Merge branch 'rw-write' into rw-write-suggest

parents 177488e3 ecc2bcb0
Pipeline #26032 failed with stage
in 25 seconds
...@@ -6,10 +6,10 @@ vunit: ...@@ -6,10 +6,10 @@ vunit:
script: script:
- python3 run.py - python3 run.py
formal: # formal:
stage: build # stage: build
image: ghdl/synth:formal # image: ghdl/synth:formal
script: # script:
- export PATH="/opt/z3/z3/bin:$PATH" # - export PATH="/opt/z3/z3/bin:$PATH"
- cd src # - cd src
- sby --yosys "yosys -m ghdl" -f vme_cli_arb.sby # - sby --yosys "yosys -m ghdl" -f vme_cli_arb.sby
...@@ -256,8 +256,8 @@ architecture rtl of vme_data_bus is ...@@ -256,8 +256,8 @@ architecture rtl of vme_data_bus is
constant TIMEOUT_CNT_MAX : integer := 255; constant TIMEOUT_CNT_MAX : integer := 255;
signal timeout_cnt : integer range 0 to 255 := TIMEOUT_CNT_MAX; signal timeout_cnt : integer range 0 to 255 := TIMEOUT_CNT_MAX;
signal last_ds : std_logic_vector(1 downto 0); signal last_ds_n : std_logic_vector(1 downto 0);
signal last_berr : std_logic; signal last_berr_n : std_logic;
begin begin
...@@ -743,8 +743,7 @@ begin ...@@ -743,8 +743,7 @@ begin
state = BERR_HIGH_WAIT) then state = BERR_HIGH_WAIT) then
-- Things are good, or we have fired (no need to fire again). -- Things are good, or we have fired (no need to fire again).
timeout_cnt <= TIMEOUT_CNT_MAX; timeout_cnt <= TIMEOUT_CNT_MAX;
elsif (vme_berr_n_i = '0' or elsif (vme_berr_n_i = '0' or int_timeout_n = '0') then
int_timeout_n = '0')
state <= TIMEOUT; state <= TIMEOUT;
elsif (timeout_cnt = 0) then elsif (timeout_cnt = 0) then
-- We have been operating for too long, timeout. -- We have been operating for too long, timeout.
...@@ -755,7 +754,7 @@ begin ...@@ -755,7 +754,7 @@ begin
last_ds_n <= vme_ds_n_i; last_ds_n <= vme_ds_n_i;
last_berr_n <= vme_berr_n_i last_berr_n <= vme_berr_n_i;
end if; end if;
end process; end process;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment