SOC1-153: Updated Read Address Calculator to Address Calculator so can be used...

SOC1-153: Updated Read Address Calculator to Address Calculator so can be used for input address calculation

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

hdl/src/wrapper_read_addr_calc.sv → hdl/src/wrapper_addr_calc.sv

 //-----------------------------------------------------------------------------
-// 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}}};

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