From: Ludwig Maier Date: Wed, 28 May 2014 20:17:15 +0000 (+0200) Subject: nxyter update X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=98c9600de34619c7f99e4afbe9db8485e27e3ac0;p=trb3.git nxyter update --- diff --git a/nxyter/source/nx_status.vhd b/nxyter/source/nx_status.vhd index 364bea7..81423cf 100644 --- a/nxyter/source/nx_status.vhd +++ b/nxyter/source/nx_status.vhd @@ -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; diff --git a/nxyter/source/nxyter_fee_board.vhd b/nxyter/source/nxyter_fee_board.vhd index bf2ab83..0d79588 100644 --- a/nxyter/source/nxyter_fee_board.vhd +++ b/nxyter/source/nxyter_fee_board.vhd @@ -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