Przeglądaj źródła

В заголовке расширил поле CtrlColdPart

Anatoliy Chigirinskiy 1 rok temu
rodzic
commit
aa73c68205

+ 3 - 3
src/src/PacketAnalyzer4Mosi/PacketAnalyzer4Mosi.v

@@ -63,8 +63,8 @@ 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'h8000;		//23'b000 0001 0000 0000 0000 0000
+localparam [22:0] DECREMENT_CTRL_COLD_PART 	= 23'h20000;	//23'b000 0010 0000 0000 0000 0000
+localparam [22:0] DECREMENT_TFE_2_BYTES 	= 23'h8000;		//23'b000 0000 1000 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
@@ -72,7 +72,7 @@ localparam [22:0] DECREMENT_TFE_6_BYTES 	= 23'h40 ;		//23'b000 0000 0000 0000 01
 //==========================================
 // Assignments
 //==========================================
-assign ctrlColdPartOr 	= 	|dataSpiReg[21:18];
+assign ctrlColdPartOr 	= 	|dataSpiReg[21:17];
 assign tfe2BytesOr 	= 	|dataSpiReg[16:15];
 assign tfe4BytesOr 	= 	|dataSpiReg[13:12];
 assign tfe7BytesOr 	= 	|dataSpiReg[10:9];

+ 9 - 9
src/src/Top/TopBochV3Tb.sv

@@ -189,7 +189,7 @@ localparam [23:0] InitLmkAHeader = {1'h0, DeviceIdLmkA, LmkAInitWordNum, 1'h1};
 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 [4:0] CtrlColdPartWordNum = 5'd7;
 localparam [1:0]     Tfe2bWordNum = 2'd1;
 localparam [1:0]      Tfe4bWordNum= 2'd2;
 localparam [1:0]      Tfe7bWordNum= 2'd3;
@@ -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, 1'h0, Tfe2bWordNum, 1'h0, Tfe4bWordNum, 1'h0, Tfe7bWordNum, 1'h0, Tfe6bWordNum, 5'h0, 1'h1};
+localparam [23:0] AllDevBochv3QSpiHeader = {1'h1, 1'h0, CtrlColdPartWordNum,Tfe2bWordNum, 1'h0, Tfe4bWordNum, 1'h0, Tfe7bWordNum, 1'h0, Tfe6bWordNum, 5'h0, 1'h1};
 //***********************************************
 //	      HEADERS FOR DEVICES - CTRL_CP2444v1
 //***********************************************
@@ -226,12 +226,12 @@ localparam [23:0] AttCtrlP3Header = {1'h0, DeviceIdAttCtrlP3, AttCtrlP3WordNum,
 localparam [23:0] AttCtrlP4Header = {1'h0, DeviceIdAttCtrlP4, AttCtrlP4WordNum, 1'h1};
 localparam [23:0] CtrlCp2444v1GpioHeader = {1'h0, DeviceIdCtrlCp2444v1Gpio, CtrlCp2444v1GpioWordNum, 1'h1};
 /* Word Numbers */
-localparam        SwCtrlP1QSpiWordNum = 1'd1;
-localparam        AttCtrlP1QSpiWordNum = 1'd1;
-localparam        AttCtrlP2QSpiWordNum = 1'd1;
-localparam        AttCtrlP3QSpiWordNum = 1'd1;
-localparam        AttCtrlP4QSpiWordNum = 1'd1;
-localparam        CtrlCp2444v1GpioQSpiWordNum = 1'd1;
+localparam  [1:0]  SwCtrlP1QSpiWordNum = 2'd1;
+localparam  [1:0]  AttCtrlP1QSpiWordNum = 2'd1;
+localparam  [1:0]  AttCtrlP2QSpiWordNum = 2'd1;
+localparam  [1:0]  AttCtrlP3QSpiWordNum = 2'd1;
+localparam  [1:0]  AttCtrlP4QSpiWordNum = 2'd1;
+localparam  [1:0]  CtrlCp2444v1GpioQSpiWordNum = 2'd1;
 /* QSpi Headers */
 localparam [23:0] CtrlCp2444v1GpioQSpiHeader = {1'h1, CtrlCp2444v1GpioQSpiWordNum, 1'h0,1'h0,1'h0,1'h0,1'h0, 15'h0, 1'h1};
 localparam [23:0] SwCtrlP1QSpiHeader = {1'h1, 1'h0, SwCtrlP1QSpiWordNum, 1'h0, 1'h0, 1'h0, 1'h0, 15'h0, 1'h1};
@@ -239,7 +239,7 @@ localparam [23:0] AttCtrlP1QSpiHeader = {1'h1, 1'h0, 1'h0, AttCtrlP1QSpiWordNum,
 localparam [23:0] AttCtrlP2QSpiHeader = {1'h1, 1'h0, 1'h0, 1'h0, AttCtrlP2QSpiWordNum, 1'h0, 1'h0, 15'h0, 1'h1};
 localparam [23:0] AttCtrlP3QSpiHeader = {1'h1, 1'h0, 1'h0, 1'h0, 1'h0, AttCtrlP3QSpiWordNum, 1'h0, 15'h0, 1'h1};
 localparam [23:0] AttCtrlP4QSpiHeader = {1'h1, 1'h0, 1'h0, 1'h0, 1'h0, 1'h0, AttCtrlP4QSpiWordNum, 15'h0, 1'h1};
-localparam [23:0] AllDevCtrlCp2444v1QSpiHeader = {1'h1,CtrlCp2444v1GpioQSpiWordNum, SwCtrlP1QSpiWordNum, AttCtrlP1QSpiWordNum, AttCtrlP2QSpiWordNum, AttCtrlP3QSpiWordNum, AttCtrlP4QSpiWordNum, 16'h0, 1'h1};
+localparam [23:0] AllDevCtrlCp2444v1QSpiHeader = {1'h1,1'h0, CtrlCp2444v1GpioQSpiWordNum, 1'h0, SwCtrlP1QSpiWordNum, 1'h0, AttCtrlP1QSpiWordNum, 1'h0, AttCtrlP2QSpiWordNum, 1'h0, AttCtrlP3QSpiWordNum, 1'h0, AttCtrlP4QSpiWordNum,4'h0, 1'h1};
 
 
 /* CtrlCp2444v1 wires from BochV3Top */