FPGA/riffa
1
0
Fork 0
mirror of https://github.com/KastnerRG/riffa.git synced 2025-01-30 23:02:54 +08:00
Code Issues Projects Releases Wiki Activity

Fixed a bug (uncovered by the clock ratio issue) where the tx_multiplexer would

Browse Source 
confuse the tx_port_monitor by returning too few or too many write-packet
acknowledgements, resulting in a hang (but correct data!).
This commit is contained in:
Dustin Richmond 2016-02-16 16:04:10 -08:00
parent 753ffffd93
commit 4d0bc24319
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fpga/riffa_hdl/tx_multiplexer.v
View File

@ -98,6 +98,7 @@ module tx_multiplexer
input TXR_SENT); input TXR_SENT);
wire [C_NUM_CHNL-1:0] wAckRdData; wire [C_NUM_CHNL-1:0] wAckRdData;
wire wAckValid;
reg [C_NUM_CHNL-1:0] rAckWrData; // Registered fifo input (only write acks) reg [C_NUM_CHNL-1:0] rAckWrData; // Registered fifo input (only write acks)
reg [C_NUM_CHNL-1:0] rAckRdData; // Registered fifo output (only write acks) reg [C_NUM_CHNL-1:0] rAckRdData; // Registered fifo output (only write acks)
@ -105,7 +106,7 @@ module tx_multiplexer
reg rAckRdEn; // Fifo read enable (TXR_SENT) reg rAckRdEn; // Fifo read enable (TXR_SENT)
always @(*) begin always @(*) begin
_rAckWrEn = (WR_ACK != 0) | (RD_ACK != 0); _rAckWrEn = (WR_ACK != 0);
end end
always @(posedge CLK) begin always @(posedge CLK) begin
@ -116,7 +117,7 @@ module tx_multiplexer
always @(posedge CLK) begin always @(posedge CLK) begin
rAckRdEn <= TXR_SENT; rAckRdEn <= TXR_SENT;
if(rAckRdEn) begin if(rAckRdEn) begin
rAckRdData <= wAckRdData; rAckRdData <= wAckRdData & {C_NUM_CHNL{wAckValid}};
end else begin end else begin
rAckRdData <= 0; rAckRdData <= 0;
end end
@ -134,7 +135,7 @@ module tx_multiplexer
(// Outputs (// Outputs
.WR_READY (), .WR_READY (),
.RD_DATA (wAckRdData), .RD_DATA (wAckRdData),
.RD_VALID (), .RD_VALID (wAckValid),
// Inputs // Inputs
.WR_DATA (rAckWrData), .WR_DATA (rAckWrData),
.WR_VALID (rAckWrEn), .WR_VALID (rAckWrEn),