FPGA/oh
1
0
Fork 0
mirror of https://github.com/aolofsson/oh.git synced 2025-01-17 20:02:53 +08:00
Code Issues Projects Releases Wiki Activity

Fixing read response address

Browse Source 
-using `define from elink_regmap (ie 'D')
This commit is contained in:
Andreas Olofsson 2015-05-20 15:04:29 -04:00
parent 7f0f858b92
commit 24d824f080
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elink/hdl/emaxi.v
View File

@ -453,7 +453,6 @@ module emaxi(/*autoarg*/
begin
txrr_access_reg <= m_axi_rready & m_axi_rvalid;
txrr_access <= txrr_access_reg;//added pipeline stage for data
// steer read data according to size & host address lsbs
//all data needs to be right aligned
//(this is due to the Epiphany right aligning all words)

12
elink/hdl/esaxi.v
View File

@ -18,7 +18,7 @@ module esaxi (/*autoarg*/
parameter [11:0] ID = 12'h810;
parameter IDW = 12;
parameter PW = 104;
parameter [15:0] RETURN_ADDR = {ID,4'hE};
parameter [15:0] RETURN_ADDR = {ID,`EGROUP_RR};
parameter AW = 32;
parameter DW = 32;
@ -211,7 +211,7 @@ module esaxi (/*autoarg*/
begin
if(~s_axi_aresetn)
begin
s_axi_awready <= 1'b0; //TODO: why not set default as 1?
s_axi_awready <= 1'b1; //TODO: why not set default as 1?
write_active <= 1'b0;
end
else
@ -427,9 +427,11 @@ module esaxi (/*autoarg*/
// -- because elink reads are not generally
// -- returned in order, we will only allow
// -- one at a time.
//TODO: Fix this nonsense, need to improve performance
//Allow up to N outstanding transactions, use ID to match them up
//Need to look at txrd_wait signal
assign txrd_write = 1'b0;
always @( posedge s_axi_aclk )
if (~s_axi_aresetn)
begin
@ -440,7 +442,7 @@ module esaxi (/*autoarg*/
ractive_reg <= 1'b0;
rnext <= 1'b0;
end
else
else
begin
ractive_reg <= read_active;
rnext <= s_axi_rvalid & s_axi_rready & ~s_axi_rlast;

2
elink/hdl/etx_arbiter.v
View File

@ -168,7 +168,7 @@ module etx_arbiter (/*AUTOARG*/
assign write_in = etx_mux[1];
always @ (posedge clk)
if ((write_in & ~etx_wr_wait) | (~write_in & ~etx_rd_wait))
if (access_in & (write_in & ~etx_wr_wait) | (~write_in & ~etx_rd_wait))
begin
etx_access <= access_in;
etx_packet[PW-1:0] <= etx_mux[PW-1:0];