From 944f600c8a96c82117af672c0344aac637cf5716 Mon Sep 17 00:00:00 2001
From: David Mapstone <david@mapstone.me>
Date: Tue, 21 Mar 2023 16:08:07 +0000
Subject: [PATCH] SOC1-153: Updated Read Address Calculator to Address
Calculator so can be used for input address calculation
---
flist/wrapper_ip.flist | 2 +-
...{wrapper_read_addr_calc.sv => wrapper_addr_calc.sv} | 10 +++++-----
hdl/src/wrapper_ahb_packet_deconstructor.sv | 8 ++++----
3 files changed, 10 insertions(+), 10 deletions(-)
rename hdl/src/{wrapper_read_addr_calc.sv => wrapper_addr_calc.sv} (84%)
diff --git a/flist/wrapper_ip.flist b/flist/wrapper_ip.flist
index b5af8f2..261a85d 100644
--- a/flist/wrapper_ip.flist
+++ b/flist/wrapper_ip.flist
@@ -22,7 +22,7 @@
$(ACC_WRAPPER_DIR)/hdl/src/wrapper_ahb_packet_constructor.sv
$(ACC_WRAPPER_DIR)/hdl/src/wrapper_ahb_packet_deconstructor.sv
-$(ACC_WRAPPER_DIR)/hdl/src/wrapper_read_addr_calc.sv
+$(ACC_WRAPPER_DIR)/hdl/src/wrapper_addr_calc.sv
$(ACC_WRAPPER_DIR)/hdl/src/wrapper_data_req.sv
$(ACC_WRAPPER_DIR)/hdl/src/wrapper_ahb_reg_interface.sv
$(ACC_WRAPPER_DIR)/hdl/src/wrapper_ahb_vr_interface.sv
diff --git a/hdl/src/wrapper_read_addr_calc.sv b/hdl/src/wrapper_addr_calc.sv
similarity index 84%
rename from hdl/src/wrapper_read_addr_calc.sv
rename to hdl/src/wrapper_addr_calc.sv
index 9049c9f..03a83ea 100644
--- a/hdl/src/wrapper_read_addr_calc.sv
+++ b/hdl/src/wrapper_addr_calc.sv
@@ -1,5 +1,5 @@
//-----------------------------------------------------------------------------
-// SoC Labs Relative Read Address Calculator
+// SoC Labs Relative Address Calculator
// A joint work commissioned on behalf of SoC Labs, under Arm Academic Access license.
//
// Contributors
@@ -8,7 +8,7 @@
//
// Copyright 2023, SoC Labs (www.soclabs.org)
//-----------------------------------------------------------------------------
-module wrapper_read_addr_calc #(
+module wrapper_addr_calc #(
//parameter for address width
parameter ADDRWIDTH=11,
parameter PACKETWIDTH=256
@@ -16,8 +16,8 @@ module wrapper_read_addr_calc #(
// Number of Packets in Current Block
input logic [PACKETSPACEWIDTH:0] block_packet_count,
- // Start Read Address
- output logic [ADDRWIDTH-1:0] block_read_addr
+ // Start Address
+ output logic [ADDRWIDTH-1:0] block_addr
);
localparam PACKETBYTES = (PACKETWIDTH+7)/8; // Number of Bytes in Packet
@@ -26,7 +26,7 @@ module wrapper_read_addr_calc #(
logic [ADDRWIDTH-1:0] block_byte_count; // Number of Bytes taken up by Block
logic [ADDRWIDTH:0] end_word_addr; // First Address at start of next region
- logic [ADDRWIDTH:0] block_read_addr_ext; // Relative Read Address extended by 1 bit
+ logic [ADDRWIDTH:0] block_read_addr_ext; // Relative Address extended by 1 bit
assign block_byte_count = block_packet_count * PACKETBYTES;
assign end_word_addr = {1'b1,{(ADDRWIDTH){1'b0}}};
diff --git a/hdl/src/wrapper_ahb_packet_deconstructor.sv b/hdl/src/wrapper_ahb_packet_deconstructor.sv
index c582f7e..5afb2e0 100644
--- a/hdl/src/wrapper_ahb_packet_deconstructor.sv
+++ b/hdl/src/wrapper_ahb_packet_deconstructor.sv
@@ -115,13 +115,13 @@ module wrapper_ahb_packet_deconstructor #(
);
// Relative Read Address Calculator
- wrapper_read_addr_calc #(
+ wrapper_addr_calc #(
ADDRWIDTH, // Only half address map allocated to this device
PACKETWIDTH // Packet Width
- ) u_wrapper_read_addr_calc (
+ ) u_wrapper_addr_calc (
// Address Interfaces
- .block_packet_count (block_packet_count),
- .block_read_addr (block_read_addr)
+ .block_packet_count (block_packet_count),
+ .block_addr (block_read_addr)
);
// Valid/Ready Packet Generator
--
GitLab