zcy
/
pluto_hdl_adi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

axi_mc_speed: updated core to latest axi interface implementation

main
Adrian Costina 2014-12-05 11:46:20 +02:00
parent 26f58914e2
commit a70d27c094
1 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
library/axi_mc_speed/axi_mc_speed.v
View File

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