]> jspc29.x-matter.uni-frankfurt.de Git - trb3.git/commitdiff
nxyter update
authorLudwig Maier <lmaier@crius.e12.ph.tum.de>
Wed, 28 May 2014 20:17:15 +0000 (22:17 +0200)
committerLudwig Maier <lmaier@crius.e12.ph.tum.de>
Tue, 24 Jun 2014 22:26:32 +0000 (00:26 +0200)
nxyter/source/nx_status.vhd
nxyter/source/nxyter_fee_board.vhd

index 364bea720444d1534625fd8aee1fe1d17329cce6..81423cf14ef5f1c5da39082db7dc51347a05a066 100644 (file)
@@ -488,7 +488,7 @@ begin
 
   PLL_RESET_OUT         <= pll_reset_o;
   I2C_SM_RESET_OUT      <= '0' when i2c_sm_reset_o = '1' else 'Z';
-  I2C_REG_RESET_OUT     <= not i2c_reg_reset_o;
+  I2C_REG_RESET_OUT     <= i2c_reg_reset_o;
   NX_ONLINE_OUT         <= online_o;
   
 end Behavioral;
index bf2ab83168894c47d0a43d4a6b2d47d40d62f71c..0d795887593f7dd4a8ff21512c635291c089bcb6 100644 (file)
@@ -349,7 +349,7 @@ begin
       I2C_DATA_IN          => i2c_data,
       I2C_DATA_BYTES_IN    => i2c_data_bytes,
       I2C_LOCK_OUT         => i2c_lock,
-      I2C_REG_RESET_IN     => not i2c_reg_reset_o,
+      I2C_REG_RESET_IN     => i2c_reg_reset_o,
       SPI_COMMAND_OUT      => spi_command,
       SPI_COMMAND_BUSY_IN  => spi_command_busy,
       SPI_DATA_IN          => spi_data,
@@ -793,13 +793,13 @@ begin
 -------------------------------------------------------------------------------
 -- nXyter Signals
 -------------------------------------------------------------------------------
-  NX_RESET_OUT          <= not nx_timestamp_reset_o;
+  NX_RESET_OUT         <= not nx_timestamp_reset_o;
 
 -------------------------------------------------------------------------------
 -- I2C Signals
 -------------------------------------------------------------------------------
 
-  I2C_REG_RESET_OUT   <= i2c_reg_reset_o;
+  I2C_REG_RESET_OUT    <= not i2c_reg_reset_o;
 
 -------------------------------------------------------------------------------
 -- Others