|
@@ -128,6 +128,7 @@ localparam LED_TICK_RATE = 48000000;//0.5Hz 24MHz
|
|
|
wire clk50;
|
|
wire clk50;
|
|
|
wire clk26dot25;
|
|
wire clk26dot25;
|
|
|
wire clk60;
|
|
wire clk60;
|
|
|
|
|
+ wire clk70;
|
|
|
|
|
|
|
|
wire spiDataVal;
|
|
wire spiDataVal;
|
|
|
wire spiDataValSync;
|
|
wire spiDataValSync;
|
|
@@ -380,6 +381,7 @@ ClkGen ClkGen
|
|
|
.Clk5Mhz_o (clk5),
|
|
.Clk5Mhz_o (clk5),
|
|
|
.Clk20Mhz_o (clk20),
|
|
.Clk20Mhz_o (clk20),
|
|
|
.Clk50Mhz_o (clk50),
|
|
.Clk50Mhz_o (clk50),
|
|
|
|
|
+ .Clk70Mhz_o (clk70),
|
|
|
.Clk26dot25Mhz_o (clk26dot25),
|
|
.Clk26dot25Mhz_o (clk26dot25),
|
|
|
.Clk60Mhz_o (clk60)
|
|
.Clk60Mhz_o (clk60)
|
|
|
);
|
|
);
|
|
@@ -397,7 +399,7 @@ InterfaceArbiter
|
|
|
SpiSlaveArbiter
|
|
SpiSlaveArbiter
|
|
|
(
|
|
(
|
|
|
.Rst_i (Rst_i),
|
|
.Rst_i (Rst_i),
|
|
|
- .Clk_i (clk60),
|
|
|
|
|
|
|
+ .Clk_i (clk70),
|
|
|
|
|
|
|
|
.Sck_i (Sck_i),
|
|
.Sck_i (Sck_i),
|
|
|
.Ss_i (Ss_i),
|
|
.Ss_i (Ss_i),
|
|
@@ -412,18 +414,9 @@ SpiSlaveArbiter
|
|
|
.Data_o (spiData)
|
|
.Data_o (spiData)
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
-// Sync1bit SyncPulse(
|
|
|
|
|
-// .ClkFast_i (gclk100),
|
|
|
|
|
-// .ClkSlow_i (clk60),
|
|
|
|
|
-// .Signal_i (spiDataVal),
|
|
|
|
|
-// .Ss_i (Ss_i),
|
|
|
|
|
-// .Rst_i (initRst),
|
|
|
|
|
-// .Signal_o (spiDataValSync)
|
|
|
|
|
-// );
|
|
|
|
|
-
|
|
|
|
|
PacketAnalyzer4Mosi PacketAnalyzer4Mosi
|
|
PacketAnalyzer4Mosi PacketAnalyzer4Mosi
|
|
|
(
|
|
(
|
|
|
- .Clk_i (clk60),
|
|
|
|
|
|
|
+ .Clk_i (clk70),
|
|
|
.Rst_i (Rst_i),
|
|
.Rst_i (Rst_i),
|
|
|
|
|
|
|
|
.DataFromSpi_i (spiData),
|
|
.DataFromSpi_i (spiData),
|
|
@@ -449,7 +442,7 @@ PacketAnalyzer4Mosi PacketAnalyzer4Mosi
|
|
|
|
|
|
|
|
PacketAnalyzer1Mosi PacketAnalyzer1Mosi
|
|
PacketAnalyzer1Mosi PacketAnalyzer1Mosi
|
|
|
(
|
|
(
|
|
|
- .Clk_i (clk60),
|
|
|
|
|
|
|
+ .Clk_i (clk70),
|
|
|
.Rst_i (Rst_i),
|
|
.Rst_i (Rst_i),
|
|
|
|
|
|
|
|
.DataFromSpi_i (spiData),
|
|
.DataFromSpi_i (spiData),
|
|
@@ -478,8 +471,8 @@ LmxWrapper #(
|
|
|
.OUT_WIDTH (24),
|
|
.OUT_WIDTH (24),
|
|
|
.DATA_WIDTH (24)
|
|
.DATA_WIDTH (24)
|
|
|
) LmxWrapper(
|
|
) LmxWrapper(
|
|
|
- .WrClk_i (clk60),
|
|
|
|
|
- .RdClk_i (clk60),
|
|
|
|
|
|
|
+ .WrClk_i (clk70),
|
|
|
|
|
+ .RdClk_i (clk70),
|
|
|
.Rst_i (initRst),
|
|
.Rst_i (initRst),
|
|
|
.Data_i (spiData),
|
|
.Data_i (spiData),
|
|
|
.Val_i (valLmxDataToFifo),
|
|
.Val_i (valLmxDataToFifo),
|
|
@@ -500,7 +493,7 @@ DDSWrapper #(
|
|
|
.OUT_WIDTH (80),
|
|
.OUT_WIDTH (80),
|
|
|
.DATA_WIDTH (80)
|
|
.DATA_WIDTH (80)
|
|
|
) DDSWrapper(
|
|
) DDSWrapper(
|
|
|
- .WrClk_i (clk60),
|
|
|
|
|
|
|
+ .WrClk_i (clk70),
|
|
|
.RdClk_i (clk50),
|
|
.RdClk_i (clk50),
|
|
|
.Rst_i (initRst),
|
|
.Rst_i (initRst),
|
|
|
.DdsWordNum_i (ddsWordNum),
|
|
.DdsWordNum_i (ddsWordNum),
|
|
@@ -521,7 +514,7 @@ PotWrapper #(
|
|
|
.OUT_WIDTH (16),
|
|
.OUT_WIDTH (16),
|
|
|
.DATA_WIDTH (16)
|
|
.DATA_WIDTH (16)
|
|
|
) PotWrapper(
|
|
) PotWrapper(
|
|
|
- .WrClk_i (clk60),
|
|
|
|
|
|
|
+ .WrClk_i (clk70),
|
|
|
.RdClk_i (clk5),
|
|
.RdClk_i (clk5),
|
|
|
.Rst_i (initRst),
|
|
.Rst_i (initRst),
|
|
|
.Data_i (spiData),
|
|
.Data_i (spiData),
|
|
@@ -537,7 +530,7 @@ DacWrapper #(
|
|
|
.OUT_WIDTH (16),
|
|
.OUT_WIDTH (16),
|
|
|
.DATA_WIDTH (16)
|
|
.DATA_WIDTH (16)
|
|
|
) DacWrapper(
|
|
) DacWrapper(
|
|
|
- .WrClk_i (clk60),
|
|
|
|
|
|
|
+ .WrClk_i (clk70),
|
|
|
.RdClk_i (clk50),
|
|
.RdClk_i (clk50),
|
|
|
.Rst_i (initRst),
|
|
.Rst_i (initRst),
|
|
|
.Data_i (spiData),
|
|
.Data_i (spiData),
|
|
@@ -553,7 +546,7 @@ AttenuatorWrapper #(
|
|
|
.OUT_WIDTH (16),
|
|
.OUT_WIDTH (16),
|
|
|
.DATA_WIDTH (16)
|
|
.DATA_WIDTH (16)
|
|
|
) AttenuatorWrapper(
|
|
) AttenuatorWrapper(
|
|
|
- .WrClk_i (clk60),
|
|
|
|
|
|
|
+ .WrClk_i (clk70),
|
|
|
.RdClk_i (clk50),
|
|
.RdClk_i (clk50),
|
|
|
.Rst_i (initRst),
|
|
.Rst_i (initRst),
|
|
|
.Data_i (spiData),
|
|
.Data_i (spiData),
|
|
@@ -569,7 +562,7 @@ ShiftRegWrapper #(
|
|
|
.OUT_WIDTH (8),
|
|
.OUT_WIDTH (8),
|
|
|
.DATA_WIDTH (8)
|
|
.DATA_WIDTH (8)
|
|
|
) ShiftRegWrapper(
|
|
) ShiftRegWrapper(
|
|
|
- .WrClk_i (clk60),
|
|
|
|
|
|
|
+ .WrClk_i (clk70),
|
|
|
.RdClk_i (clk26dot25),
|
|
.RdClk_i (clk26dot25),
|
|
|
.Rst_i (initRst),
|
|
.Rst_i (initRst),
|
|
|
.Data_i (spiData),
|
|
.Data_i (spiData),
|
|
@@ -585,7 +578,7 @@ Max2870Wrapper #(
|
|
|
.OUT_WIDTH (32),
|
|
.OUT_WIDTH (32),
|
|
|
.DATA_WIDTH (32)
|
|
.DATA_WIDTH (32)
|
|
|
) Max2870Wrapper(
|
|
) Max2870Wrapper(
|
|
|
- .WrClk_i (clk60),
|
|
|
|
|
|
|
+ .WrClk_i (clk70),
|
|
|
.RdClk_i (clk20),
|
|
.RdClk_i (clk20),
|
|
|
.Rst_i (initRst),
|
|
.Rst_i (initRst),
|
|
|
.Data_i (spiData),
|
|
.Data_i (spiData),
|
|
@@ -607,7 +600,7 @@ TempRead TempRead (
|
|
|
|
|
|
|
|
Gpio1Ctrl Gpio1Ctrl
|
|
Gpio1Ctrl Gpio1Ctrl
|
|
|
(
|
|
(
|
|
|
- .Clk_i (clk60),
|
|
|
|
|
|
|
+ .Clk_i (clk70),
|
|
|
.ValGpioDataToFifo_i (valGpioDataToFifo),
|
|
.ValGpioDataToFifo_i (valGpioDataToFifo),
|
|
|
.ValDataFromSpi_i (spiDataVal),
|
|
.ValDataFromSpi_i (spiDataVal),
|
|
|
.FlagDirectGpio1_i (flagDirectGpio1),
|
|
.FlagDirectGpio1_i (flagDirectGpio1),
|
|
@@ -616,7 +609,7 @@ Gpio1Ctrl Gpio1Ctrl
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
Gpio2Read Gpio2Read (
|
|
Gpio2Read Gpio2Read (
|
|
|
- .Clk_i (clk60),
|
|
|
|
|
|
|
+ .Clk_i (clk70),
|
|
|
.Rst_i (initRst),
|
|
.Rst_i (initRst),
|
|
|
.ClkSpi_i (Sck_i),
|
|
.ClkSpi_i (Sck_i),
|
|
|
.LdMax_i (MisoLdMax2870_i),
|
|
.LdMax_i (MisoLdMax2870_i),
|