修正SPI的读错误，尚未测试通过

tb/shinTest/ShinTopSpiTb.v

@@ -358,13 +358,23 @@ task spi_trans( input [15:0] saddress, input [7:0] scmd, input [12:0] slength,in
       $fwrite(spidata_file, "T:%2tns \tdev:%4d, addr:0x%02h%02h, %s, len:%4d\n", 
           $time/1000, sidx, txBuf[1], txBuf[0], 
           ((txBuf[2] == 0)? "Write":" Read"), slength);
-
+      if (scmd == 0) begin
-      for (integer i=0; i<slength; i++) begin
+        for (integer i=0; i<slength; i++) begin
-        $fwrite(spidata_file, "%02h ", txBuf[i + 3]); 
+          $fwrite(spidata_file, "%02h ", txBuf[i + 3]); 
-        c_line = 0;
+          c_line = 0;
-        if ((i+1)%16 == 0) begin
+          if ((i+1)%16 == 0) begin
-          $fwrite(spidata_file, "\n");
+            $fwrite(spidata_file, "\n");
-          c_line = 1;
+            c_line = 1;
+          end
+        end
+      end else begin
+        for (integer i=0; i<slength; i++) begin
+          $fwrite(spidata_file, "%02h ", rxBuf[i + 3]); 
+          c_line = 0;
+          if ((i+1)%16 == 0) begin
+            $fwrite(spidata_file, "\n");
+            c_line = 1;
+          end
         end
       end
       if (c_line == 0) begin
@@ -380,6 +390,9 @@ endtask
 
 `define INTERFACE_IDX       0 //internal spi
 `define IF_IDX(idx)         ((`INTERFACE_IDX)+(idx))
+`define IF_IQSPI(idx)       ((idx))
+`define IF_OQSPI(idx)       ((10) + (idx))
+`define IF_OSPI(idx)        ((5) + (idx))
 `define SPI_WRITE           8'h0
 `define SPI_READ            8'h1
 
@@ -387,13 +400,35 @@ initial begin
 
   #1000
   $fdisplay(spidata_file, "测试用例1-从IP中读取寄存器，上电后的寄存器期望值为0");
-  spi_trans( (16'h00), (`SPI_READ), (10), (`IF_IDX(0)) );
+  spi_trans( (16'h00), (`SPI_READ), (10), (`IF_IQSPI(0)) );
+
+  spi_trans( (16'h20), (`SPI_READ), (64), (`IF_IQSPI(0)) );
+  spi_trans( (16'h20), (`SPI_READ), (64), (`IF_IQSPI(1)) );
+  spi_trans( (16'h20), (`SPI_READ), (64), (`IF_IQSPI(2)) );
+  spi_trans( (16'h20), (`SPI_READ), (64), (`IF_IQSPI(3)) );
+  spi_trans( (16'h20), (`SPI_READ), (64), (`IF_IQSPI(4)) );
+
+
+  if ((`INTERFACE_IDX) == 5) begin
+    $fdisplay(spidata_file, "\n\n从内部QSPI配置使用外部的SPI接口访问EasyBus");
+    txBuf[0+3] = 8'h01;
+    spi_trans( (16'h09), (`SPI_WRITE), (1), (`IF_IQSPI(0)) );
+    spi_trans( (16'h09), (`SPI_WRITE), (1), (`IF_IQSPI(1)) );
+    spi_trans( (16'h09), (`SPI_WRITE), (1), (`IF_IQSPI(2)) );
+    spi_trans( (16'h09), (`SPI_WRITE), (1), (`IF_IQSPI(3)) );
+    spi_trans( (16'h09), (`SPI_WRITE), (1), (`IF_IQSPI(4)) );
+  end else if ((`INTERFACE_IDX) == 10) begin
+    $fdisplay(spidata_file, "\n\n从内部QSPI配置使用外部的QSPI接口访问EasyBus");
+    txBuf[0+3] = 8'h02;
+    spi_trans( (16'h09), (`SPI_WRITE), (1), (`IF_IQSPI(0)) );
+    spi_trans( (16'h09), (`SPI_WRITE), (1), (`IF_IQSPI(1)) );
+    spi_trans( (16'h09), (`SPI_WRITE), (1), (`IF_IQSPI(2)) );
+    spi_trans( (16'h09), (`SPI_WRITE), (1), (`IF_IQSPI(3)) );
+    spi_trans( (16'h09), (`SPI_WRITE), (1), (`IF_IQSPI(4)) );
+  end else begin
+    $fdisplay(spidata_file, "\n\n从内部QSPI接口访问EasyBus");
+  end
 
-  spi_trans( (16'h20), (`SPI_READ), (64), (`IF_IDX(0)) );
-  spi_trans( (16'h20), (`SPI_READ), (64), (`IF_IDX(1)) );
-  spi_trans( (16'h20), (`SPI_READ), (64), (`IF_IDX(2)) );
-  spi_trans( (16'h20), (`SPI_READ), (64), (`IF_IDX(3)) );
-  spi_trans( (16'h20), (`SPI_READ), (64), (`IF_IDX(3)) );
 
   //设置主站从站
   $fdisplay(spidata_file, "\n\n测试用例2-设置IP为主站或从站，并读取设置结果，期望：0主，1~4从");
@@ -428,9 +463,33 @@ initial begin
   begin
     $fdisplay(spidata_file, "--->>>嗅探前，检查链路状态寄存器");
     //spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(0)) );
+    txBuf[0+3] = 8'h00;
+    txBuf[1+3] = 8'h00;
+    txBuf[2+3] = 8'h00;
+    txBuf[3+3] = 8'h00;
+    txBuf[4+3] = 8'h00;
+    txBuf[5+3] = 8'h00;
     spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(1)) );
+    txBuf[0+3] = 8'h00;
+    txBuf[1+3] = 8'h00;
+    txBuf[2+3] = 8'h00;
+    txBuf[3+3] = 8'h00;
+    txBuf[4+3] = 8'h00;
+    txBuf[5+3] = 8'h00;
     spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(2)) );
+    txBuf[0+3] = 8'h00;
+    txBuf[1+3] = 8'h00;
+    txBuf[2+3] = 8'h00;
+    txBuf[3+3] = 8'h00;
+    txBuf[4+3] = 8'h00;
+    txBuf[5+3] = 8'h00;
     spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(3)) );
+    txBuf[0+3] = 8'h00;
+    txBuf[1+3] = 8'h00;
+    txBuf[2+3] = 8'h00;
+    txBuf[3+3] = 8'h00;
+    txBuf[4+3] = 8'h00;
+    txBuf[5+3] = 8'h00;
     spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(4)) );
 
     $fdisplay(spidata_file, "--->>>嗅探");
@@ -471,9 +530,33 @@ initial begin
   #50000
   $fdisplay(spidata_file, "--->>>嗅探后，检查链路状态寄存器");
   //spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(0)) );
+  txBuf[0+3] = 8'h00;
+    txBuf[1+3] = 8'h00;
+    txBuf[2+3] = 8'h00;
+    txBuf[3+3] = 8'h00;
+    txBuf[4+3] = 8'h00;
+    txBuf[5+3] = 8'h00;
   spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(1)) );
+  txBuf[0+3] = 8'h00;
+    txBuf[1+3] = 8'h00;
+    txBuf[2+3] = 8'h00;
+    txBuf[3+3] = 8'h00;
+    txBuf[4+3] = 8'h00;
+    txBuf[5+3] = 8'h00;
   spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(2)) );
+  txBuf[0+3] = 8'h00;
+    txBuf[1+3] = 8'h00;
+    txBuf[2+3] = 8'h00;
+    txBuf[3+3] = 8'h00;
+    txBuf[4+3] = 8'h00;
+    txBuf[5+3] = 8'h00;
   spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(3)) );
+  txBuf[0+3] = 8'h00;
+    txBuf[1+3] = 8'h00;
+    txBuf[2+3] = 8'h00;
+    txBuf[3+3] = 8'h00;
+    txBuf[4+3] = 8'h00;
+    txBuf[5+3] = 8'h00;
   spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(4)) );
 
   
@@ -483,10 +566,10 @@ initial begin
   begin
     $fdisplay(spidata_file, "--->>>设置顺序地址前，检查顺序地址");
     //spi_trans( (16'h0010), (`SPI_READ), (5), (`IF_IDX(0)) );
-    spi_trans( (16'h0000), (`SPI_READ), (32), (`IF_IDX(1)) );
+    spi_trans( (16'h0000), (`SPI_READ), (16), (`IF_IDX(1)) );
-    spi_trans( (16'h0000), (`SPI_READ), (32), (`IF_IDX(2)) );
+    spi_trans( (16'h0000), (`SPI_READ), (16), (`IF_IDX(2)) );
-    spi_trans( (16'h0000), (`SPI_READ), (32), (`IF_IDX(3)) );
+    spi_trans( (16'h0000), (`SPI_READ), (16), (`IF_IDX(3)) );
-    spi_trans( (16'h0000), (`SPI_READ), (32), (`IF_IDX(4)) );
+    spi_trans( (16'h0000), (`SPI_READ), (16), (`IF_IDX(4)) );
 
 
     $fdisplay(spidata_file, "--->>>设置顺序地址");
@@ -541,12 +624,9 @@ initial begin
   spi_trans( (16'h0000), (`SPI_READ), (32), (`IF_IDX(4)) );
 
   $fdisplay(spidata_file, "\n\n测试用例5-交换数据");
-    $display("read&write @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
+  $display("read&write @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
   begin
 
-
-
-
     //设置SM1在写入516地址触发enq
     txBuf[0+3] = 8'h03;
     txBuf[1+3] = 8'h02;