|
|
@@ -206,7 +206,8 @@ wire [0:31] dataToRxFifoQ [SpiNum-1:0];
|
|
|
wire [0:31] dataFromRxFifo [SpiNum-1:0];
|
|
|
|
|
|
wire [CmdRegWidth/2-1:0] muxedData;
|
|
|
-
|
|
|
+wire Clk100_o;
|
|
|
+wire Clk40_o;
|
|
|
|
|
|
|
|
|
|
|
|
@@ -413,13 +414,13 @@ assign Sck[4] = (spiMode)? SckQ[4]:SckR[4];
|
|
|
assign Sck[5] = (spiMode)? SckQ[5]:SckR[5];
|
|
|
assign Sck[6] = (spiMode)? SckQ[6]:SckR[6];
|
|
|
|
|
|
-assign Mosi0[0] = (spiMode)? Mosi0Q[0]:valReg[0];
|
|
|
-assign Mosi0[1] = (spiMode)? Mosi0Q[1]:valReg[1];
|
|
|
-assign Mosi0[2] = (spiMode)? Mosi0Q[2]:valReg[2];
|
|
|
-assign Mosi0[3] = (spiMode)? Mosi0Q[3]:valReg[3];
|
|
|
-assign Mosi0[4] = (spiMode)? Mosi0Q[4]:valReg[4];
|
|
|
-assign Mosi0[5] = (spiMode)? Mosi0Q[5]:valReg[5];
|
|
|
-assign Mosi0[6] = (spiMode)? Mosi0Q[6]:valReg[6];
|
|
|
+assign Mosi0[0] = (spiMode)? Mosi0Q[0]:Mosi0R[0];
|
|
|
+assign Mosi0[1] = (spiMode)? Mosi0Q[1]:Mosi0R[1];
|
|
|
+assign Mosi0[2] = (spiMode)? Mosi0Q[2]:Mosi0R[2];
|
|
|
+assign Mosi0[3] = (spiMode)? Mosi0Q[3]:Mosi0R[3];
|
|
|
+assign Mosi0[4] = (spiMode)? Mosi0Q[4]:Mosi0R[4];
|
|
|
+assign Mosi0[5] = (spiMode)? Mosi0Q[5]:Mosi0R[5];
|
|
|
+assign Mosi0[6] = (spiMode)? Mosi0Q[6]:Mosi0R[6];
|
|
|
|
|
|
assign valToTxFifoRead[0] = (spiMode)? valToTxQ[0]:valToTxR[0];
|
|
|
assign valToTxFifoRead[1] = (spiMode)? valToTxQ[1]:valToTxR[1];
|
|
|
@@ -608,7 +609,9 @@ MmcmWrapper MainMmcm
|
|
|
.BaudRate4_i(baudRate[4]),
|
|
|
.BaudRate5_i(baudRate[5]),
|
|
|
.BaudRate6_i(baudRate[6]),
|
|
|
- .SpiClk_o (spiClkBus)
|
|
|
+ .SpiClk_o (spiClkBus),
|
|
|
+ .Clk100_o (Clk100_o),
|
|
|
+ .Clk40_o (Clk40_o)
|
|
|
);
|
|
|
|
|
|
|
|
|
@@ -629,7 +632,7 @@ generate
|
|
|
DataFifoWrapper DataFifoWrapper
|
|
|
(
|
|
|
.WrClk_i (gclk),
|
|
|
- .RdClk_i (spiClkBus[i]),
|
|
|
+ .RdClk_i (Clk40_o),
|
|
|
// .Rst_i (spiSyncRst[i] | FifoRxRst[i]),
|
|
|
.FifoRxRst_i (fifoRxRst[i]),
|
|
|
.FifoTxRst_i (fifoTxRst[i]),
|
|
|
@@ -651,13 +654,13 @@ generate
|
|
|
|
|
|
|
|
|
SPIm SPIm_inst (
|
|
|
- .Clk_i(spiClkBus[i]),
|
|
|
+ .Clk_i(Clk40_o),
|
|
|
.Start_i(ten[i]),
|
|
|
.Rst_i(initRst| spiMode[i]),
|
|
|
.SPIdata(toSpiData[i]),
|
|
|
.Sck_o(SckR[i]),
|
|
|
.Ss_o(SsR[i]),
|
|
|
- .Mosi0_o(valReg[i]),
|
|
|
+ .Mosi0_o(Mosi0R[i]),
|
|
|
.WidthSel_i(widthSel[i]),
|
|
|
.PulsePol_i(CPOL[i]),
|
|
|
.CPHA_i(CPHA[i]),
|
|
|
@@ -677,11 +680,11 @@ generate
|
|
|
);
|
|
|
|
|
|
SPIs SPIs_inst (
|
|
|
- .Clk_i(spiClkBus[i]),
|
|
|
+ .Clk_i(Clk40_o),
|
|
|
.Rst_i(initRst|SpiRst_o[i]| spiMode[i]),
|
|
|
.Sck_i(SckR[i]),
|
|
|
.Ss_i(SsR[i]),
|
|
|
- .Mosi0_i(valReg[i]),
|
|
|
+ .Mosi0_i(Mosi0R[i]),
|
|
|
.WidthSel_i(widthSel[i]),
|
|
|
.SELST_i(selSt[i]),
|
|
|
.DataToRxFifo_o(dataToRxFifoR[i]),
|
|
|
@@ -690,7 +693,7 @@ generate
|
|
|
|
|
|
|
|
|
QuadSPIm QuadSPIm_inst (
|
|
|
- .Clk_i(spiClkBus[i]),
|
|
|
+ .Clk_i(Clk40_o),
|
|
|
.Start_i(ten[i]),
|
|
|
.Rst_i(initRst| !spiMode[i]),
|
|
|
.SpiDataVal_i (toSpiVal),
|
|
|
@@ -713,11 +716,11 @@ generate
|
|
|
.Val_o(valToTxQ[i])
|
|
|
);
|
|
|
QuadSPIs QuadSPIs_inst (
|
|
|
- .Clk_i(spiClkBus[i]),
|
|
|
+ .Clk_i(Clk40_o),
|
|
|
.Rst_i(initRst|SpiRst_o[i]| !spiMode[i]),
|
|
|
.Sck_i(SckQ[i]),
|
|
|
.Ss_i(SsQ[i]),
|
|
|
- .Mosi0_i(Mosi0[i]),
|
|
|
+ .Mosi0_i(Mosi0Q[i]),
|
|
|
.Mosi1_i(Mosi1[i]),
|
|
|
.Mosi2_i(Mosi2[i]),
|
|
|
.Mosi3_i(Mosi3[i]),
|