diff --git a/tb/shinTest/ShinTopSpiTb.v b/tb/shinTest/ShinTopSpiTb.v index 7cff8eb..984677f 100644 --- a/tb/shinTest/ShinTopSpiTb.v +++ b/tb/shinTest/ShinTopSpiTb.v @@ -9,7 +9,7 @@ //`define ENABLE_EXCHG_DATA_SEQ0_TEST //`define ENABLE_EXCHG_DATA_SEQ1_TEST -//`define ENABLE_EXCHG_DATA_SEQ2_TEST +`define ENABLE_EXCHG_DATA_SEQ2_TEST //`define ENABLE_EXCHG_DATA_SEQ3_TEST //`define ENABLE_BC_R_TEST @@ -17,7 +17,7 @@ //`define ENABLE_BC_RW_TEST `define ENABLE_SYNC_TEST -`define ENABLE_SYNC_SIG0_TEST +//`define ENABLE_SYNC_SIG0_TEST //`define ENABLE_SYNC_SIG1_TEST //`define ENABLE_RESET_TEST @@ -427,7 +427,7 @@ task spi_trans( input [15:0] saddress, input [7:0] scmd, input [12:0] slength,in $realtime, ((sidx >= 5)? ((sidx >= 10)? (sidx - 10):(sidx - 5)):sidx), txBuf[0], txBuf[1], ((txBuf[2] == 0)? "Write":" Read"), slength); - if ( ((saddress == 16'h0800) + if ( ((saddress == 16'h0800) || (saddress == 16'h1000) || (saddress == 16'h1800) || (saddress == 16'h2000) @@ -448,7 +448,7 @@ task spi_trans( input [15:0] saddress, input [7:0] scmd, input [12:0] slength,in $fwrite(spidata_file, "\n"); _pos = 4 + _pos; for (; _pos < slength; ) begin - for (integer _k = 0; _k < 8; _k++) begin + for (integer _k = 0; _k < 6; _k++) begin if (scmd == 0) begin $fwrite(spidata_file, "%02h ", txBuf[_k + _pos]); _len = txBuf[_pos + 5] + (txBuf[_pos + 4] & 8'h0f) * 256; @@ -459,7 +459,7 @@ task spi_trans( input [15:0] saddress, input [7:0] scmd, input [12:0] slength,in end $fwrite(spidata_file, "\n{{ "); - _pos = _pos + 8; + _pos = _pos + 6; for (integer _k = 0; _k < _len; _k++) begin if (scmd == 0) begin $fwrite(spidata_file, "%02h ", txBuf[_k + _pos]); @@ -474,6 +474,16 @@ task spi_trans( input [15:0] saddress, input [7:0] scmd, input [12:0] slength,in end $fwrite(spidata_file, "}}\n"); _pos = _pos + _len; + + for (integer _k = 0; _k < 2; _k++) begin + if (scmd == 0) begin + $fwrite(spidata_file, "%02h ", txBuf[_k + _pos]); + end else begin + $fwrite(spidata_file, "%02h ", rxBuf[_k + _pos]); + end + end + _pos = _pos + 2; + $fwrite(spidata_file, "\n"); end end else begin for (integer i=0; i