From a70d27c09482c9440ba58e78766d1dd3327c97ac Mon Sep 17 00:00:00 2001
From: Adrian Costina <adrian.costina@analog.com>
Date: Fri, 5 Dec 2014 11:46:20 +0200
Subject: [PATCH] axi_mc_speed: updated core to latest axi interface
 implementation

---
 library/axi_mc_speed/axi_mc_speed.v | 51 ++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/library/axi_mc_speed/axi_mc_speed.v b/library/axi_mc_speed/axi_mc_speed.v
index 73be2a69b..1515a7287 100644
--- a/library/axi_mc_speed/axi_mc_speed.v
+++ b/library/axi_mc_speed/axi_mc_speed.v
@@ -96,7 +96,8 @@ module axi_mc_speed
 reg             adc_valid = 'd0;
 reg     [31:0]  adc_data = 'd0;
 reg     [31:0]  up_rdata = 'd0;
-reg             up_ack = 'd0;
+reg             up_wack = 'd0;
+reg             up_rack = 'd0;
 
 //------------------------------------------------------------------------------
 //----------- Wires Declarations -----------------------------------------------
@@ -113,12 +114,14 @@ wire            adc_start_s;
 wire    [31:0]  speed_data_s;
 wire            adc_enable_s;
 wire            adc_status_s;
-wire            up_sel_s;
-wire            up_wr_s;
-wire    [13:0]  up_addr_s;
+wire            up_rreq_s;
+wire            up_wreq_s;
+wire    [13:0]  up_waddr_s;
+wire    [13:0]  up_raddr_s;
 wire    [31:0]  up_wdata_s;
 wire    [31:0]  up_adc_common_rdata_s;
-wire            up_adc_common_ack_s;
+wire            up_adc_common_wack_s;
+wire            up_adc_common_rack_s;
 wire    [31:0]  pid_s;
 
 wire  [ 2:0]  position_s;
@@ -164,11 +167,13 @@ begin
     if(up_rstn == 0)
     begin
         up_rdata  <= 'd0;
-        up_ack    <= 'd0;
+        up_wack   <= 'd0;
+        up_rack   <= 'd0;
     end else
     begin
         up_rdata  <= up_adc_common_rdata_s;
-        up_ack    <= up_adc_common_ack_s;
+        up_wack   <= up_adc_common_wack_s;
+        up_rack   <= up_adc_common_rack_s;
     end
 end
 
@@ -275,15 +280,19 @@ up_adc_common i_up_adc_common(
   .drp_locked(1'b0),
   .up_usr_chanmax(),
   .adc_usr_chanmax(8'd0),
+  .up_adc_gpio_in(),
+  .up_adc_gpio_out(),
   .up_rstn(up_rstn),
   .up_clk(up_clk),
-  .up_sel(up_sel_s),
-  .up_wr(up_wr_s),
-  .up_addr(up_addr_s),
-  .up_wdata(up_wdata_s),
-  .up_rdata(up_adc_common_rdata_s),
-  .up_ack(up_adc_common_ack_s)
-);
+  .up_wreq (up_wreq_s),
+  .up_waddr (up_waddr_s),
+  .up_wdata (up_wdata_s),
+  .up_wack (up_adc_common_wack_s),
+  .up_rreq (up_rreq_s),
+  .up_raddr (up_raddr_s),
+  .up_rdata (up_adc_common_rdata_s),
+  .up_rack (up_adc_common_rack_s));
+
 // up bus interface
 
 up_axi i_up_axi(
@@ -306,12 +315,14 @@ up_axi i_up_axi(
         .up_axi_rresp(s_axi_rresp),
         .up_axi_rdata(s_axi_rdata),
         .up_axi_rready(s_axi_rready),
-        .up_sel(up_sel_s),
-        .up_wr(up_wr_s),
-        .up_addr(up_addr_s),
-        .up_wdata(up_wdata_s),
-        .up_rdata(up_rdata),
-        .up_ack(up_ack));
+        .up_wreq (up_wreq_s),
+        .up_waddr (up_waddr_s),
+        .up_wdata (up_wdata_s),
+        .up_wack (up_wack),
+        .up_rreq (up_rreq_s),
+        .up_raddr (up_raddr_s),
+        .up_rdata (up_rdata),
+        .up_rack (up_rack));
 
 endmodule