Переименован инстанс модуля GpioCtrl в Gpio1Ctrl, ,биты регистра Gpio назначены на соответствующие выходы.

src/src/Top/TopSbTmsg.v

@@ -50,7 +50,29 @@ module TopSbTmsg
 	output [DEVNUM-1:0] Sck_o,
 	output [DEVNUM-1:0] Mosi_o,
 	
-	output [21:0] Gpio_o
+	//GPIO
+	output RfSw1_o,
+	output RfSw2_o,
+	output CtrlAmSw3_o,
+	output DdsSyncCtrlFpga_o,
+	output DdsResetFpga_o,
+	output DdsSyncFpga_o,
+	output SwCap4_o,
+	output AmAlcSw_o,
+	output SwCap3_o,
+	output SwCap2_o,
+	output SwCap1_o,
+	output AmAlc1Fix_o,
+	output PllVtuneCtrl_o,
+	output PllSyncCtrl_o,
+	output PllSync_o,
+	output PllLoopCtrl_o,
+	output DdsX2Fpga_o,
+	output DdsSaw2Fpga_o,
+	output RefOffsetCtrlFpga_o,
+	output GpioAdRfV1_o,
+	output GpioAdRfV2_o,
+	output DdsSaw1Fpga_o
 );
 
 //================================================================================
@@ -70,6 +92,7 @@ module TopSbTmsg
 
 	wire spiDataVal;
 	wire [WORDWIDTH-1:0] spiData;
+	wire [21:0] gpioData;
 	
 	wire busyMosi1;
 	wire busyMosi4;
@@ -95,10 +118,28 @@ module TopSbTmsg
 	
 //================================================================================
 //  ASSIGNMENTS
-
-
-
-
+assign DdsSaw1Fpga_o = gpioData[21];
+assign GpioAdRfV2_o = gpioData[20];
+assign GpioAdRfV1_o = gpioData[19];
+assign RefOffsetCtrlFpga_o = gpioData[18];
+assign DdsSaw2Fpga_o = gpioData[17];
+assign DdsX2Fpga_o = gpioData[16];
+assign PllLoopCtrl_o = gpioData[15];
+assign PllSync_o = gpioData[14];
+assign PllSyncCtrl_o = gpioData[13];
+assign PllVtuneCtrl_o = gpioData[12];
+assign AmAlc1Fix_o = gpioData[11];
+assign SwCap1_o = gpioData[10];
+assign SwCap2_o = gpioData[9];
+assign SwCap3_o = gpioData[8];
+assign AmAlcSw_o = gpioData[7];
+assign SwCap4_o = gpioData[6];
+assign DdsSyncFpga_o = gpioData[5];
+assign DdsResetFpga_o = gpioData[4];
+assign DdsSyncCtrlFpga_o = gpioData[3];
+assign CtrlAmSw3_o = gpioData[2];
+assign RfSw2_o = gpioData[1];
+assign RfSw1_o = gpioData[0];
 
 //================================================================================
 //  CODING
@@ -296,7 +337,7 @@ Max2870Wrapper #(
 	.Mosi_o			()
 );
 
-GpioCtrl GpioCtrl
+Gpio1Ctrl Gpio1Ctrl
 (
 	.Clk_i					(gclk100),
 	.Rst_i					(Rst_i),
@@ -304,7 +345,7 @@ GpioCtrl GpioCtrl
 	.ValGpioDataToFifo_i	(valGpioDataToFifo),
 	.Data_i					(spiData),
 
-	.GpioReg_o				(Gpio_o)
+	.GpioReg_o				(gpioData)
 );