Удаление скобок.

src/src/Sim/tb_RF_FPGA.v

@@ -67,7 +67,7 @@ module tb_SPIm;
     assign Mosi1_io = (modeSel) ? Mosi1_o:1'bz;
 
 
-    assign emptyFlagTx = (!locked || trCnt > 4 ) ? 1'b1 : 1'b0;
+    assign emptyFlagTx = (!locked || trCnt > 5 ) ? 1'b1 : 1'b0;
 
     // always @(posedge Clk100) begin 
     //     if (Rst_i) begin 
@@ -248,7 +248,7 @@ end
             //     SPIdata = {1'h1, 5'h6, 17'h4, 1'h0};
             // end
             0: begin 
-                SPIdata = {1'h1,11'h0, 3'h4, 9'h1};
+                SPIdata = {1'h1,4'h0, 2'h3,1'h1,1'h1,1'h0,2'h0,3'h0,2'h0, 7'h1};
             end
             1 : begin 
                 SPIdata = 24'h04000;
@@ -262,6 +262,9 @@ end
             4 : begin 
                 SPIdata = 24'h1800d;
             end
+            5 : begin
+                SPIdata = 24'hc63f00;
+            end
             default : begin 
                 SPIdata = 24'h0;
             end

src/src/Top/RFTop.v

@@ -34,8 +34,8 @@ output Clk50_o,
 output [FifoNum-1:0] Ss_o,
 output [FifoNum-1:0] Sck_o,
 output [FifoNum-1:0] Mosi0_o,
-output Locked_o,
-output RstInit_o,
+// output Locked_o,
+// output RstInit_o,
 
 output [21:0] GPIO_o
 
@@ -535,11 +535,11 @@ always @(posedge clk100) begin
             configReg1 <=dataToRxFifo;
         end
         else begin 
-            // if (modeSel) begin 
-            //     if ((trCnt == sumForGPIO) && (trCnt != 0)) begin 
-            //         configReg1 <= 24'h0;
-            //     end
-            // end
+            if (modeSel) begin 
+                if ((trCnt == sumForGPIO) && (trCnt != 0)) begin 
+                    configReg1 <= 24'h0;
+                end
+            end
             if (!modeSel) begin 
                 if ((trCnt1Spi == wordNum) && (wordNum != 0)) begin 
                     configReg1 <= 24'h0;
@@ -971,7 +971,7 @@ always @(*) begin
                 else if ((trCntReg == numOfConfigCmds) && (packetNum1 == 0) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO;
                 end
-                else if ((trCntReg == numOfConfigCmds) && (packetNum1 == 0) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0 ) && (packetNum8 == 0)) begin 
+                else if ((trCntReg == 17'h1) && (packetNum1 == 0) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0 ) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
                 else begin 
@@ -989,31 +989,31 @@ always @(*) begin
         end
         LMX2594: begin
             if (modeSel) begin 
-                if ((trCntReg == (sumForLmx)) && (packetNum2 != 0)) begin 
+                if ((trCntReg == sumForLmx) && (packetNum2 != 0)) begin 
                     nextState = DDS;
                 end
-                else if ((trCntReg == (sumForLmx)) && (packetNum1 == 0)  && (packetNum2 == 0) && (packetNum3 != 0)) begin 
+                else if ((trCntReg == sumForLmx) && (packetNum1 == 0)  && (packetNum2 == 0) && (packetNum3 != 0)) begin 
                     nextState = POT;
                 end
-                else if ((trCntReg == (sumForLmx)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 != 0)) begin 
+                else if ((trCntReg == sumForLmx) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 != 0)) begin 
                     nextState = DAC;
                 end
-                else if ((trCntReg == (sumForLmx)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 != 0)) begin 
+                else if ((trCntReg == sumForLmx) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 != 0)) begin 
                     nextState = ATTENUATOR;
                 end
-                else if ((trCntReg == (sumForLmx)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 != 0)) begin 
+                else if ((trCntReg == sumForLmx) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 != 0)) begin 
                     nextState = SHIFTREG; 
                 end
