整理测试代码

tb/shinTest/ShinTopSpiTb.v

@@ -3,13 +3,13 @@
 `define ENABLE_REG_RW_TEST
 `define ENABLE_DET_TEST
 `define ENABLE_SET_ADDR_TEST
-//`define ENABLE_SM1_SEND_TEST
+`define ENABLE_SM1_SEND_TEST
-//`define ENABLE_SMx_SEND_TEST
+`define ENABLE_SMx_SEND_TEST
 `define ENABLE_EXCHG_DATA_SEQ_TEST
-  //`define ENABLE_EXCHG_DATA_SEQ0_TEST
+  `define ENABLE_EXCHG_DATA_SEQ0_TEST
-  //`define ENABLE_EXCHG_DATA_SEQ1_TEST
+  `define ENABLE_EXCHG_DATA_SEQ1_TEST
-  //`define ENABLE_EXCHG_DATA_SEQ2_TEST
+  `define ENABLE_EXCHG_DATA_SEQ2_TEST
-//`define ENABLE_EXCHG_DATA_BC_TEST
+  `define ENABLE_EXCHG_DATA_BC_TEST
 `define ENABLE_SYNC_TEST
 
 module ShinTopSpiTb(
@@ -578,6 +578,7 @@ initial begin
 测试用例
 1. 从IP中读取寄存器，上电后的寄存器期望值为0
 ---------------------------------------------------------------------------------------------------------*/
+  begin:READ_REG_TESTCASE
     _t_start = $time;
     $fdisplay(spidata_file, "测试用例：从IP中读取寄存器，上电后的寄存器期望值为0");
     spi_trans( (16'h00), (`SPI_READ), (64), (`IF_IQSPI(0)) );
@@ -587,9 +588,10 @@ initial begin
     spi_trans( (16'h00), (`SPI_READ), (64), (`IF_IQSPI(4)) );
     _t_end = $time;
     $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+  end
 `endif
 
-
+  begin:SETTING_INTERFACE
     if ((`INTERFACE_IDX) == 5) begin
       $fdisplay(spidata_file, "\n\n从内部QSPI配置使用外部的SPI接口访问EasyBus");
       txBuf[0+3] = 8'h01;
@@ -609,12 +611,14 @@ initial begin
     end else begin
       $fdisplay(spidata_file, "\n\n从内部QSPI接口访问EasyBus");
     end
+  end
 
 
 /*---------------------------------------------------------------------------------------------------------
 测试用例
 1. 设置IP为主站或从站，并读取设置结果，期望：0主，1~4从
 ---------------------------------------------------------------------------------------------------------*/
+  begin:SETTING_DEV_ROLE
     //设置主站从站
     $fdisplay(spidata_file, "\n\n测试用例：设置IP为主站或从站，并读取设置结果，期望：0主，1~4从");
     txBuf[0+3] = 8'h01;
@@ -639,16 +643,18 @@ initial begin
     spi_trans( (16'h00), (`SPI_READ), (1), (`IF_IDX(2)) );
     spi_trans( (16'h00), (`SPI_READ), (1), (`IF_IDX(3)) );
     spi_trans( (16'h00), (`SPI_READ), (1), (`IF_IDX(4)) );
+  end
 
 `ifdef ENABLE_DET_TEST
 /*---------------------------------------------------------------------------------------------------------
 测试用例3
 ---------------------------------------------------------------------------------------------------------*/
   //嗅探
+  begin:DETECT_DEV_TESTCASE
     _t_start = $time;
     #1000
     $fdisplay(spidata_file, "\n\n测试用例：发送嗅探包，需要在波形文件里检查");
-  begin
+  
     $fdisplay(spidata_file, "--->>>嗅探前，检查链路状态寄存器");
     //spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(0)) );
     spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(1)) );
@@ -678,8 +684,6 @@ initial begin
     $fdisplay(spidata_file, ">>回包：");
     spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_detect_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
 
-  end
-
     // 顺序索引
     //#50000
     #1000
@@ -691,17 +695,18 @@ initial begin
     spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(4)) );
     _t_end = $time;
     $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+  end
 `endif
 
 `ifdef ENABLE_SET_ADDR_TEST
 /*---------------------------------------------------------------------------------------------------------
 测试用例
 ---------------------------------------------------------------------------------------------------------*/
+  begin:SET_ADDR_TESTCASE
     _t_start = $time;
     $fdisplay(spidata_file, "\n\n测试用例：设置顺序索引");
     $display("index @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
 
-  begin
     $fdisplay(spidata_file, "--->>>设置顺序地址前，检查顺序地址");
     //spi_trans( (16'h0010), (`SPI_READ), (5), (`IF_IDX(0)) );
     spi_trans( (16'h0000), (`SPI_READ), (16), (`IF_IDX(1)) );
@@ -709,7 +714,6 @@ initial begin
     spi_trans( (16'h0000), (`SPI_READ), (16), (`IF_IDX(3)) );
     spi_trans( (16'h0000), (`SPI_READ), (16), (`IF_IDX(4)) );
 
-
     $fdisplay(spidata_file, "--->>>设置顺序地址");
     `include "set_addr_pkt.vh"
     //长度
@@ -728,8 +732,6 @@ initial begin
     @(posedge isResp) #5 begin end
     $fdisplay(spidata_file, ">>回包：");
     spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_set_addr_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
-  end
-
     
     //测试
     spi_trans( (16'hc0), (`SPI_READ), (6), (`IF_IDX(3)) );
@@ -738,7 +740,6 @@ initial begin
     spi_trans( (16'h0a), (`SPI_READ), (2), (`IF_IDX(3)) );
     spi_trans( (16'h0a), (`SPI_READ), (2), (`IF_IDX(4)) );
 
-
     //读写
     #1000
     $fdisplay(spidata_file, "--->>>设置顺序地址后，检查顺序地址");
@@ -750,17 +751,19 @@ initial begin
 
     _t_end = $time;
     $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+  end
 `endif
 
 `ifdef ENABLE_DET_TEST
 /*---------------------------------------------------------------------------------------------------------
 测试用例
 ---------------------------------------------------------------------------------------------------------*/
+  begin:DETECT_DEV_TESTCASE_2
     //嗅探
     _t_start = $time;
     #1000
     $fdisplay(spidata_file, "\n\n测试用例：发送嗅探包，需要在波形文件里检查");
-  begin
+
     $fdisplay(spidata_file, "嗅探：使用SM0");
     $fdisplay(spidata_file, "--->>>嗅探前，检查链路状态寄存器");
     //spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(0)) );
@@ -788,8 +791,6 @@ initial begin
     @(posedge isResp) #5 begin end
     $fdisplay(spidata_file, ">>回包：");
     spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_detect_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
-  end
-
 
     $fdisplay(spidata_file, "--->>>嗅探后，检查链路状态寄存器");
     //spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(0)) );
@@ -799,12 +800,13 @@ initial begin
     spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(4)) );
     _t_end = $time;
     $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+  end
 `endif
 
 
 `ifdef ENABLE_SM1_SEND_TEST
+  begin:SM1_SEND_TESTCASE
     _t_start = $time;
-  begin
     $fdisplay(spidata_file, "\n单读：使用SM1");
     $fdisplay(spidata_file, "--->>>SM1：数据包");
 
@@ -830,16 +832,21 @@ initial begin
 
     $fdisplay(spidata_file, ">>回包：");
     spi_trans( (`MST_RX1_ADDR), (`SPI_READ), (`DEF_sm1_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
-  end
+
     _t_end = $time;
     $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+  end
+  
 `endif
 
 `ifdef ENABLE_SMx_SEND_TEST
+  
+  begin:SM2_SEND_TESTCASE
+
     _t_start = $time;
     #1000
     $display("read&write @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
-  begin
+
     $fdisplay(spidata_file, "\n广播读：使用SM2");
     $fdisplay(spidata_file, "--->>>广播读");
 
@@ -853,17 +860,21 @@ initial begin
     `DEF_sm2_pkt(txBuf);
     spi_trans( (`MST_TX2_ADDR), (`SPI_WRITE), (`DEF_sm2_pkt_len), (`IF_IDX(0)) ); //写入SM1
     //发布请求 
-    txBuf[0+3] = 8'b10101;//`MST_TX_TRIGGER(3);//`MST_TX_TRG;//`MST_TX_TRIGGER(1);
+    txBuf[0+3] = `MST_TX_TRIGGER(2);//`MST_TX_TRG;//`MST_TX_TRIGGER(1);
     spi_trans( (16'h20), (`SPI_WRITE), (1), (`IF_IDX(0)) );//发送SM0 接收SM0, 请求发送
     @(posedge isResp) #5 begin end
 
     $fdisplay(spidata_file, ">>回包：");
     spi_trans( (`MST_RX2_ADDR), (`SPI_READ), (`DEF_sm2_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
+    _t_end = $time;
+    $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
   end
 
+  
+  begin:SM3_SEND_TESTCASE
+    _t_start = $time;
     #1000
     $display("read&write @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
-  begin
     $fdisplay(spidata_file, "\n广播写：使用SM3");
     $fdisplay(spidata_file, "--->>>SM3广播写");
 
@@ -877,21 +888,22 @@ initial begin
     `DEF_sm3_pkt(txBuf);
     spi_trans( (`MST_TX3_ADDR), (`SPI_WRITE), (`DEF_sm3_pkt_len), (`IF_IDX(0)) ); //写入SM1
     //发布请求 
-    txBuf[0+3] = 8'b11111;//`MST_TX_TRIGGER(3);//`MST_TX_TRG;//`MST_TX_TRIGGER(1);
+    txBuf[0+3] = `MST_TX_TRIGGER(3);//`MST_TX_TRG;//`MST_TX_TRIGGER(1);
     spi_trans( (16'h20), (`SPI_WRITE), (1), (`IF_IDX(0)) );//发送SM0 接收SM0, 请求发送
     @(posedge isResp) #5 begin end
 
     $fdisplay(spidata_file, ">>回包：");
     spi_trans( (`MST_RX3_ADDR), (`SPI_READ), (`DEF_sm3_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
-  end
+
     spi_trans( (16'h0800), (`SPI_READ), (16), (`IF_IDX(1)) );
     spi_trans( (16'h0800), (`SPI_READ), (16), (`IF_IDX(2)) );
     spi_trans( (16'h0800), (`SPI_READ), (16), (`IF_IDX(3)) );
     spi_trans( (16'h0800), (`SPI_READ), (16), (`IF_IDX(4)) );
 
-
     _t_end = $time;
     $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+  end
+  
 `endif
 
 `ifdef ENABLE_EXCHG_DATA_SEQ_TEST
@@ -904,13 +916,13 @@ initial begin
 4. 寄存器单读/写/读写，寄存器广播读/写/读写
 5. 以上交换数据的错误形式
 ---------------------------------------------------------------------------------------------------------*/  
-  $fdisplay(spidata_file, "\n\n测试用例：交换数据");
   `ifdef ENABLE_EXCHG_DATA_SEQ0_TEST
+  begin:EXCHG_DATA_SEQ0_TESTCASE
     _t_start = $time;
     #1000
+    $fdisplay(spidata_file, "\n\n测试用例：交换数据");
     $display("read&write @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
 
-  begin
     $fdisplay(spidata_file, "--->>>交换数据sm0~sm7");
     
     `include "seq_0_pkt.vh"
@@ -928,16 +940,17 @@ initial begin
     @(posedge isResp) #5 begin end
     $fdisplay(spidata_file, ">>回包：");
     spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_seq_0_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
-  end
+    
     _t_end = $time;
     $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+  end
   `endif
 
   `ifdef ENABLE_EXCHG_DATA_SEQ1_TEST
+  begin:EXCHG_DATA_SEQ1_TESTCASE
     _t_start = $time;
     #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");
     `include "seq_1_pkt.vh"
 
@@ -955,7 +968,6 @@ initial begin
 
     $fdisplay(spidata_file, ">>回包：");
     spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_seq_1_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
-  end
 
     spi_trans( (16'h1800), (`SPI_READ), (64), (`IF_IDX(1)) );
     spi_trans( (16'h0800), (`SPI_READ), (64), (`IF_IDX(2)) );
@@ -964,13 +976,14 @@ initial begin
     
     _t_end = $time;
     $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+  end
   `endif
 
   `ifdef ENABLE_EXCHG_DATA_SEQ2_TEST
+  begin:EXCHG_DATA_SEQ2_TESTCASE
     _t_start = $time;
     #1000
     $display("read&write @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
-  begin
     $fdisplay(spidata_file, "\n--->>>交换数据读dev1_sm1/dev2_sm3/dev3_sm5/dev4_sm7");
 
     txBuf[3] = 8'h80;
@@ -1026,27 +1039,27 @@ initial begin
 
     $fdisplay(spidata_file, ">>回包：");
     spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_seq_2_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
-  end
+
     _t_end = $time;
     $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+  end
   `endif
-
 `endif
 
 `ifdef ENABLE_EXCHG_DATA_BC_TEST
+  
+  begin:EXCHG_DATA_BC_R_TESTCASE
     _t_start = $time;
     #1000
     $fdisplay(spidata_file, "\n\n测试用例：广播交换数据");
     $display("read&write @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
-  begin
     $fdisplay(spidata_file, "\n--->>>广播读");
     `include "bc_r_pkt.vh"
 
     `DEF_bc_r_pkt_sm(txBuf);
     spi_trans( (`MST_TX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) );
     spi_trans( (`MST_RX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) );
-`ifdef ENABLE_EXCHG_DATA_BC_TEST
+
-`endif
     $fdisplay(spidata_file, "<<发包：");
     `DEF_bc_r_pkt(txBuf);
     spi_trans( (`MST_TX_ADDR), (`SPI_WRITE), (`DEF_bc_r_pkt_len), (`IF_IDX(0)) ); //写入SM1
@@ -1057,12 +1070,18 @@ initial begin
 
     $fdisplay(spidata_file, ">>回包：");
     spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_bc_r_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
+
+    _t_end = $time;
+    $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
   end
 
 
+  
+  begin:EXCHG_DATA_BC_W_TESTCASE
+    _t_start = $time;
     #1000
     $display("read&write @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
-  begin
+
     $fdisplay(spidata_file, "\n--->>>广播写");
     `include "bc_w_pkt.vh"
 
@@ -1080,7 +1099,7 @@ initial begin
 
     $fdisplay(spidata_file, ">>回包：");
     spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_bc_w_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
-  end
+    
     spi_trans( (16'h0800), (`SPI_READ), (32), (`IF_IDX(1)) );
     spi_trans( (16'h0800), (`SPI_READ), (32), (`IF_IDX(2)) );
     spi_trans( (16'h0800), (`SPI_READ), (32), (`IF_IDX(3)) );
@@ -1088,6 +1107,7 @@ initial begin
     
     _t_end = $time;
     $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+  end
 `endif
 
 
@@ -1102,7 +1122,7 @@ initial begin
 
   $display("sync @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
   $fdisplay(spidata_file, "\n\n测试用例：测试同步(sync)和同步输出(sync_out)");
-  begin
+  begin:SYNC_TESTCASE
     //设置SM1在写入 0x18 len触发enq
     `include "sync_pkt.vh"
     `DEF_sync_pkt_sm(txBuf);
@@ -1132,9 +1152,6 @@ initial begin
     
     spi_trans( (16'h25), (`SPI_WRITE), (2), (`IF_IDX(0)) ); //清除替换时间戳替换地址寄存器
 
-
-
-
     `include "sync_sig_pkt.vh"
     `DEF_sync_sig_pkt_sm(txBuf);
     spi_trans( (`MST_TX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) );
@@ -1154,8 +1171,6 @@ initial begin
       ((_temp_time >> 16) & 8'hff));
     */
 
-    
-
     $fdisplay(spidata_file, "<<发包：");
     `DEF_sync_sig_pkt(txBuf);
     
@@ -1171,7 +1186,6 @@ initial begin
     @(posedge isResp) #5 begin end
     $fdisplay(spidata_file, ">>回包：");
     spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_sync_sig_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
-  end
 
     //spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(0)) );
     spi_trans( (16'h0100), (`SPI_READ), (16'h48), (`IF_IDX(1)) );
@@ -1179,7 +1193,6 @@ initial begin
     spi_trans( (16'h0100), (`SPI_READ), (16'h48), (`IF_IDX(3)) );
     spi_trans( (16'h0100), (`SPI_READ), (16'h48), (`IF_IDX(4)) );
 
-
     /*
     #10000
     //清脉冲
@@ -1196,6 +1209,13 @@ initial begin
     spi_trans( (16'h0122), (`SPI_WRITE), (8), (`IF_IDX(3)) ); //slv2
     spi_trans( (16'h0122), (`SPI_WRITE), (8), (`IF_IDX(4)) ); //slv2
     */
+    _t_end = $time;
+    $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+  end
+`endif
+  
+
+
 
   /*
   #50000
@@ -1205,9 +1225,8 @@ initial begin
   spi_trans( (16'h40), (`SPI_WRITE), (1), (`IF_IDX(1)) );//复位从站2
   */
 
-  _t_end = $time;
+  
-  $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+
-`endif
 
 end
 

tb/shinTest/gen_pkt.py

@@ -6,13 +6,13 @@ class GenPkt(object):
     def __init__(self):
         super(GenPkt, self).__init__()
         
-        self.pkt_buf = bytearray(b'\0' * 2048)
+        self.pkt_buf = list() #bytearray(b'\0' * 2048)
         self.pkt_type = 0
         self.pkt_sub_pkt = 0
         self.sub_pkt = list()
 
     def clean(self):
-        self.pkt_buf = bytearray(b'\0' * 2048)
+        self.pkt_buf = list() #bytearray(b'\0' * 2048)
         self.pkt_type = 0
         self.pkt_sub_pkt = 0
         self.sub_pkt = list()
@@ -23,6 +23,9 @@ class GenPkt(object):
         else:
             self.pkt_type = type
 
+    def addSentence(self, str):
+        self.sub_pkt.append([1, str])
+    
     def addSubPkt(self, dev_idx, ptype, addr, cmd, len, data):
         if (len > 2032):
             print('Error, bad subpkt len:%d', len)
@@ -35,12 +38,15 @@ class GenPkt(object):
             return 
         
         self.pkt_sub_pkt = self.pkt_sub_pkt + 1
-        self.sub_pkt.append([dev_idx, ptype, addr, cmd, len, data])
+        self.sub_pkt.append([0, dev_idx, ptype, addr, cmd, len, data])
 
     def gen(self, filename="pkt_verilog_test.v", filetype=0):
         pkt_len = 4
         for sp in self.sub_pkt:
-            pkt_len = pkt_len + sp[4] + 8
+            if sp[0] != 0:
+                pass
+            else:
+                pkt_len = pkt_len + sp[5] + 8
 
         if pkt_len > 2048:
             print('Error, bad pkt_len:', pkt_len)
@@ -51,58 +57,87 @@ class GenPkt(object):
         i = 4
         if self.pkt_type == 1:
             pkt_len = 4
+            '''
             self.pkt_buf[0] = 0
             self.pkt_buf[1] = (self.pkt_type & 0x3)
             self.pkt_buf[2] = 0x3f
             self.pkt_buf[3] = 0xff
+            '''
+            self.pkt_buf.append(0)
+            self.pkt_buf.append(self.pkt_type & 0x3)
+            self.pkt_buf.append(0x3f)
+            self.pkt_buf.append(0xff)
         else:
             #for i in range(pkt_len):
+            '''
             self.pkt_buf[0] = ((pkt_len - 4) >> 4) & 0xff
             self.pkt_buf[1] = (((pkt_len - 4) << 4) & 0xf0) | (self.pkt_type & 0x3)
             self.pkt_buf[2] = 0
             self.pkt_buf[3] = 0
+            '''
+            self.pkt_buf.append(((pkt_len - 4) >> 4) & 0xff)
+            self.pkt_buf.append((((pkt_len - 4) << 4) & 0xf0) | (self.pkt_type & 0x3))
+            self.pkt_buf.append(0)
+            self.pkt_buf.append(0)
             
             for sp in self.sub_pkt:
+                if sp[0] != 0:
+                    pass
+                #elif sp[0] == 0:
+                else:
                     #设备索引(14bit)+类型(2bit)
-                temp = ((sp[0] & 0x3fff) << 2) | (sp[1] & 0x3)
+                    temp = ((sp[1] & 0x3fff) << 2) | (sp[2] & 0x3)
                     
-                self.pkt_buf[i] = (temp >> 8) & 0xff
+                    #self.pkt_buf[i] = (temp >> 8) & 0xff
+                    self.pkt_buf.append((temp >> 8) & 0xff)
                     i = i + 1
-                self.pkt_buf[i] = temp & 0xff
+                    #self.pkt_buf[i] = temp & 0xff
+                    self.pkt_buf.append(temp & 0xff)
                     i = i + 1
                     
                     #地址
-                self.pkt_buf[i] = (sp[2] >> 8) & 0xff
+                    #self.pkt_buf[i] = (sp[3] >> 8) & 0xff
+                    self.pkt_buf.append((sp[3] >> 8) & 0xff)
                     i = i + 1
-                self.pkt_buf[i] = sp[2] & 0xff
+                    #self.pkt_buf[i] = sp[3] & 0xff
+                    self.pkt_buf.append(sp[3] & 0xff)
                     i = i + 1
 
                     #命令类型(4bit)+长度(12bit)
-                temp = (sp[3] << 12) | (sp[4] & 0xfff)
+                    temp = (sp[4] << 12) | (sp[5] & 0xfff)
                     
-                self.pkt_buf[i] = (temp >> 8) & 0xff
+                    #self.pkt_buf[i] = (temp >> 8) & 0xff
+                    self.pkt_buf.append((temp >> 8) & 0xff)
                     i = i + 1
-                self.pkt_buf[i] = temp & 0xff
+                    #self.pkt_buf[i] = temp & 0xff
+                    self.pkt_buf.append(temp & 0xff)
                     i = i + 1
 
                     #工作计数
-                self.pkt_buf[i] = 0
+                    #self.pkt_buf[i] = 0
+                    self.pkt_buf.append(0)
                     i = i + 1
-                self.pkt_buf[i] = 0
+                    #self.pkt_buf[i] = 0
+                    self.pkt_buf.append(0)
                     i = i + 1
 
                     #数据
-                if sp[5] == None:
+                    if sp[6] == None:
-                    for _k in range(sp[4]):
+                        for _k in range(sp[5]):
-                        self.pkt_buf[_k + i] = random.randint(0, 255)
+                            #self.pkt_buf[_k + i] = random.randint(0, 255)
+                            self.pkt_buf.append(random.randint(0, 255))
                     else:
-                    for _k in range(sp[4]):
+                        for _k in range(sp[5]):
-                        self.pkt_buf[_k + i] = sp[5][_k]
+                            #self.pkt_buf[_k + i] = sp[6][_k]
+                            self.pkt_buf.append(sp[6][_k])
 
-                i = i + sp[4]
+                    i = i + sp[5]
 
         f = open(filename, "wt+")
         if filetype == 1:
+            for md in self.sub_pkt:
+                if md[0] == 1:
+                    f.write("%s\n"%(md[1],))
             define_str = "`define DEF_"
             
             pos1 = filename.rfind("/")
@@ -131,7 +166,10 @@ class GenPkt(object):
                     f.write("\tarray``[%d]=8'h%02X;\n"%(3 + _k, self.pkt_buf[_k]))
         else:
             for _k in range(i):
+                if type(self.pkt_buf[_k]) == int:
                     f.write("txBuf[%d]=8'h%02X;\n"%(3 + _k, self.pkt_buf[_k]))
+                else:
+                    f.write("txBuf[%d]=`%s;\n"%(3 + _k, self.pkt_buf[_k]))
         f.close()
 
 if __name__ == '__main__':
@@ -297,7 +335,7 @@ if __name__ == '__main__':
 
     #subPkt参数：索引、索引类型、地址、命令、长度、数据
     data = bytearray(b"\0" * 100)
-    data[0] = 0x0f  #地址0x120
+    data[0] = 0xff  #地址0x120
     data[2] = 0xa
     data[4] = 0xa
     data[6] = 0xa
@@ -322,6 +360,41 @@ if __name__ == '__main__':
     genPkt.gen("./generated/shin/sync_sig_pkt.vh", 1)
     
     
+    #-------------------------------------------------------------------------
+    #>>>>>>设置同步信号的数据包2
+    genPkt.clean()
+    genPkt.setPktType(0)
+    
+    genPkt.addSentence('''    ''')
+
+    #subPkt参数：索引、索引类型、地址、命令、长度、数据
+    data = [0,] * 100 #bytearray(b"\0" * 100)
+    data[0] = 0x0f  #地址0x120
+    data[2] = 0xa
+    data[4] = 0xa
+    data[6] = 0xa
+    data[8] = 0xa
+    
+    data[16] = 0x00 #地址0x130, sync同步点
+    data[17] = 0x00 #地址0x131
+    #data[18] = 0x10
+    
+    data[24] = 0x80 #地址0x138, sync周期 4B
+    data[25] = 0x00 #地址0x139
+    
+    data[28] = 0x81 #sync1偏移
+    data[29] = 0x0
+
+    data[36] = 0x20#sync3偏移
+    data[37] = 0x00
+    
+    genPkt.addSubPkt(0, 0, 0x120, 0xe, 0x28, data)
+    genPkt.addSubPkt(3, 0, 0x120, 0x1, 0x28, data)
+    
+    genPkt.gen("./generated/shin/sync_sig2_pkt.vh", 1)
+    
+
+
     #-------------------------------------------------------------------------
     #>>>>>>设置顺序地址
     genPkt.clean()