Проведён рефакторинг кода

sources_1/new/DataFifo/FifoCtrl.v

@@ -69,7 +69,7 @@ wire	requestToFifo3	=(SmcAddr_i == Fifo3ReadMsbAddr)?1'b1:1'b0;
 wire	requestToFifo4	=(SmcAddr_i == Fifo4ReadMsbAddr)?1'b1:1'b0;
 wire	requestToFifo5	=(SmcAddr_i == Fifo5ReadMsbAddr)?1'b1:1'b0;
 wire	requestToFifo6	=(SmcAddr_i == Fifo6ReadMsbAddr)?1'b1:1'b0;
-wire	requestToFifo	=	(requestToFifo0|requestToFifo1|requestToFifo2|requestToFifo3|requestToFifo4|requestToFifo5|requestToFifo6)?1'b1:1'b0;
+wire	requestToFifo   =(requestToFifo0|requestToFifo1|requestToFifo2|requestToFifo3|requestToFifo4|requestToFifo5|requestToFifo6)?1'b1:1'b0;
 
 
 

sources_1/new/MMCM/ClkOutMMCM.v

@@ -9,26 +9,32 @@ input clk4out,
 input clk5out,
 input clk6out, 
 
-output reg  clkOutMMCM
+output   ClkOutMMCM_o
 
 );
 
 
+reg clkOutMMCMReg;
+
+wire clkOutMMCM;
+
+assign clkOutMMCM = clkOutMMCMReg;
+
 
 always @(*) begin 
     if (Rst_i) begin 
-        clkOutMMCM = 0;
+        clkOutMMCMReg = 0;
     end
     else begin 
         case (clkNum) 
-            0: clkOutMMCM = clk0out;
-            1: clkOutMMCM = clk1out;
-            2: clkOutMMCM = clk2out;
-            3: clkOutMMCM = clk3out;
-            4: clkOutMMCM = clk4out;
-            5: clkOutMMCM = clk5out;
-            6: clkOutMMCM = clk6out;
-            default: clkOutMMCM = 0;
+            0: clkOutMMCMReg = clk0out;
+            1: clkOutMMCMReg = clk1out;
+            2: clkOutMMCMReg = clk2out;
+            3: clkOutMMCMReg = clk3out;
+            4: clkOutMMCMReg = clk4out;
+            5: clkOutMMCMReg = clk5out;
+            6: clkOutMMCMReg = clk6out;
+            default: clkOutMMCMReg = 0;
         endcase
     end
 end
@@ -36,6 +42,14 @@ end
 
 
 
+BUFG BUFG_inst (
+   .O(ClkOutMMCM_o), // 1-bit output: Clock output
+   .I(clkOutMMCM)  // 1-bit input: Clock input
+);
+
+
+
+
 
 
 endmodule

sources_1/new/MMCM/MmcmWrapper.v

@@ -23,14 +23,14 @@ module MmcmWrapper
 //	REG/WIRE
 //================================================================================
 	
-wire            clk0out;
-wire            clk1out;
-wire            clk2out;
-wire            clk3out;
-wire            clk4out;
-wire            clk5out;
-wire            clk6out;
-wire            locked;
+wire    clk0out;
+wire    clk1out;
+wire    clk2out;
+wire    clk3out;
+wire    clk4out;
+wire    clk5out;
+wire    clk6out;
+wire    locked;
 
 wire [SpiNum-1:0] clkOutMMCM;
 
@@ -125,7 +125,7 @@ generate
          .clk4out(clk4out),
          .clk5out(clk5out),
          .clk6out(clk6out),
-         .clkOutMMCM(clkOutMMCM[i])
+         .ClkOutMMCM_o(clkOutMMCM[i])
       );
 
       ClkCh ClkCh_inst (

sources_1/new/QuadSPI/QuadSPIm.v

@@ -144,11 +144,11 @@ always @(*) begin
         if (PulsePol_i) begin 
             if (CPHA_i) begin
                 if (LEAD_i == 0) begin 
-                if (!ss && (ssCnt <= ssNum+LAG_i+LEAD_i && ssCnt > LAG_i) ) begin 
-                    Sck_o = ~(~Clk_i);
-                end
-                else begin 
-                    Sck_o = 1'b0;
+                    if (!ss && (ssCnt <= ssNum+LAG_i+LEAD_i && ssCnt > LAG_i) ) begin 
+                        Sck_o = ~(~Clk_i);
+                    end
+                    else begin 
+                        Sck_o = 1'b0;
                     end
                 end
                 else begin 
@@ -222,11 +222,11 @@ always @(*) begin
           if (PulsePol_i) begin 
             if (CPHA_i) begin
                 if (LEAD_i == 0) begin 
-                if (ss && (ssCnt <= ssNum+LAG_i+LEAD_i && ssCnt > LAG_i) ) begin 
-                    Sck_o = ~(~Clk_i);
-                end
-                else begin 
-                    Sck_o = 1'b0;
+                    if (ss && (ssCnt <= ssNum+LAG_i+LEAD_i && ssCnt > LAG_i) ) begin 
+                        Sck_o = ~(~Clk_i);
+                    end
+                    else begin 
+                        Sck_o = 1'b0;
                     end
                 end
                 else begin 

sources_1/new/SpiR/SPIm.v

@@ -173,11 +173,11 @@ always @(*) begin
         if (PulsePol_i) begin 
             if (CPHA_i) begin
                 if (LEAD_i == 0) begin 
-                if (!Ss && (ssCnt <= ssNum+LAG_i+LEAD_i && ssCnt > LAG_i) ) begin 
-                    Sck_o = ~(~Clk_i);
-                end
-                else begin 
-                    Sck_o = 1'b0;
+                    if (!Ss && (ssCnt <= ssNum+LAG_i+LEAD_i && ssCnt > LAG_i) ) begin 
+                        Sck_o = ~(~Clk_i);
+                    end
+                    else begin 
+                        Sck_o = 1'b0;
                     end
                 end
                 else begin 
@@ -251,11 +251,11 @@ always @(*) begin
           if (PulsePol_i) begin 
             if (CPHA_i) begin
                 if (LEAD_i == 0) begin 
-                if (ssPol && (ssCnt <= ssNum+LAG_i+LEAD_i && ssCnt > LAG_i) ) begin 
-                    Sck_o = ~(~Clk_i);
-                end
-                else begin 
-                    Sck_o = 1'b0;
+                    if (ssPol && (ssCnt <= ssNum+LAG_i+LEAD_i && ssCnt > LAG_i) ) begin 
+                        Sck_o = ~(~Clk_i);
+                    end
+                    else begin 
+                        Sck_o = 1'b0;
                     end
                 end
                 else begin