[roc] Update SC registers

Author: kostorr

include/ReadoutCard/Cru.h

@@ -50,16 +50,16 @@ static constexpr uint32_t GBT_STREAMING(0x0);
 
 namespace ScRegisters
 {
-static constexpr Register SC_BASE_INDEX(0x00f00000);
+static constexpr Register SC_BASE_INDEX(0x00000000);
 
-static constexpr Register SCA_WR_DATA(0x00f00000);
-static constexpr Register SCA_WR_CMD(0x00f00004);
-static constexpr Register SCA_WR_CTRL(0x00f00008);
+static constexpr Register SCA_WR_DATA(0x00000000);
+static constexpr Register SCA_WR_CMD(0x00000004);
+static constexpr Register SCA_WR_CTRL(0x00000008);
 
-static constexpr Register SCA_RD_DATA(0x00f00010);
-static constexpr Register SCA_RD_CMD(0x00f00014);
-static constexpr Register SCA_RD_CTRL(0x00f00018);
-static constexpr Register SCA_RD_MON(0x00f0001c);
+static constexpr Register SCA_RD_DATA(0x00000010);
+static constexpr Register SCA_RD_CMD(0x00000014);
+static constexpr Register SCA_RD_CTRL(0x00000018);
+static constexpr Register SCA_RD_MON(0x0000001c); //unused
 
 static constexpr Register SCA_MFT_PSU_DATA(0x00f00000);
 static constexpr Register SCA_MFT_PSU_CMD(0x00f00004);
@@ -68,20 +68,25 @@ static constexpr Register SCA_MFT_PSU_RESET(0x00f0000c);
 static constexpr Register SCA_MFT_PSU_MASTER_SLAVE(0x00f0003c);
 static constexpr Register SCA_MFT_PSU_ID(0x00f0001c);
 
-static constexpr Register SC_LINK(0x00f00078);
-static constexpr Register SC_RESET(0x00f0007c);
+static constexpr Register SC_LINK(0x00000078);
+static constexpr Register SC_RESET(0x0000007c);
 
-static constexpr Register SWT_WR_WORD_L(0x00f00040);
-static constexpr Register SWT_WR_WORD_M(0x00f00044);
-static constexpr Register SWT_WR_WORD_H(0x00f00048);
+static constexpr Register SWT_WR_WORD_L(0x00000040);
+static constexpr Register SWT_WR_WORD_M(0x00000044);
+static constexpr Register SWT_WR_WORD_H(0x00000048);
 
-static constexpr Register SWT_RD_WORD_L(0x00f00050);
-static constexpr Register SWT_RD_WORD_M(0x00f00054);
-static constexpr Register SWT_RD_WORD_H(0x00f00058);
+static constexpr Register SWT_RD_WORD_L(0x00000050);
+static constexpr Register SWT_RD_WORD_M(0x00000054);
+static constexpr Register SWT_RD_WORD_H(0x00000058);
 
-static constexpr Register SWT_CMD(0x00f0004c);
-static constexpr Register SWT_MON(0x00f0005c);
-static constexpr Register SWT_WORD_MON(0x00f00060);
+static constexpr Register SWT_CMD(0x0000004c); //unused
+static constexpr Register SWT_MON(0x0000005c);
+static constexpr Register SWT_WORD_MON(0x00000060); //unused
+
+static constexpr Register IC_WR_CFG(0x00000024);
+static constexpr Register IC_WR_DATA(0x00000020);
+static constexpr Register IC_WR_CMD(0x00000028);
+static constexpr Register IC_RD_DATA(0x00000030);
 } // namespace ScRegisters
 
 } // namespace Cru

src/Cru/cru_constants_populate.py

@@ -146,6 +146,12 @@
 'add_gbt_swt_mon':'SWT_MON',
 'add_gbt_swt_word_mon':'SWT_WORD_MON',
 
+### IC ###
+'add_gbt_ic_wr_data':'IC_WR_DATA',
+'add_gbt_ic_wr_cfg':'IC_WR_CFG',
+'add_gbt_ic_wr_cmd':'IC_WR_CMD',
+'add_gbt_ic_rd_data':'IC_RD_DATA',
+
 ### USER LOGIC ###
 'add_user_logic_reset':'USER_LOGIC_RESET',
 'add_user_logic_eventsize':'USER_LOGIC_EVSIZE',

src/Cru/pack_cru_core.vhd

@@ -93,7 +93,7 @@ constant add_serial_flash_csr                   : unsigned(31 downto 0):=X"00A0_
 constant add_serial_flash_wr_rst                : unsigned(31 downto 0):=X"00B0_0000";
 constant add_userlogic    		        : unsigned(31 downto 0):=X"00C0_0000";
 constant add_ddg	                        : unsigned(31 downto 0):=X"00D0_0000";
-constant add_gbt_sc	        		: unsigned(31 downto 0):=X"00F0_0000";
+constant add_gbt_sc	        		: unsigned(31 downto 0):=X"0000_0000";
 -------------------------------------------------------------------------------
 -- Redaout protocol address tables
 -------------------------------------------------------------------------------
@@ -159,6 +159,7 @@ constant add_gbt_sca_rd_data        		: unsigned(31 downto 0):=add_gbt_sc+X"0000
 constant add_gbt_sca_rd_cmd        		: unsigned(31 downto 0):=add_gbt_sc+X"0000_0014";
 constant add_gbt_sca_rd_ctr        		: unsigned(31 downto 0):=add_gbt_sc+X"0000_0018";
 constant add_gbt_sca_rd_mon        		: unsigned(31 downto 0):=add_gbt_sc+X"0000_001c";
+
 -- IC
 constant add_gbt_ic_wr_data        		: unsigned(31 downto 0):=add_gbt_sc+X"0000_0020";
 constant add_gbt_ic_wr_cfg        		: unsigned(31 downto 0):=add_gbt_sc+X"0000_0024";