Обновил заголовок и тестбенч

src/src/PacketAnalyzer4Mosi/PacketAnalyzer4Mosi.v

@@ -64,19 +64,19 @@ wire [4:0] selector;
 // Parameters
 //==========================================
 localparam [22:0] DECREMENT_CTRL_COLD_PART 	= 23'h40000;	//23'b000 0100 0000 0000 0000 0000
-localparam [22:0] DECREMENT_TFE_2_BYTES 	= 23'h20000;	//23'b000 0010 0000 0000 0000 0000
-localparam [22:0] DECREMENT_TFE_4_BYTES 	= 23'h8000;		//23'b000 0001 0000 0000 0000 0000
-localparam [22:0] DECREMENT_TFE_7_BYTES 	= 23'h2000;		//23'b000 0000 0010 0000 0000 0000
-localparam [22:0] DECREMENT_TFE_6_BYTES 	= 23'h800 ;		//23'b000 0000 0000 1000 0000 0000
+localparam [22:0] DECREMENT_TFE_2_BYTES 	= 23'h8000;		//23'b000 0001 0000 0000 0000 0000
+localparam [22:0] DECREMENT_TFE_4_BYTES 	= 23'h1000;		//23'b000 0000 0001 0000 0000 0000
+localparam [22:0] DECREMENT_TFE_7_BYTES 	= 23'h200;		//23'b000 0000 0000 0010 0000 0000
+localparam [22:0] DECREMENT_TFE_6_BYTES 	= 23'h40 ;		//23'b000 0000 0000 0000 0100 0000
 
 //==========================================
 // Assignments
 //==========================================
 assign ctrlColdPartOr 	= 	|dataSpiReg[21:18];
-assign tfe2BytesOr 	= 	|dataSpiReg[17];
-assign tfe4BytesOr 	= 	|dataSpiReg[16:15];
-assign tfe7BytesOr 	= 	|dataSpiReg[14:13];
-assign tfe6BytesOr 	= 	|dataSpiReg[12:11];
+assign tfe2BytesOr 	= 	|dataSpiReg[16:15];
+assign tfe4BytesOr 	= 	|dataSpiReg[13:12];
+assign tfe7BytesOr 	= 	|dataSpiReg[10:9];
+assign tfe6BytesOr 	= 	|dataSpiReg[7:6];
 
 assign selector = {ctrlColdPartOr, tfe2BytesOr, tfe4BytesOr, tfe7BytesOr, tfe6BytesOr};
 

src/src/Top/TopBochV3.v

@@ -106,6 +106,7 @@ wire busyForTfe7Bytes;
 
 /* Tfe6BytesFifoEmpty */
 wire tfe6BytesFifoEmpty;
+wire tfe4BytesFifoEmpty;
 /* PulseFilter */
 wire rstFiltered;
 
@@ -119,8 +120,8 @@ assign CtrlCp2444v1Rst_o = Rst_i;
 
 assign busyForTfe2Bytes = tfe4BytesSpiBusy | tfe6BytesSpiBusy | tfe7BytesSpiBusy;
 assign busyForTfe4Bytes = tfe2BytesSpiBusy | tfe6BytesSpiBusy | tfe7BytesSpiBusy;
-assign busyForTfe6Bytes = tfe2BytesSpiBusy | tfe4BytesSpiBusy | tfe7BytesSpiBusy ;
-assign busyForTfe7Bytes = tfe2BytesSpiBusy | tfe4BytesSpiBusy | tfe6BytesSpiBusy | (!tfe6BytesFifoEmpty);
+assign busyForTfe6Bytes = tfe2BytesSpiBusy | tfe4BytesSpiBusy | tfe7BytesSpiBusy; 
+assign busyForTfe7Bytes = tfe2BytesSpiBusy | tfe4BytesSpiBusy | tfe6BytesSpiBusy | (!tfe6BytesFifoEmpty) | (!tfe4BytesFifoEmpty);
 assign Led_o = ledReg;
 
 //***********************************************
@@ -336,6 +337,7 @@ Tfe4BytesWrapper #(
     .Val_i                          (valTfe4BytesDataToFifo),
     .SpiBusy_i                      (busyForTfe4Bytes),
     .Tfe4BytesSpiBusy_o             (tfe4BytesSpiBusy),
+    .Tfe4BytesFifoEmpty_o           (tfe4BytesFifoEmpty),
     .Ss_o                           (tfe4BytesCs),
     .Sck_o                          (tfe4BytesSck),
     .Mosi_o                         (tfe4BytesMosi)

src/src/Top/TopBochV3Tb.sv

@@ -190,7 +190,7 @@ localparam [23:0] InitLmkBHeader = {1'h0, DeviceIdLmkB, LmkBInitWordNum, 1'h1};
 localparam [23:0] InitFlashHeader = {1'h0, DeviceIdFlash, FlashInitWordNum, 1'h1};
 /* Word Numbers 4-MOSI */
 localparam [3:0] CtrlColdPartWordNum = 4'd7;
-localparam [0:0]     Tfe2bWordNum = 1'd1;
+localparam [1:0]     Tfe2bWordNum = 2'd1;
 localparam [1:0]      Tfe4bWordNum= 2'd2;
 localparam [1:0]      Tfe7bWordNum= 2'd3;
 localparam [1:0]      Tfe6bWordNum= 2'd2;
@@ -201,7 +201,7 @@ localparam [23:0] Tfe4bHeader = {1'h1, 1'h0, 4'h0, 1'h0, Tfe4bWordNum, 2'h0, 2'h
 localparam [23:0] Tfe7bHeader = {1'h1, 1'h0, 4'h0, 1'h0, 1'h0, Tfe7bWordNum, 2'h0, 10'h0, 1'h1};
 localparam [23:0] Tfe6bHeader = {1'h1, 1'h0, 4'h0, 1'h0, 1'h0, 1'h0, Tfe6bWordNum, 10'h0, 1'h1};
 /* All Devices Header */
-localparam [23:0] AllDevBochv3QSpiHeader = {1'h1, 1'h0, CtrlColdPartWordNum, Tfe2bWordNum, Tfe4bWordNum, Tfe7bWordNum, Tfe6bWordNum, 10'h0, 1'h1};
+localparam [23:0] AllDevBochv3QSpiHeader = {1'h1, 1'h0, CtrlColdPartWordNum, 1'h0, Tfe2bWordNum, 1'h0, Tfe4bWordNum, 1'h0, Tfe7bWordNum, 1'h0, Tfe6bWordNum, 5'h0, 1'h1};
 //***********************************************
 //	      HEADERS FOR DEVICES - CTRL_CP2444v1
 //***********************************************

src/src/WrapFifoChain/Tfe4BytesWrapper.v

@@ -12,6 +12,7 @@ module Tfe4BytesWrapper #(
 
 	input 	SpiBusy_i,
 	output 	Tfe4BytesSpiBusy_o,
+	output	Tfe4BytesFifoEmpty_o,
 
     output Ss_o,
     output Sck_o,
@@ -32,6 +33,7 @@ wire fifoEmpty;
 //									ASSIGNMENTS								//
 //==========================================================================//
 assign Tfe4BytesSpiBusy_o = busySpiM;
+assign Tfe4BytesFifoEmpty_o = fifoEmpty;
 //==========================================================================//
 //									CODING									//
 //==========================================================================//