From 2a4e1e588f75d95aa46e7272c1c545ca73420fc4 Mon Sep 17 00:00:00 2001
From: bacon <bacon@rtems.cn>
Date: Tue, 20 May 2025 17:39:44 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=B1=8F=E8=94=BD=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tb/shinTest/ShinTopSpiTb.v | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tb/shinTest/ShinTopSpiTb.v b/tb/shinTest/ShinTopSpiTb.v
index 6cdae78..0f7d409 100644
--- a/tb/shinTest/ShinTopSpiTb.v
+++ b/tb/shinTest/ShinTopSpiTb.v
@@ -615,6 +615,7 @@ initial begin
   spi_trans( (16'h0000), (`SPI_READ), (16), (`IF_IDX(3)) );
   spi_trans( (16'h0000), (`SPI_READ), (16), (`IF_IDX(4)) );
 
+`ifdef ENABLE_CODE
 /*---------------------------------------------------------------------------------------------------------
 测试用例5
 ---------------------------------------------------------------------------------------------------------*/
@@ -653,7 +654,6 @@ initial begin
 
 
   // 顺序索引
-  //#50000
   #50000
   #50000
   $fdisplay(spidata_file, "--->>>嗅探后，检查链路状态寄存器");
@@ -663,6 +663,8 @@ initial begin
   spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(3)) );
   spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(4)) );
 
+`endif
+
 /*---------------------------------------------------------------------------------------------------------
 测试用例6
 ---------------------------------------------------------------------------------------------------------*/

From 7db55e8a113a6e06dbb5e3ce9d6b46dd314c85c6 Mon Sep 17 00:00:00 2001
From: bacon <bacon@rtems.cn>
Date: Tue, 20 May 2025 17:59:46 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86slv0=E4=B8=8D?=
 =?UTF-8?q?=E8=BD=AC=E5=8F=91=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tb/shinTest/ShinTopSpiTb.v | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tb/shinTest/ShinTopSpiTb.v b/tb/shinTest/ShinTopSpiTb.v
index 1f4fc7d..a950f99 100644
--- a/tb/shinTest/ShinTopSpiTb.v
+++ b/tb/shinTest/ShinTopSpiTb.v
@@ -612,7 +612,7 @@ initial begin
   spi_trans( (16'h0000), (`SPI_READ), (16), (`IF_IDX(3)) );
   spi_trans( (16'h0000), (`SPI_READ), (16), (`IF_IDX(4)) );
 
-`ifdef ENABLE_CODE
+
 /*---------------------------------------------------------------------------------------------------------
 测试用例5
 ---------------------------------------------------------------------------------------------------------*/
@@ -629,7 +629,7 @@ initial begin
 
     $fdisplay(spidata_file, "--->>>嗅探");
     //设置SM1在写入0x3地址触发enq
-    txBuf[0+3] = 8'h03;
+    txBuf[0+3] = 8'h04;
     txBuf[1+3] = 8'h00;
     spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) );
     spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) );
@@ -660,7 +660,7 @@ initial begin
   spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(3)) );
   spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(4)) );
 
-`endif
+
 
 /*---------------------------------------------------------------------------------------------------------
 测试用例6

From 930f63e1f6626b5a6f882f1df06f870b3e810e44 Mon Sep 17 00:00:00 2001
From: bacon <bacon@rtems.cn>
Date: Wed, 21 May 2025 10:48:04 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81,?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95SM=E7=9A=84=E6=94=B6=E5=8F=91=E4=B8=8E?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BA=A4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tb/shinTest/ShinTopSpiTb.v | 108 ++++++++++++++++++++++---------------
 tb/shinTest/gen_pkt.py     |  48 ++++++++++++++---
 2 files changed, 106 insertions(+), 50 deletions(-)

diff --git a/tb/shinTest/ShinTopSpiTb.v b/tb/shinTest/ShinTopSpiTb.v
index a950f99..986bd41 100644
--- a/tb/shinTest/ShinTopSpiTb.v
+++ b/tb/shinTest/ShinTopSpiTb.v
@@ -424,7 +424,7 @@ endtask
 `define IF_OSPI(idx)        ((5) + (idx))
 `define SPI_WRITE           8'h0
 `define SPI_READ            8'h1
-
+`define TEST_REG_RW
 
 /*---------------------------------------------------------------------------------------------------------
 测试用例1
@@ -432,12 +432,19 @@ endtask
 initial begin
 
   #1000
-  $fdisplay(spidata_file, "测试用例1-从IP中读取寄存器，上电后的寄存器期望值为0");
+
+`ifdef TEST_REG_RW
+/*---------------------------------------------------------------------------------------------------------
+测试用例
+1. 从IP中读取寄存器，上电后的寄存器期望值为0
+---------------------------------------------------------------------------------------------------------*/
+  $fdisplay(spidata_file, "测试用例：从IP中读取寄存器，上电后的寄存器期望值为0");
   spi_trans( (16'h00), (`SPI_READ), (64), (`IF_IQSPI(0)) );
   spi_trans( (16'h00), (`SPI_READ), (64), (`IF_IQSPI(1)) );
   spi_trans( (16'h00), (`SPI_READ), (64), (`IF_IQSPI(2)) );
   spi_trans( (16'h00), (`SPI_READ), (64), (`IF_IQSPI(3)) );
   spi_trans( (16'h00), (`SPI_READ), (64), (`IF_IQSPI(4)) );
+`endif
 
 
   if ((`INTERFACE_IDX) == 5) begin
@@ -462,10 +469,11 @@ initial begin
 
 
 /*---------------------------------------------------------------------------------------------------------
-测试用例2
+测试用例
+1. 设置IP为主站或从站，并读取设置结果，期望：0主，1~4从
 ---------------------------------------------------------------------------------------------------------*/
   //设置主站从站
-  $fdisplay(spidata_file, "\n\n测试用例2-设置IP为主站或从站，并读取设置结果，期望：0主，1~4从");
+  $fdisplay(spidata_file, "\n\n测试用例：设置IP为主站或从站，并读取设置结果，期望：0主，1~4从");
   txBuf[0+3] = 8'h01;
   spi_trans( (16'h00), (`SPI_WRITE), (1), (`IF_IDX(0)) );
 
@@ -490,14 +498,12 @@ initial begin
   spi_trans( (16'h00), (`SPI_READ), (1), (`IF_IDX(4)) );
 
 /*---------------------------------------------------------------------------------------------------------
-
 测试用例3
-
 ---------------------------------------------------------------------------------------------------------*/
 
   //嗅探
   #10000
-  $fdisplay(spidata_file, "\n\n测试用例3-发送嗅探包，需要在波形文件里检查");
+  $fdisplay(spidata_file, "\n\n测试用例：发送嗅探包，需要在波形文件里检查");
   begin
     $fdisplay(spidata_file, "--->>>嗅探前，检查链路状态寄存器");
     //spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(0)) );
@@ -541,9 +547,9 @@ initial begin
   spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(4)) );
 
 /*---------------------------------------------------------------------------------------------------------
-测试用例4
+测试用例
 ---------------------------------------------------------------------------------------------------------*/
-  $fdisplay(spidata_file, "\n\n测试用例4-设置顺序索引");
+  $fdisplay(spidata_file, "\n\n测试用例：设置顺序索引");
   $display("index @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
 
   begin
@@ -603,8 +609,7 @@ initial begin
 
 
   //读写
-  #50000
-  #50000
+  #1000
   $fdisplay(spidata_file, "--->>>设置顺序地址后，检查顺序地址");
   //spi_trans( (16'h0010), (`SPI_READ), (5), (`IF_IDX(0)) );
   spi_trans( (16'h0000), (`SPI_READ), (16), (`IF_IDX(1)) );
@@ -614,11 +619,11 @@ initial begin
 
 
 /*---------------------------------------------------------------------------------------------------------
-测试用例5
+测试用例
 ---------------------------------------------------------------------------------------------------------*/
   //嗅探
-  #10000
-  $fdisplay(spidata_file, "\n\n测试用例5-发送嗅探包，需要在波形文件里检查");
+  #1000
+  $fdisplay(spidata_file, "\n\n测试用例：发送嗅探包，需要在波形文件里检查");
   begin
     $fdisplay(spidata_file, "--->>>嗅探前，检查链路状态寄存器");
     //spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(0)) );
@@ -651,8 +656,6 @@ initial begin
 
 
   // 顺序索引
-  #50000
-  #50000
   $fdisplay(spidata_file, "--->>>嗅探后，检查链路状态寄存器");
   //spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(0)) );
   spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(1)) );
@@ -663,21 +666,26 @@ initial begin
 
 
 /*---------------------------------------------------------------------------------------------------------
-测试用例6
+测试用例
+1. 交换数据sm0~sm7
+2. 交换数据sm0~sm7
+3. 交换数据sm0~sm7(中断、状态)
+4. 交换数据sm0~sm7(R/W/RW, BR/BW/BRW)
+4. 寄存器单读/写/读写，寄存器广播读/写/读写
+5. 以上交换数据的错误形式
 ---------------------------------------------------------------------------------------------------------*/
-  #50000
-  #50000
-  $fdisplay(spidata_file, "\n\n测试用例6-交换数据");
+  #1000
+  $fdisplay(spidata_file, "\n\n测试用例：交换数据");
   $display("read&write @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
   begin
-
+    $fdisplay(spidata_file, "--->>>交换数据sm0~sm7");
     //设置SM1在写入516 len触发enq
     txBuf[0+3] = 8'h04;
     txBuf[1+3] = 8'h02;
     spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) );
     spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) );
 
-    `include "seq_pkt.vh"
+    `include "seq_0_pkt.vh"
     spi_trans( (16'h1000), (`SPI_WRITE), (516), (`IF_IDX(0)) ); //写入SM1
     //发布请求
     txBuf[0+3] = 8'h01;
@@ -687,30 +695,38 @@ initial begin
 
     spi_trans( (16'ha03), (`SPI_READ), (1), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
 
+  #1000
+  $display("read&write @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
+  begin
+    $fdisplay(spidata_file, "\n--->>>交换数据写dev2_sm0/dev1_sm2/dev3_sm4/dev4_sm6");
+    txBuf[0+3] = 8'h54;
+    txBuf[1+3] = 8'h01;
+    spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) );
+    spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) );
+
+    `include "seq_1_pkt.vh"
+    spi_trans( (16'h1000), (`SPI_WRITE), (516), (`IF_IDX(0)) ); //写入SM1
+    //发布请求
+    txBuf[0+3] = 8'h01;
+    spi_trans( (16'h20), (`SPI_WRITE), (1), (`IF_IDX(0)) );//发送SM0 接收SM0, 请求发送
+    @(posedge isResp) #5 begin end
+  end
+
+    spi_trans( (16'h1800), (`SPI_READ), (64), (`IF_IDX(1)) );
+    spi_trans( (16'h0800), (`SPI_READ), (64), (`IF_IDX(2)) );
+    spi_trans( (16'h2800), (`SPI_READ), (64), (`IF_IDX(3)) );
+    spi_trans( (16'h3800), (`SPI_READ), (64), (`IF_IDX(4)) );
+
 
 /*---------------------------------------------------------------------------------------------------------
-测试用例7
-测试 同步(sync) 和 同步输出 (sync_out)
+测试用例
+1. 测试 同步(sync) 和 同步输出 (sync_out)
 ---------------------------------------------------------------------------------------------------------*/
-
   // 同步
-  #90000
-  #90000
-  #90000
-  #90000
-  #90000
-  #90000
-  #90000
-  #90000
-  #90000  
-  #90000
-  #90000
-  #90000
-  #90000
-  #90000
+  #1000
 
   $display("sync @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
-  $fdisplay(spidata_file, "\n\n测试用例-测试同步(sync)和同步输出(sync_out)");
+  $fdisplay(spidata_file, "\n\n测试用例：测试同步(sync)和同步输出(sync_out)");
   begin
     //设置SM1在写入 0x18 len触发enq
     txBuf[0+3] = 8'h18;
@@ -757,8 +773,8 @@ initial begin
 
     spi_trans( (16'h833), (`SPI_READ), (1), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
   end
-  
-  //清脉冲
+    #50
+    //清脉冲
     txBuf[0+3] = 0;  //负载0x122 sync0脉冲宽度
     txBuf[1+3] = 0;  //负载0x123
     txBuf[2+3] = 0;  //负载0x124 sync1脉冲宽度
@@ -767,7 +783,13 @@ initial begin
     txBuf[5+3] = 0;  //负载0x127 
     txBuf[6+3] = 0;  //负载0x128 sync3脉冲宽度
     txBuf[7+3] = 0;  //负载0x129
-    spi_trans( (16'h0122), (`SPI_WRITE), (8), (`IF_IDX(2)) ); //slv2
+    spi_trans( (16'h0122), (`SPI_READ), (8), (`IF_IDX(2)) ); //slv2
+
+    spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(0)) );
+    spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(1)) );
+    spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(2)) );
+    spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(3)) );
+    spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(4)) );
 end
 
 
diff --git a/tb/shinTest/gen_pkt.py b/tb/shinTest/gen_pkt.py
index 09b856c..b644205 100755
--- a/tb/shinTest/gen_pkt.py
+++ b/tb/shinTest/gen_pkt.py
@@ -108,10 +108,14 @@ class GenPkt(object):
 
 if __name__ == '__main__':
     genPkt = GenPkt()
-    
+
+    #-------------------------------------------------------------------------
+    #>>>>>>嗅探数据包
     genPkt.setPktType(1)
     genPkt.gen("./generated/shin/detect_pkt.vh")
-    
+
+    #-------------------------------------------------------------------------
+    #>>>>>>普通数据包   
     genPkt.clean()
     genPkt.setPktType(0)
     
@@ -120,21 +124,50 @@ if __name__ == '__main__':
     genPkt.addSubPkt(0x01, 0, 0x0840, 0x1, 56, None)
     genPkt.addSubPkt(0x03, 0, 0x1040, 0x0, 56, None)
     for i in range(5):
-        genPkt.addSubPkt(random.randint(100, 4000), 0, random.randint(0, 65536), 0x0, 56, None)
+        genPkt.addSubPkt(random.randint(100, 4000), 0, 
+                         random.randint(0, 65536), 0x0, 
+                         56, None)
     #genPkt.addSubPkt(10, 2, 0x300, 0x2, 4, None)
     #genPkt.addSubPkt(11, 1, 0x300, 0x2, 4, None)
-    genPkt.gen("./generated/shin/seq_pkt.vh")
+    genPkt.gen("./generated/shin/seq_0_pkt.vh")
 
+    #-------------------------------------------------------------------------
+    #>>>>>>普通数据包0,用来操作sync
     genPkt.clean()
     genPkt.setPktType(0)
 
+    data = bytearray(b"\0"*100)
+    data[0] = 0 #0x0300
+    data[1] = 0 #0x0301
+    data[2] = 64 #0x302 长度1
+    data[3] = 0   #0x303 长度2
+
+
+    #subPkt参数：索引、索引类型、地址、命令、长度、数据
+    genPkt.addSubPkt(0x02, 0, 0x0300, 0x1, 4, data) #sm0
+    genPkt.addSubPkt(0x01, 0, 0x0308, 0x1, 4, data) #sm2
+    genPkt.addSubPkt(0x03, 0, 0x0310, 0x1, 4, data) #sm4
+    genPkt.addSubPkt(0x04, 0, 0x0318, 0x1, 4, data) #sm6
+
+    for i in range(64):
+        data[i] = i
+    genPkt.addSubPkt(0x02, 0, 0x0800, 0x1, 64, data)
+    genPkt.addSubPkt(0x01, 0, 0x1800, 0x1, 64, data)
+    genPkt.addSubPkt(0x03, 0, 0x2800, 0x1, 64, data)
+    genPkt.addSubPkt(0x04, 0, 0x3800, 0x1, 64, data)
+
+    genPkt.gen("./generated/shin/seq_1_pkt.vh")
+
+    #-------------------------------------------------------------------------
+    #>>>>>>同步数据包
+    genPkt.clean()
+    genPkt.setPktType(0)
     #subPkt参数：索引、索引类型、地址、命令、长度、数据
     genPkt.addSubPkt(0x0, 0, random.randint(0, 65536), 0xe, 12, b'\0'*12)
-
-
     genPkt.gen("./generated/shin/sync_pkt.vh")
 
-
+    #-------------------------------------------------------------------------
+    #>>>>>>设置同步信号的数据包
     genPkt.clean()
     genPkt.setPktType(0)
 
@@ -144,6 +177,7 @@ if __name__ == '__main__':
     
     data[16] = 0x90 #地址0x130, sync同步点
     data[17] = 0x88 #地址0x131
+    #data[18] = 0x10
     
     data[24] = 0xff #地址0x138, sync周期 4B
     data[25] = 0x0f #地址0x139

From 5b3fcd2e82da6a562d6200f2fe6fa903099d6fc6 Mon Sep 17 00:00:00 2001
From: bacon <bacon@rtems.cn>
Date: Wed, 21 May 2025 13:26:20 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E7=B2=97=E7=95=A5=E6=B5=8B=E8=AF=95sync?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tb/shinTest/ShinTopSpiTb.v | 33 +++++++++++++++++++++------------
 tb/shinTest/gen_pkt.py     | 14 ++++++++------
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/tb/shinTest/ShinTopSpiTb.v b/tb/shinTest/ShinTopSpiTb.v
index 986bd41..65c82d2 100644
--- a/tb/shinTest/ShinTopSpiTb.v
+++ b/tb/shinTest/ShinTopSpiTb.v
@@ -756,15 +756,13 @@ initial begin
     spi_trans( (16'h25), (`SPI_WRITE), (2), (`IF_IDX(0)) ); //清除替换时间戳替换地址寄存器
 
 
-
-    //设置SM1在写入52 len触发enq
-    txBuf[0+3] = 8'd52;
+    txBuf[0+3] = 8'h94;
     txBuf[1+3] = 8'h00;
     spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) );
     spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) );
 
     `include "sync_sig_pkt.vh"
-    spi_trans( (16'h1000), (`SPI_WRITE), (52), (`IF_IDX(0)) ); //写入SM1
+    spi_trans( (16'h1000), (`SPI_WRITE), (8'h94), (`IF_IDX(0)) ); //写入SM1
 
     //发布请求
     txBuf[0+3] = 8'h01;
@@ -773,7 +771,21 @@ initial begin
 
     spi_trans( (16'h833), (`SPI_READ), (1), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
   end
-    #50
+    
+
+    //spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(0)) );
+    spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(1)) );
+    spi_trans( (16'h0130), (`SPI_READ), (32), (`IF_IDX(1)) );
+    spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(2)) );
+    spi_trans( (16'h0130), (`SPI_READ), (32), (`IF_IDX(2)) );
+    spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(3)) );
+    spi_trans( (16'h0130), (`SPI_READ), (32), (`IF_IDX(3)) );
+    spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(4)) );
+    spi_trans( (16'h0130), (`SPI_READ), (32), (`IF_IDX(4)) );
+
+
+
+    #10000
     //清脉冲
     txBuf[0+3] = 0;  //负载0x122 sync0脉冲宽度
     txBuf[1+3] = 0;  //负载0x123
@@ -783,13 +795,10 @@ initial begin
     txBuf[5+3] = 0;  //负载0x127 
     txBuf[6+3] = 0;  //负载0x128 sync3脉冲宽度
     txBuf[7+3] = 0;  //负载0x129
-    spi_trans( (16'h0122), (`SPI_READ), (8), (`IF_IDX(2)) ); //slv2
-
-    spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(0)) );
-    spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(1)) );
-    spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(2)) );
-    spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(3)) );
-    spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(4)) );
+    spi_trans( (16'h0122), (`SPI_WRITE), (8), (`IF_IDX(1)) ); //slv2
+    spi_trans( (16'h0122), (`SPI_WRITE), (8), (`IF_IDX(2)) ); //slv2
+    spi_trans( (16'h0122), (`SPI_WRITE), (8), (`IF_IDX(3)) ); //slv2
+    spi_trans( (16'h0122), (`SPI_WRITE), (8), (`IF_IDX(4)) ); //slv2
 end
 
 
diff --git a/tb/shinTest/gen_pkt.py b/tb/shinTest/gen_pkt.py
index b644205..7154e2a 100755
--- a/tb/shinTest/gen_pkt.py
+++ b/tb/shinTest/gen_pkt.py
@@ -175,20 +175,22 @@ if __name__ == '__main__':
     data = bytearray(b"\0" * 0x28)
     data[0] = 0xff  #地址0x120
     
-    data[16] = 0x90 #地址0x130, sync同步点
-    data[17] = 0x88 #地址0x131
+    data[16] = 0x00 #地址0x130, sync同步点
+    data[17] = 0xf0 #地址0x131
     #data[18] = 0x10
     
-    data[24] = 0xff #地址0x138, sync周期 4B
-    data[25] = 0x0f #地址0x139
+    data[24] = 0x00 #地址0x138, sync周期 4B
+    data[25] = 0x20 #地址0x139
     
     data[28] = 0x0a #sync1偏移
     data[29] = 0x0
 
-    data[36] = 0x0  #sync3偏移
-    data[37] = 0x01
+    data[36] = 0x80  #sync3偏移
+    data[37] = 0x00
     
     genPkt.addSubPkt(0x2, 0, 0x120, 0x1, 0x28, data)
+    genPkt.addSubPkt(0x1, 0, 0x120, 0x1, 0x28, data)
+    genPkt.addSubPkt(0x4, 0, 0x120, 0x1, 0x28, data)
     
 
     genPkt.gen("./generated/shin/sync_sig_pkt.vh")
\ No newline at end of file

From 2da3c461a533ee53453068992d48fbcaef521dfb Mon Sep 17 00:00:00 2001
From: bacon <bacon@rtems.cn>
Date: Wed, 21 May 2025 15:56:35 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=96=B9=E5=BC=8F,=E6=94=B9=E4=B8=BA=E5=AE=8F?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=96=B9=E5=BC=8F,=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=A1=AB=E5=8C=85=E7=9A=84=E9=95=BF=E5=BA=A6?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AD=89=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tb/shinTest/ShinTopSpiTb.v | 75 ++++++++++++++++++++++----------------
 tb/shinTest/gen_pkt.py     | 44 ++++++++++++++++++----
 2 files changed, 79 insertions(+), 40 deletions(-)

diff --git a/tb/shinTest/ShinTopSpiTb.v b/tb/shinTest/ShinTopSpiTb.v
index 65c82d2..bdcb9be 100644
--- a/tb/shinTest/ShinTopSpiTb.v
+++ b/tb/shinTest/ShinTopSpiTb.v
@@ -513,24 +513,25 @@ initial begin
     spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(4)) );
 
     $fdisplay(spidata_file, "--->>>嗅探");
+
+    `include "detect_pkt.vh"
     //设置SM1在写入0x4 len 触发enq
     //设置SM0在读出0x4 len 触发deq
-    txBuf[0+3] = 8'h04;
-    txBuf[1+3] = 8'h00;
+    `DEF_detect_pkt_sm(txBuf);
     spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) );
     spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) );
 
     //无子报文
-    `include "detect_pkt.vh"
-    spi_trans( (16'h1000), (`SPI_WRITE), (4), (`IF_IDX(0)) ); //写入SM1
+    `DEF_detect_pkt(txBuf);
+    spi_trans( (16'h1000), (`SPI_WRITE), (`DEF_detect_pkt_len), (`IF_IDX(0)) ); //写入SM1
 
     //发布请求
     txBuf[0+3] = 8'h01;
     spi_trans( (16'h20), (`SPI_WRITE), (1), (`IF_IDX(0)) );//发送SM0 接收SM0, 请求发送
     @(posedge isResp) #5 begin end
 
-    rxBuf[0+3] = 0;
-    spi_trans( (16'h803), (`SPI_READ), (1), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
+    //rxBuf[0+3] = 0;
+    //spi_trans( (16'h803), (`SPI_READ), (1), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
 
   end
 
@@ -562,7 +563,8 @@ initial begin
 
 
     $fdisplay(spidata_file, "--->>>设置顺序地址");
-    //设置SM1在写入0xe len触发enq
+
+    //长度
     txBuf[0+3] = 8'h0e;
     txBuf[1+3] = 8'h00;
     spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) );
@@ -588,7 +590,6 @@ initial begin
     txBuf[13+3] = 8'h0;   //负载
     spi_trans( (16'h1000), (`SPI_WRITE), (14), (`IF_IDX(0)) ); //写入SM1
 
-
     //发布请求
     txBuf[0+3] = 8'h01;
     spi_trans( (16'h20), (`SPI_WRITE), (1), (`IF_IDX(0)) );//发送SM0 接收SM0, 请求发送
@@ -634,14 +635,16 @@ initial begin
 
     $fdisplay(spidata_file, "--->>>嗅探");
     //设置SM1在写入0x3地址触发enq
-    txBuf[0+3] = 8'h04;
-    txBuf[1+3] = 8'h00;
+    //txBuf[0+3] = 8'h04;
+    //txBuf[1+3] = 8'h00;
+    `DEF_detect_pkt_sm(txBuf);
     spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) );
     spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) );
 
     //无子报文
-    `include "detect_pkt.vh"
-    spi_trans( (16'h1000), (`SPI_WRITE), (4), (`IF_IDX(0)) ); //写入SM1
+    //`include "detect_pkt.vh"
+    `DEF_detect_pkt(txBuf);
+    spi_trans( (16'h1000), (`SPI_WRITE), (`DEF_detect_pkt_len), (`IF_IDX(0)) ); //写入SM1
 
     //发布请求
     txBuf[0+3] = 8'h04;
@@ -679,14 +682,17 @@ initial begin
   $display("read&write @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
   begin
     $fdisplay(spidata_file, "--->>>交换数据sm0~sm7");
+    
+    `include "seq_0_pkt.vh"
     //设置SM1在写入516 len触发enq
-    txBuf[0+3] = 8'h04;
-    txBuf[1+3] = 8'h02;
+    //txBuf[0+3] = 8'h04;
+    //txBuf[1+3] = 8'h02;
+    `DEF_seq_0_pkt_sm(txBuf);
     spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) );
     spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) );
 
-    `include "seq_0_pkt.vh"
-    spi_trans( (16'h1000), (`SPI_WRITE), (516), (`IF_IDX(0)) ); //写入SM1
+    `DEF_seq_0_pkt(txBuf);
+    spi_trans( (16'h1000), (`SPI_WRITE), (`DEF_seq_0_pkt_len), (`IF_IDX(0)) ); //写入SM1
     //发布请求
     txBuf[0+3] = 8'h01;
     spi_trans( (16'h20), (`SPI_WRITE), (1), (`IF_IDX(0)) );//发送SM0 接收SM0, 请求发送
@@ -699,13 +705,16 @@ initial begin
   $display("read&write @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
   begin
     $fdisplay(spidata_file, "\n--->>>交换数据写dev2_sm0/dev1_sm2/dev3_sm4/dev4_sm6");
-    txBuf[0+3] = 8'h54;
-    txBuf[1+3] = 8'h01;
+    `include "seq_1_pkt.vh"
+
+    //txBuf[0+3] = 8'h54;
+    //txBuf[1+3] = 8'h01;
+    `DEF_seq_1_pkt_sm(txBuf);
     spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) );
     spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) );
 
-    `include "seq_1_pkt.vh"
-    spi_trans( (16'h1000), (`SPI_WRITE), (516), (`IF_IDX(0)) ); //写入SM1
+    `DEF_seq_1_pkt(txBuf);
+    spi_trans( (16'h1000), (`SPI_WRITE), (`DEF_seq_1_pkt_len), (`IF_IDX(0)) ); //写入SM1
     //发布请求
     txBuf[0+3] = 8'h01;
     spi_trans( (16'h20), (`SPI_WRITE), (1), (`IF_IDX(0)) );//发送SM0 接收SM0, 请求发送
@@ -729,13 +738,15 @@ initial begin
   $fdisplay(spidata_file, "\n\n测试用例：测试同步(sync)和同步输出(sync_out)");
   begin
     //设置SM1在写入 0x18 len触发enq
-    txBuf[0+3] = 8'h18;
-    txBuf[1+3] = 8'h00;
+    `include "sync_pkt.vh"
+    //txBuf[0+3] = 8'h18;
+    //txBuf[1+3] = 8'h00;
+    `DEF_sync_pkt_sm(txBuf);
     spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) );
     spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) );
 
-    `include "sync_pkt.vh"
-    spi_trans( (16'h1000), (`SPI_WRITE), (24), (`IF_IDX(0)) ); //写入SM1
+    `DEF_sync_pkt(txBuf);
+    spi_trans( (16'h1000), (`SPI_WRITE), (`DEF_sync_pkt_len), (`IF_IDX(0)) ); //写入SM1
 
     //写入替换时间戳替换地址
     txBuf[0+3] = 8'h0c;
@@ -749,20 +760,22 @@ initial begin
       spi_trans( (16'h817), (`SPI_READ), (1), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
     end
 
-
     //清除替换时间戳替换地址
     txBuf[0+3] = 8'h00;
     txBuf[1+3] = 8'h00;
+    
     spi_trans( (16'h25), (`SPI_WRITE), (2), (`IF_IDX(0)) ); //清除替换时间戳替换地址寄存器
 
-
-    txBuf[0+3] = 8'h94;
-    txBuf[1+3] = 8'h00;
+    `include "sync_sig_pkt.vh"
+    //txBuf[0+3] = 8'h94;
+    //txBuf[1+3] = 8'h00;
+    `DEF_sync_sig_pkt_sm(txBuf);
     spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) );
     spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) );
 
-    `include "sync_sig_pkt.vh"
-    spi_trans( (16'h1000), (`SPI_WRITE), (8'h94), (`IF_IDX(0)) ); //写入SM1
+    `DEF_sync_sig_pkt(txBuf);
+    //spi_trans( (16'h1000), (`SPI_WRITE), (8'h94), (`IF_IDX(0)) ); //写入SM1
+    spi_trans( (16'h1000), (`SPI_WRITE), (`DEF_sync_sig_pkt_len), (`IF_IDX(0)) ); //写入SM1
 
     //发布请求
     txBuf[0+3] = 8'h01;
@@ -783,8 +796,6 @@ initial begin
     spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(4)) );
     spi_trans( (16'h0130), (`SPI_READ), (32), (`IF_IDX(4)) );
 
-
-
     #10000
     //清脉冲
     txBuf[0+3] = 0;  //负载0x122 sync0脉冲宽度
diff --git a/tb/shinTest/gen_pkt.py b/tb/shinTest/gen_pkt.py
index 7154e2a..41f7a33 100755
--- a/tb/shinTest/gen_pkt.py
+++ b/tb/shinTest/gen_pkt.py
@@ -50,7 +50,7 @@ class GenPkt(object):
         
         i = 4
         if self.pkt_type == 1:
-            pkt_len = 0
+            pkt_len = 4
             self.pkt_buf[0] = 0
             self.pkt_buf[1] = (self.pkt_type & 0x3)
             self.pkt_buf[2] = 0x3f
@@ -102,8 +102,36 @@ class GenPkt(object):
                 i = i + sp[4]
 
         f = open(filename, "wt+")
-        for _k in range(i):
-            f.write("txBuf[%d]=8'h%02X;\n"%(3 + _k, self.pkt_buf[_k]))
+        if filetype == 1:
+            define_str = "`define DEF_"
+            
+            pos1 = filename.rfind("/")
+            if (pos1 < -1):
+                pos1 = 0
+            else:
+                pos1 = pos1 + 1
+
+            pos2 = filename.rfind(".")
+            if (pos1 > pos2):
+                define_str = define_str + filename[pos1:]
+            else:
+                define_str = define_str + filename[pos1:pos2]
+
+            f.write(define_str + "_len \t%d\n"%(pkt_len))
+            f.write(define_str + "_sm(array) \\\n\tarray``[%d]=8'h%02X;\\\n\tarray``[%d]=8'h%02X;\n"%(
+                    3, pkt_len & 0xff,
+                    4, pkt_len >> 8
+                    ))
+
+            f.write(define_str + "(array) \\\n")
+            for _k in range(i):
+                if _k < (i - 1):
+                    f.write("\tarray``[%d]=8'h%02X;\\\n"%(3 + _k, self.pkt_buf[_k]))
+                else:
+                    f.write("\tarray``[%d]=8'h%02X;\n"%(3 + _k, self.pkt_buf[_k]))
+        else:
+            for _k in range(i):
+                f.write("txBuf[%d]=8'h%02X;\n"%(3 + _k, self.pkt_buf[_k]))
         f.close()
 
 if __name__ == '__main__':
@@ -112,7 +140,7 @@ if __name__ == '__main__':
     #-------------------------------------------------------------------------
     #>>>>>>嗅探数据包
     genPkt.setPktType(1)
-    genPkt.gen("./generated/shin/detect_pkt.vh")
+    genPkt.gen("./generated/shin/detect_pkt.vh", 1)
 
     #-------------------------------------------------------------------------
     #>>>>>>普通数据包   
@@ -129,7 +157,7 @@ if __name__ == '__main__':
                          56, None)
     #genPkt.addSubPkt(10, 2, 0x300, 0x2, 4, None)
     #genPkt.addSubPkt(11, 1, 0x300, 0x2, 4, None)
-    genPkt.gen("./generated/shin/seq_0_pkt.vh")
+    genPkt.gen("./generated/shin/seq_0_pkt.vh", 1)
 
     #-------------------------------------------------------------------------
     #>>>>>>普通数据包0,用来操作sync
@@ -156,7 +184,7 @@ if __name__ == '__main__':
     genPkt.addSubPkt(0x03, 0, 0x2800, 0x1, 64, data)
     genPkt.addSubPkt(0x04, 0, 0x3800, 0x1, 64, data)
 
-    genPkt.gen("./generated/shin/seq_1_pkt.vh")
+    genPkt.gen("./generated/shin/seq_1_pkt.vh", 1)
 
     #-------------------------------------------------------------------------
     #>>>>>>同步数据包
@@ -164,7 +192,7 @@ if __name__ == '__main__':
     genPkt.setPktType(0)
     #subPkt参数：索引、索引类型、地址、命令、长度、数据
     genPkt.addSubPkt(0x0, 0, random.randint(0, 65536), 0xe, 12, b'\0'*12)
-    genPkt.gen("./generated/shin/sync_pkt.vh")
+    genPkt.gen("./generated/shin/sync_pkt.vh", 1)
 
     #-------------------------------------------------------------------------
     #>>>>>>设置同步信号的数据包
@@ -193,4 +221,4 @@ if __name__ == '__main__':
     genPkt.addSubPkt(0x4, 0, 0x120, 0x1, 0x28, data)
     
 
-    genPkt.gen("./generated/shin/sync_sig_pkt.vh")
\ No newline at end of file
+    genPkt.gen("./generated/shin/sync_sig_pkt.vh", 1)
\ No newline at end of file

From 296c080d5302f044cc31dd63f29c7441894eb1c0 Mon Sep 17 00:00:00 2001
From: bacon <bacon@rtems.cn>
Date: Wed, 21 May 2025 16:21:29 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E7=94=9F?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=BA=E5=BA=8F=E5=9C=B0=E5=9D=80=E7=9A=84?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tb/shinTest/ShinTopSpiTb.v | 26 ++++----------------------
 tb/shinTest/gen_pkt.py     | 19 +++++++++++++++++--
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/tb/shinTest/ShinTopSpiTb.v b/tb/shinTest/ShinTopSpiTb.v
index bdcb9be..5020b89 100644
--- a/tb/shinTest/ShinTopSpiTb.v
+++ b/tb/shinTest/ShinTopSpiTb.v
@@ -563,32 +563,15 @@ initial begin
 
 
     $fdisplay(spidata_file, "--->>>设置顺序地址");
-
+    `include "set_addr_pkt.vh"
     //长度
-    txBuf[0+3] = 8'h0e;
-    txBuf[1+3] = 8'h00;
+    `DEF_set_addr_pkt_sm(txBuf);
     spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) );
     spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) );
 
-    txBuf[0+3] = 8'h00;
-    txBuf[1+3] = 8'ha0;//heeader length 10
-    txBuf[2+3] = 8'h00;
-    txBuf[3+3] = 8'h00;
-
     //子报文
-    //设置顺序地址
-    txBuf[4+3] = 8'h0; //设备索引
-    txBuf[5+3] = 8'h0; //设备索引、类型
-    txBuf[6+3] = $random; //地址
-    txBuf[7+3] = $random; //地址
-    txBuf[8+3] = 8'hd0;   //命令d 负载长度2
-    txBuf[9+3] = 8'd02;   //负载长度2
-    txBuf[10+3] = 8'h0;   //工作计数0
-    txBuf[11+3] = 8'h0;   //工作计数0
-
-    txBuf[12+3] = 8'h0;   //负载
-    txBuf[13+3] = 8'h0;   //负载
-    spi_trans( (16'h1000), (`SPI_WRITE), (14), (`IF_IDX(0)) ); //写入SM1
+    `DEF_set_addr_pkt(txBuf);
+    spi_trans( (16'h1000), (`SPI_WRITE), (`DEF_set_addr_pkt_len), (`IF_IDX(0)) ); //写入SM1
 
     //发布请求
     txBuf[0+3] = 8'h01;
@@ -597,7 +580,6 @@ initial begin
 
     rxBuf[0+3] = 0;
     spi_trans( (16'h80D), (`SPI_READ), (1), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
-
   end
 
 
diff --git a/tb/shinTest/gen_pkt.py b/tb/shinTest/gen_pkt.py
index 41f7a33..5758c13 100755
--- a/tb/shinTest/gen_pkt.py
+++ b/tb/shinTest/gen_pkt.py
@@ -191,7 +191,7 @@ if __name__ == '__main__':
     genPkt.clean()
     genPkt.setPktType(0)
     #subPkt参数：索引、索引类型、地址、命令、长度、数据
-    genPkt.addSubPkt(0x0, 0, random.randint(0, 65536), 0xe, 12, b'\0'*12)
+    genPkt.addSubPkt(0x0, 0, random.randint(0, 65535), 0xe, 12, b'\0'*12)
     genPkt.gen("./generated/shin/sync_pkt.vh", 1)
 
     #-------------------------------------------------------------------------
@@ -221,4 +221,19 @@ if __name__ == '__main__':
     genPkt.addSubPkt(0x4, 0, 0x120, 0x1, 0x28, data)
     
 
-    genPkt.gen("./generated/shin/sync_sig_pkt.vh", 1)
\ No newline at end of file
+    genPkt.gen("./generated/shin/sync_sig_pkt.vh", 1)
+
+
+    #-------------------------------------------------------------------------
+    #>>>>>>设置顺序地址
+    genPkt.clean()
+    genPkt.setPktType(0)
+
+    data = bytearray(b"\0" * 2)
+    data[0] = 0x3f
+    data[1] = 0xff
+    #subPkt参数：索引、索引类型、地址、命令、长度、数据
+    genPkt.addSubPkt(0x0, 0, random.randint(0, 65535), 0xd, 2, data)
+
+
+    genPkt.gen("./generated/shin/set_addr_pkt.vh", 1)
\ No newline at end of file