fix a bug in ADC code when switching off PSA

diff --git a/ADC/source/adc_processor.vhd b/ADC/source/adc_processor.vhd
index 1f8297e0ba588d9ffed5a03d42a7944917e4006d..7751880b14cab5557a0cd92521a1aebe094c615d 100644 (file)
--- a/ADC/source/adc_processor.vhd
+++ b/ADC/source/adc_processor.vhd
@@ -710,6 +710,7 @@ begin
   psa_clear            <= '0';
   psa_enable           <= '1';
   RDO_write_psa        <= '0';
+  RDO_data_psa         <= (others => '0');
   case psa_state is
     when PSA_IDLE =>
       channel        := 0;

diff --git a/ADC/trb3_periph_adc.prj b/ADC/trb3_periph_adc.prj
index cac1d077741259f7f22b120a7a22c416e8da8dfb..d993355268357764827140b856bad0a740501798 100644 (file)
--- a/ADC/trb3_periph_adc.prj
+++ b/ADC/trb3_periph_adc.prj
@@ -132,7 +132,7 @@ add_file -vhdl -lib work "../../trbnet/special/spi_flash_and_fpga_reload.vhd"
 add_file -vhdl -lib work "../../trbnet/special/spi_slim.vhd"
 add_file -vhdl -lib work "../../trbnet/special/spi_master.vhd"
 add_file -vhdl -lib work "../../trbnet/special/spi_databus_memory.vhd"
-add_file -vhdl -lib work "../../trbnet/special/spi_ltc2600.vhd"
+add_file -vhdl -lib work "../../trbnet/special/spi_ltc2600_singleoutput.vhd"
 add_file -vhdl -lib work "../../trbnet/optical_link/f_divider.vhd"
 
 add_file -vhdl -lib work "../../trbnet/media_interfaces/ecp3_sfp/sfp_1_200_int.vhd"

diff --git a/ADC/trb3_periph_adc.vhd b/ADC/trb3_periph_adc.vhd
index eacb02cad3dbd2714ae6626aa803278f0ddac1cf..e9da475e4021be881a38e033fb22f99f1d17df3d 100644 (file)
--- a/ADC/trb3_periph_adc.vhd
+++ b/ADC/trb3_periph_adc.vhd
@@ -226,12 +226,12 @@ begin
       MED_READ_IN        => '1',
       REFCLK2CORE_OUT    => open,
       --SFP Connection
-      SD_RXD_P_IN        => SERDES_INT_RX(2),
-      SD_RXD_N_IN        => SERDES_INT_RX(3),
-      SD_TXD_P_OUT       => SERDES_INT_TX(2),
-      SD_TXD_N_OUT       => SERDES_INT_TX(3),
-      SD_REFCLK_P_IN     => open,
-      SD_REFCLK_N_IN     => open,
+--       SD_RXD_P_IN        => SERDES_INT_RX(2),
+--       SD_RXD_N_IN        => SERDES_INT_RX(3),
+--       SD_TXD_P_OUT       => SERDES_INT_TX(2),
+--       SD_TXD_N_OUT       => SERDES_INT_TX(3),
+--       SD_REFCLK_P_IN     => open,
+--       SD_REFCLK_N_IN     => open,
       SD_PRSNT_N_IN      => FPGA5_COMM(0),
       SD_LOS_IN          => FPGA5_COMM(0),
       SD_TXDIS_OUT       => FPGA5_COMM(2),
@@ -432,7 +432,7 @@ THE_SPI_RELOAD : entity work.spi_flash_and_fpga_reload
 -- SPI
 -------------------------------------------------------------------------------
 
-  FPGA_SPI : spi_ltc2600
+  FPGA_SPI : entity work.spi_ltc2600
     generic map (
       BITS       => 32,
       WAITCYCLES => 15)