Ver código fonte

Обновлён тестбенч - длительность Ss_i в неактивном состоянии выбрана равной 3.

Anatoliy Chigirinskiy 1 ano atrás
pai
commit
7da5ad52ac

+ 9 - 9
src/src/InterfaceArbiter/InterfaceArbiter.v

@@ -94,7 +94,7 @@ module InterfaceArbiter
 	assign ssPos = ssRegR & !ssRegRR;
 
 	
-	assign DataVal_o = plsToggleSyncSignal;
+	assign DataVal_o = plsToggleSyncSignalR;
 	assign Data_o = (spiMode)? dataRegQSpi:dataRegSSpi;
 
 	assign plsToggleSyncSignal = plsToggleSyncB^plsToggleSyncA;
@@ -220,18 +220,18 @@ module InterfaceArbiter
 		end
 		else begin
 			if (currState == IDLE) begin 
-			if (ssCnt == 1) begin 
-				if (captRegSspi[0]) begin 
-					spiMode <= 1'b1; 
-				end 
-				else begin 
-					spiMode <= 1'b0; 
+				if (ssCnt == 1) begin 
+					if (captRegSspi[0]) begin 
+						spiMode <= 1'b1; 
+					end 
+					else begin 
+						spiMode <= 1'b0; 
+					end
 				end
 			end
-			end
 		end
 	end
-
+	
 	always @(posedge Clk_i) begin
 		if (!Rst_i) begin
 			if (currState == IDLE) begin

+ 9 - 4
src/src/Top/TopSbTmsgTb.sv

@@ -185,6 +185,11 @@ initial begin
       #(700000-60) rstForFPGA = 1;
       #(CLK_PERIOD*74) rstForFPGA = 0;
       #(165000) Start_i = 1; // Start SPI transaction
+       wait (trCnt == 45) begin 
+            Start_i = 0;
+        end
+        #(CLK_PERIOD*100) 
+        Start_i = 1; // Start SPI transaction
       wait (trCnt == 70) begin 
             Start_i = 0;
         end
@@ -193,7 +198,7 @@ initial begin
   end
 //***********************************************
 
-always_ff @(posedge Clk50) begin
+always_ff @(posedge Clk100) begin
     if (Rst_i) begin 
         trCnt <= 0;
     end
@@ -258,7 +263,7 @@ always_comb begin
     end
 end
 
-always_ff @(posedge Clk50) begin 
+always_ff @(posedge Clk100) begin 
     if (Rst_i) begin 
         randData<=0;
         randData32 <= 0;
@@ -336,7 +341,7 @@ always_comb begin
     GSR GSR(.GSRI(1'b1));
 
    ExtSpiMEmul ExtSpiMEmul_inst (
-        .Clk_i(Clk50), 
+        .Clk_i(Clk100), 
         .Rst_i(Rst_i || modeSel), 
         .Start_i(Start_i), 
         .ClockPhase_i(CPHA_i),
@@ -356,7 +361,7 @@ always_comb begin
     );
 
     ExtQspiMEmul ExtQspiMEmul_inst (
-        .Clk_i(Clk50),
+        .Clk_i(Clk100),
         .Rst_i(Rst_i || !modeSel),
         .Start_i(Start_i),
         .ClockPhase_i(CPHA_i),