-                else if ((trCntReg == (sumForLmx)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
+                else if ((trCntReg == sumForLmx) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
                     nextState = MAX2870; 
                 end
-                else if ((trCntReg == (sumForLmx)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
+                else if ((trCntReg == sumForLmx) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO; 
                 end
-                else if ((trCntReg == (sumForLmx)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
+                else if ((trCntReg == sumForLmx) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
                     nextState = IDLE; 
                 end
-                else if (trCntReg != (sumForLmx)) begin 
+                else if (trCntReg != sumForLmx) begin 
                     nextState = LMX2594;
                 end
             end
@@ -1030,28 +1030,28 @@ always @(*) begin
         end
         DDS: begin
             if (modeSel) begin 
-                if ((trCntReg == (sumForDDS)) && (packetNum3 != 0)) begin 
+                if ((trCntReg == sumForDDS) && (packetNum3 != 0)) begin 
                     nextState = POT;
                 end
-                else if ((trCntReg == (sumForDDS)) && (packetNum3 == 0) && (packetNum4 != 0)) begin 
+                else if ((trCntReg == sumForDDS) && (packetNum3 == 0) && (packetNum4 != 0)) begin 
                     nextState = DAC;
                 end
-                else if ((trCntReg == (sumForDDS)) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 != 0) ) begin 
+                else if ((trCntReg == sumForDDS) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 != 0) ) begin 
                     nextState = ATTENUATOR;
                 end
-                else if ((trCntReg == (sumForDDS)) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 != 0)) begin 
+                else if ((trCntReg == sumForDDS) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 != 0)) begin 
                     nextState = SHIFTREG;
                 end
-                else if ((trCntReg == (sumForDDS)) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0 ) && (packetNum7 != 0)) begin 
+                else if ((trCntReg == sumForDDS) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0 ) && (packetNum7 != 0)) begin 
                     nextState = MAX2870;
                 end
-                else if ((trCntReg == (sumForDDS)) && (packetNum3 == 0) && (packetNum4 == 0 ) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
+                else if ((trCntReg == sumForDDS) && (packetNum3 == 0) && (packetNum4 == 0 ) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO;
                 end
-                else if ((trCntReg == (sumForDDS)) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
+                else if ((trCntReg == sumForDDS ) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
-                else if (trCntReg != (sumForDDS)) begin 
+                else if (trCntReg != sumForDDS) begin 
                     nextState = DDS;
                 end
             end
@@ -1068,25 +1068,25 @@ always @(*) begin
         end
         POT: begin
             if (modeSel) begin 
-                if ((trCntReg == (sumForPot)) && (packetNum4 != 0)) begin 
+                if ((trCntReg == sumForPot) && (packetNum4 != 0)) begin 
                     nextState = DAC;
                 end
-                else if ((trCntReg == (sumForPot)) && (packetNum4 == 0) && (packetNum5 != 0)) begin 
+                else if ((trCntReg == sumForPot) && (packetNum4 == 0) && (packetNum5 != 0)) begin 
                     nextState = ATTENUATOR;
                 end
-                else if ((trCntReg == (sumForPot)) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 != 0)) begin 
+                else if ((trCntReg == sumForPot) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 != 0)) begin 
                     nextState = SHIFTREG;
                 end
-                else if ((trCntReg == (sumForPot)) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
+                else if ((trCntReg == sumForPot) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
                     nextState = MAX2870;
                 end
-                else if ((trCntReg == (sumForPot)) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
+                else if ((trCntReg == sumForPot) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO;
                 end
-                else if ((trCntReg == (sumForPot)) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
+                else if ((trCntReg == sumForPot) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
-                else if (trCntReg != (sumForPot)) begin 
+                else if (trCntReg != sumForPot) begin 
                     nextState = POT;
                 end
             end
@@ -1103,22 +1103,22 @@ always @(*) begin
         end
         DAC: begin
             if (modeSel) begin 
-                if ((trCntReg == (sumForDAC)) && (packetNum5 != 0) ) begin 
+                if ((trCntReg == sumForDAC) && (packetNum5 != 0) ) begin 
                     nextState = ATTENUATOR;
                 end
-                else if ((trCntReg == (sumForDAC)) && (packetNum5 == 0) && (packetNum6 != 0)) begin 
+                else if ((trCntReg == sumForDAC) && (packetNum5 == 0) && (packetNum6 != 0)) begin 
                     nextState = SHIFTREG;
                 end
-                else if ((trCntReg == (sumForDAC)) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
+                else if ((trCntReg == sumForDAC) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
                     nextState = MAX2870;
                 end
-                else if ((trCntReg == (sumForDAC)) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
+                else if ((trCntReg == sumForDAC) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO;
                 end
-                else if ((trCntReg == (sumForDAC)) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
+                else if ((trCntReg == sumForDAC) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
-                else if (trCntReg != (sumForDAC)) begin 
+                else if (trCntReg != sumForDAC) begin 
                     nextState = DAC;
                 end
             end
@@ -1135,19 +1135,19 @@ always @(*) begin
         end
         ATTENUATOR: begin
             if (modeSel) begin 
-                if ((trCntReg == (sumForATT)) && (packetNum6 != 0) ) begin 
+                if ((trCntReg == sumForATT) && (packetNum6 != 0) ) begin 
                     nextState = SHIFTREG;
                 end
-                else if ((trCntReg == (sumForATT)) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
+                else if ((trCntReg == sumForATT) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
                     nextState = MAX2870;
                 end
-                else if ((trCntReg == (sumForATT)) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
+                else if ((trCntReg == sumForATT) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO;
                 end
-                else if ((trCntReg == (sumForATT)) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
+                else if ((trCntReg == sumForATT) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
-                else if (trCntReg != (sumForATT)) begin 
+                else if (trCntReg != sumForATT) begin 
                     nextState = ATTENUATOR;
                 end
             end
@@ -1164,16 +1164,16 @@ always @(*) begin
         end
         SHIFTREG : begin 
             if (modeSel) begin 
-                if ((trCntReg == (sumForShiftReg)) && (packetNum7 != 0) ) begin 
+                if ((trCntReg == sumForShiftReg) && (packetNum7 != 0) ) begin 
                     nextState = MAX2870;
                 end
-                else if ((trCntReg == (sumForShiftReg)) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
+                else if ((trCntReg == sumForShiftReg) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO;
                 end
-                else if ((trCntReg == (sumForShiftReg)) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
+                else if ((trCntReg == sumForShiftReg) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
-                else if (trCntReg != (sumForShiftReg)) begin 
+                else if (trCntReg != sumForShiftReg) begin 
                     nextState = SHIFTREG;
                 end
             end
@@ -1190,13 +1190,13 @@ always @(*) begin
         end  
         MAX2870 : begin 
             if (modeSel) begin 
-                if ((trCntReg == (sumForMAX)) && (packetNum8 != 0))  begin 
+                if ((trCntReg == sumForMAX) && (packetNum8 != 0))  begin 
                     nextState = GPIO;
                 end
-                else if ((trCntReg == (sumForMAX)) && (packetNum8 == 0)) begin 
+                else if ((trCntReg == sumForMAX) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
-                else if (trCntReg != (sumForMAX)) begin 
+                else if (trCntReg != sumForMAX) begin 
                     nextState = MAX2870;
                 end
             end
@@ -1213,10 +1213,10 @@ always @(*) begin
         end
         GPIO : begin 
             if (modeSel) begin 
-                if (trCntReg == (sumForGPIO)) begin 
+                if (trCntReg == sumForGPIO) begin 
                     nextState = IDLE;
                 end
-                else if (trCntReg != (sumForGPIO)) begin 
+                else if (trCntReg != sumForGPIO) begin 
                     nextState = GPIO;
                 end
             end