mirror of
https://github.com/fpganinja/taxi.git
synced 2025-12-07 16:28:40 -08:00
axi: Fix interface indexing
Signed-off-by: Alex Forencich <alex@alexforencich.com>
This commit is contained in:
@@ -61,9 +61,9 @@ localparam S_ADDR_W = s_axi_rd[0].ADDR_W;
|
|||||||
localparam STRB_W = s_axi_rd[0].STRB_W;
|
localparam STRB_W = s_axi_rd[0].STRB_W;
|
||||||
localparam S_ID_W = s_axi_rd[0].ID_W;
|
localparam S_ID_W = s_axi_rd[0].ID_W;
|
||||||
localparam M_ID_W = m_axi_rd.ID_W;
|
localparam M_ID_W = m_axi_rd.ID_W;
|
||||||
localparam logic ARUSER_EN = s_axi_rd[0].ARUSER_EN && m_axi_rd.ARUSER_EN;
|
localparam logic ARUSER_EN = s_axi_rd[0].ARUSER_EN && m_axi_rd[0].ARUSER_EN;
|
||||||
localparam ARUSER_W = s_axi_rd[0].ARUSER_W;
|
localparam ARUSER_W = s_axi_rd[0].ARUSER_W;
|
||||||
localparam logic RUSER_EN = s_axi_rd[0].RUSER_EN && m_axi_rd.RUSER_EN;
|
localparam logic RUSER_EN = s_axi_rd[0].RUSER_EN && m_axi_rd[0].RUSER_EN;
|
||||||
localparam RUSER_W = s_axi_rd[0].RUSER_W;
|
localparam RUSER_W = s_axi_rd[0].RUSER_W;
|
||||||
|
|
||||||
localparam CL_S_COUNT = $clog2(S_COUNT);
|
localparam CL_S_COUNT = $clog2(S_COUNT);
|
||||||
@@ -105,10 +105,10 @@ localparam [M_COUNT*M_REGIONS-1:0][ADDR_W-1:0] M_BASE_ADDR_INT = M_BASE_ADDR !=
|
|||||||
if (s_axi_rd[0].ADDR_W != ADDR_W)
|
if (s_axi_rd[0].ADDR_W != ADDR_W)
|
||||||
$fatal(0, "Error: Interface ADDR_W parameter mismatch (instance %m)");
|
$fatal(0, "Error: Interface ADDR_W parameter mismatch (instance %m)");
|
||||||
|
|
||||||
if (m_axi_rd.DATA_W != DATA_W)
|
if (m_axi_rd[0].DATA_W != DATA_W)
|
||||||
$fatal(0, "Error: Interface DATA_W parameter mismatch (instance %m)");
|
$fatal(0, "Error: Interface DATA_W parameter mismatch (instance %m)");
|
||||||
|
|
||||||
if (m_axi_rd.STRB_W != STRB_W)
|
if (m_axi_rd[0].STRB_W != STRB_W)
|
||||||
$fatal(0, "Error: Interface STRB_W parameter mismatch (instance %m)");
|
$fatal(0, "Error: Interface STRB_W parameter mismatch (instance %m)");
|
||||||
|
|
||||||
if (M_REGIONS < 1 || M_REGIONS > 16)
|
if (M_REGIONS < 1 || M_REGIONS > 16)
|
||||||
|
|||||||
@@ -59,11 +59,11 @@ module taxi_axil_interconnect_wr #
|
|||||||
localparam DATA_W = s_axil_wr[0].DATA_W;
|
localparam DATA_W = s_axil_wr[0].DATA_W;
|
||||||
localparam S_ADDR_W = s_axil_wr[0].ADDR_W;
|
localparam S_ADDR_W = s_axil_wr[0].ADDR_W;
|
||||||
localparam STRB_W = s_axil_wr[0].STRB_W;
|
localparam STRB_W = s_axil_wr[0].STRB_W;
|
||||||
localparam logic AWUSER_EN = s_axil_wr[0].AWUSER_EN && m_axil_wr.AWUSER_EN;
|
localparam logic AWUSER_EN = s_axil_wr[0].AWUSER_EN && m_axil_wr[0].AWUSER_EN;
|
||||||
localparam AWUSER_W = s_axil_wr[0].AWUSER_W;
|
localparam AWUSER_W = s_axil_wr[0].AWUSER_W;
|
||||||
localparam logic WUSER_EN = s_axil_wr[0].WUSER_EN && m_axil_wr.WUSER_EN;
|
localparam logic WUSER_EN = s_axil_wr[0].WUSER_EN && m_axil_wr[0].WUSER_EN;
|
||||||
localparam WUSER_W = s_axil_wr[0].WUSER_W;
|
localparam WUSER_W = s_axil_wr[0].WUSER_W;
|
||||||
localparam logic BUSER_EN = s_axil_wr[0].BUSER_EN && m_axil_wr.BUSER_EN;
|
localparam logic BUSER_EN = s_axil_wr[0].BUSER_EN && m_axil_wr[0].BUSER_EN;
|
||||||
localparam BUSER_W = s_axil_wr[0].BUSER_W;
|
localparam BUSER_W = s_axil_wr[0].BUSER_W;
|
||||||
|
|
||||||
localparam CL_S_COUNT = $clog2(S_COUNT);
|
localparam CL_S_COUNT = $clog2(S_COUNT);
|
||||||
@@ -105,10 +105,10 @@ localparam [M_COUNT*M_REGIONS-1:0][ADDR_W-1:0] M_BASE_ADDR_INT = M_BASE_ADDR !=
|
|||||||
if (s_axil_wr[0].ADDR_W != ADDR_W)
|
if (s_axil_wr[0].ADDR_W != ADDR_W)
|
||||||
$fatal(0, "Error: Interface ADDR_W parameter mismatch (instance %m)");
|
$fatal(0, "Error: Interface ADDR_W parameter mismatch (instance %m)");
|
||||||
|
|
||||||
if (m_axil_wr.DATA_W != DATA_W)
|
if (m_axil_wr[0].DATA_W != DATA_W)
|
||||||
$fatal(0, "Error: Interface DATA_W parameter mismatch (instance %m)");
|
$fatal(0, "Error: Interface DATA_W parameter mismatch (instance %m)");
|
||||||
|
|
||||||
if (m_axil_wr.STRB_W != STRB_W)
|
if (m_axil_wr[0].STRB_W != STRB_W)
|
||||||
$fatal(0, "Error: Interface STRB_W parameter mismatch (instance %m)");
|
$fatal(0, "Error: Interface STRB_W parameter mismatch (instance %m)");
|
||||||
|
|
||||||
initial begin
|
initial begin
|
||||||
|
|||||||
Reference in New Issue
Block a user