From 8bd0e57738f4b172a21257a42663d877d4ec0309 Mon Sep 17 00:00:00 2001 From: Shino Amakusa Date: Sun, 21 Aug 2016 23:31:16 +0200 Subject: [PATCH] fixed ID concatenation --- src/axi3-interconnect-ar-router.vhd | 2 +- src/axi3-interconnect-aw-router.vhd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/axi3-interconnect-ar-router.vhd b/src/axi3-interconnect-ar-router.vhd index 49be048..cb74b31 100644 --- a/src/axi3-interconnect-ar-router.vhd +++ b/src/axi3-interconnect-ar-router.vhd @@ -54,7 +54,7 @@ begin masters_in(i).arready <= '0'; -- Write request to slave slaves_in(slave_idx(i)).araddr <= masters_out(i).araddr; - slaves_in(slave_idx(i)).arid <= std_logic_vector(to_unsigned(i, WID_SLAVE_BITS - WID_MASTER_BITS - 1)) & masters_out(i).arid; + slaves_in(slave_idx(i)).arid <= std_logic_vector(to_unsigned(i, WID_SLAVE_BITS - WID_MASTER_BITS)) & masters_out(i).arid; slaves_in(slave_idx(i)).arburst <= masters_out(i).arburst; slaves_in(slave_idx(i)).arcache <= masters_out(i).arcache; slaves_in(slave_idx(i)).arlen <= masters_out(i).arlen; diff --git a/src/axi3-interconnect-aw-router.vhd b/src/axi3-interconnect-aw-router.vhd index 3392046..47c661c 100644 --- a/src/axi3-interconnect-aw-router.vhd +++ b/src/axi3-interconnect-aw-router.vhd @@ -69,7 +69,7 @@ begin awready_s(i) <= '0'; -- output request to slave slaves_in(slave_idx).awaddr <= masters_out(i).awaddr; - slaves_in(slave_idx).awid <= std_logic_vector(to_unsigned(i, WID_SLAVE_BITS - WID_MASTER_BITS - 1)) & masters_out(i).awid; + slaves_in(slave_idx).awid <= std_logic_vector(to_unsigned(i, WID_SLAVE_BITS - WID_MASTER_BITS)) & masters_out(i).awid; slaves_in(slave_idx).awburst <= masters_out(i).awburst; slaves_in(slave_idx).awcache <= masters_out(i).awcache; slaves_in(slave_idx).awlen <= masters_out(i).awlen;