fpga/axi3-interconnect
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

optimized decerr slave

Browse Source
This commit is contained in:
Mario Hüttel 2016-08-23 22:17:04 +02:00
parent 5ff411a66d
commit 2359f43ae9
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/axi3-interconnect-decerr.vhd
View File

@ -23,6 +23,7 @@ begin
read_error : process(clk, rst) is read_error : process(clk, rst) is
begin begin
if rst = '1' then if rst = '1' then
r_state <= R_READY;
slave_out.ar.arready <= '0'; slave_out.ar.arready <= '0';
slave_out.r.rdata <= (others => '0'); slave_out.r.rdata <= (others => '0');
slave_out.r.rid <= (others => '0'); slave_out.r.rid <= (others => '0');
@ -35,11 +36,10 @@ begin
when R_READY => when R_READY =>
slave_out.r.rlast <= '0'; slave_out.r.rlast <= '0';
if slave_in.ar.arvalid = '1' then if slave_in.ar.arvalid = '1' then
slave_out.ar.arready <= '1'; r_state <= R_ERROR;
r_state <= R_ERROR; slave_out.r.rid <= slave_in.ar.arid;
slave_out.r.rid <= slave_in.ar.arid; slave_out.r.rresp <= AXI_RESP_DECERR;
slave_out.r.rresp <= AXI_RESP_DECERR; slave_out.r.rvalid <= '1';
slave_out.r.rvalid <= '1';
if unsigned(slave_in.ar.arlen) = 1 then if unsigned(slave_in.ar.arlen) = 1 then
slave_out.r.rlast <= '1'; slave_out.r.rlast <= '1';
else else
@ -48,8 +48,7 @@ begin
r_len <= unsigned(slave_in.ar.arlen); r_len <= unsigned(slave_in.ar.arlen);
end if; end if;
when R_ERROR => when R_ERROR =>
slave_out.ar.arready <= '0'; slave_out.r.rvalid <= '1';
slave_out.r.rvalid <= '1';
if slave_in.r.rready = '1' then if slave_in.r.rready = '1' then
r_len <= r_len - 1; r_len <= r_len - 1;
if r_len = 2 then if r_len = 2 then
@ -64,13 +63,15 @@ begin
end if; end if;
end process read_error; end process read_error;
slave_out.ar.arready <= '1' when r_state = R_READY else '0';
-- AW Acceptor: -- AW Acceptor:
slave_out.aw.awready <= '1'; -- Always accept write transactions (interconnect will manage that only one is active) slave_out.aw.awready <= '1'; -- Always accept write transactions (interconnect will manage that only one is active)
write_error : process(clk, rst) is write_error : process(clk, rst) is
begin begin
if rst = '1' then if rst = '1' then
slave_out.w.wready <= '0'; w_state <= W_READY;
slave_out.b.bid <= (others => '0'); slave_out.b.bid <= (others => '0');
slave_out.b.bresp <= (others => '0'); slave_out.b.bresp <= (others => '0');
slave_out.b.buser <= (others => '0'); slave_out.b.buser <= (others => '0');
@ -79,14 +80,12 @@ begin
case w_state is case w_state is
when W_READY => when W_READY =>
if slave_in.w.wvalid = '1' then if slave_in.w.wvalid = '1' then
slave_out.w.wready <= '1';
w_state <= W_ERROR; w_state <= W_ERROR;
slave_out.b.bid <= slave_in.w.wid; slave_out.b.bid <= slave_in.w.wid;
slave_out.b.bresp <= AXI_RESP_DECERR; slave_out.b.bresp <= AXI_RESP_DECERR;
slave_out.b.bvalid <= '1'; slave_out.b.bvalid <= '1';
end if; end if;
when W_ERROR => when W_ERROR =>
slave_out.w.wready <= '0';
if slave_in.b.bready = '1' then if slave_in.b.bready = '1' then
slave_out.b.bvalid <= '0'; slave_out.b.bvalid <= '0';
w_state <= W_READY; w_state <= W_READY;
@ -95,4 +94,6 @@ begin
end if; end if;
end process write_error; end process write_error;
slave_out.w.wready <= '1' when w_state = W_READY else '0';
end architecture RTL; end architecture RTL;