Merge branch 'dev' into Anatoliy/feature_FifoCtrl

src/src/Top/TopSbTmsg.v

@@ -60,14 +60,13 @@ module TopSbTmsg
 //================================================================================
 //  REG/WIRE
 
-	wire clk360;
-	wire clk100;
-	wire clk75;
-	wire clk50;
-	wire clk40;
-	wire clk20;
-	wire clk30;
+	wire clk24;
+	wire gclk100;
 	wire clk5;
+	wire clk20;
+	wire clk50;
+	wire clk26dot25;
+	wire clk60;
 
 	wire spiDataVal;
 	wire [WORDWIDTH-1:0] spiData;
@@ -94,7 +93,6 @@ module TopSbTmsg
 	wire flagDirectGpio;	
 	wire flagDirectTemp;	
 	
-	
 //================================================================================
 //  ASSIGNMENTS
 
@@ -105,16 +103,28 @@ module TopSbTmsg
 //================================================================================
 //  CODING
 
+ClkGen ClkGen
+(
+	.Clk24Mhz_i			(Clk_i),
+	
+	.Clk24Mhz_o			(clk24),
+	.Clk100Mhz_o		(gclk100),
+	.Clk5Mhz_o			(clk5),
+	.Clk20Mhz_o			(clk20),
+	.Clk50Mhz_o			(clk50),
+	.Clk26dot25Mhz_o	(clk26dot25),
+	.Clk60Mhz_o			(clk60)
+);
+
 InterfaceArbiter 
 #(	
-	.OUTWORDWIDTH (WORDWIDTH),
-	.SSPIWORDWIDTH (SSPIWORDWIDTH)
+	.OUTWORDWIDTH	(WORDWIDTH),
+	.SSPIWORDWIDTH	(SSPIWORDWIDTH)
 )
 SpiSlaveArbiter
 (
 	.Rst_i		(Rst_i),
-	// .Clk_i		(clk100),
-	.Clk_i		(Clk_i),
+	.Clk_i		(gclk100),
 	
 	.Sck_i		(Sck_i),
 	.Ss_i		(Ss_i),
@@ -131,14 +141,13 @@ SpiSlaveArbiter
 
 PacketAnalyzer4Mosi PacketAnalyzer4Mosi
 (
-	// .Clk_i	(clk100),
-	.Clk_i	(Clk_i),
-	.Rst_i	(Rst_i),
+	.Clk_i					(gclk100),
+	.Rst_i					(Rst_i),
 
-	.DataFromSpi_i		(spiData),
-	.ValDataFromSpi_i	(spiDataVal),
+	.DataFromSpi_i			(spiData),
+	.ValDataFromSpi_i		(spiDataVal),
 
-	.BusyMosi1_i	(busyMosi1),
+	.BusyMosi1_i			(busyMosi1),
 
 	.ValLmxDataToFifo_o		(valLmxDataToFifo),
 	.ValDdsDataToFifo_o		(valDdsDataToFifo),
@@ -149,31 +158,42 @@ PacketAnalyzer4Mosi PacketAnalyzer4Mosi
 	.ValMaxDataToFifo_o		(valMaxDataToFifo),
 	.ValGpioDataToFifo_o	(valGpioDataToFifo),
 
-	.Busy_o	(busyMosi4)
+	.Busy_o					(busyMosi4)
 );
 
-PacketAnalyzer1Mosi PacketAnalyzer1Mosi
+PacketAnalyzer1Mosi	PacketAnalyzer1Mosi
 (
-	// .Clk_i	(clk100),
-	.Clk_i	(Clk_i),
-	.Rst_i	(Rst_i),
-
-	.DataFromSpi_i		(spiData),
-	.ValDataFromSpi_i	(spiDataVal),
-
-	.BusyMosi4_i	(busyMosi4),
-
-	.FlagDirectLmx_o	(flagDirectLmx),
-	.FlagDirectDds_o	(flagDirectDds),
-	.FlagDirectPot_o	(flagDirectPot),
-	.FlagDirectDac_o	(flagDirectDac),
-	.FlagDirectAtt_o	(flagDirectAtt),
-	.FlagDirectShReg_o	(flagDirectShReg),
-	.FlagDirectMax_o	(flagDirectMax),
-	.FlagDirectGpio_o	(flagDirectGpio),
-	.FlagDirectTemp_o	(flagDirectTemp),
-
-	.Busy_o	(busyMosi1)
+	.Clk_i					(gclk100),
+	.Rst_i					(Rst_i),
+	
+	.DataFromSpi_i			(spiData),
+	.ValDataFromSpi_i		(spiDataVal),
+	
+	.BusyMosi4_i			(busyMosi4),
+	
+	.FlagDirectLmx_o		(flagDirectLmx),
+	.FlagDirectDds_o		(flagDirectDds),
+	.FlagDirectPot_o		(flagDirectPot),
+	.FlagDirectDac_o		(flagDirectDac),
+	.FlagDirectAtt_o		(flagDirectAtt),
+	.FlagDirectShReg_o		(flagDirectShReg),
+	.FlagDirectMax_o		(flagDirectMax),
+	.FlagDirectGpio_o		(flagDirectGpio),
+	.FlagDirectTemp_o		(flagDirectTemp),
+	
+	.Busy_o					(busyMosi1)
 );
 
+GpioCtrl GpioCtrl
+(
+	.Clk_i					(gclk100),
+	.Rst_i					(Rst_i),
+	
+	.ValGpioDataToFifo_i	(valGpioDataToFifo),
+	.Data_i					(spiData),
+
+	.GpioReg_o				(Gpio_o)
+);
+
+
 endmodule