diff --git a/rdl/corr_matrix.rdl b/rdl/corr_matrix.rdl index 59a4356773efc30eace19a5a206c5b70702904ee..57e31d5018bb5c9ea2b73f1275fa88ceb55c8153 100644 --- a/rdl/corr_matrix.rdl +++ b/rdl/corr_matrix.rdl @@ -56,83 +56,99 @@ addrmap corr_matrix { reg { desc="Correction coefficient A."; + desyrdl_data_type="int32"; field {sw = rw; hw = r;} data[`C_W_COR_COEF]; } CORR_K1A_X; reg { desc="Correction coefficient B."; + desyrdl_data_type="int32"; field {sw = rw; hw = r;} data[`C_W_COR_COEF]; } CORR_K1B_X; reg { desc="Correction coefficient (inverse) C."; + desyrdl_data_type="int32"; field {sw = rw; hw = r;} data[`C_W_COR_COEF]; } CORR_K1IC_X; reg { desc="Correction coefficient D."; + desyrdl_data_type="int32"; field {sw = rw; hw = r;} data[`C_W_COR_COEF]; } CORR_K1D_X; reg { desc="Correction coefficient A."; + desyrdl_data_type="int32"; field {sw = rw; hw = r;} data[`C_W_COR_COEF]; } CORR_K2A_X; reg { desc="Correction coefficient B."; + desyrdl_data_type="int32"; field {sw = rw; hw = r;} data[`C_W_COR_COEF]; } CORR_K2B_X; reg { desc="Correction coefficient (inverse) C."; + desyrdl_data_type="int32"; field {sw = rw; hw = r;} data[`C_W_COR_COEF]; } CORR_K2IC_X; reg { desc="Correction coefficient D."; + desyrdl_data_type="int32"; field {sw = rw; hw = r;} data[`C_W_COR_COEF]; } CORR_K2D_X; reg { desc="Correction coefficient A."; + desyrdl_data_type="int32"; field {sw = rw; hw = r;} data[`C_W_COR_COEF]; } CORR_K1A_Y; reg { desc="Correction coefficient B."; + desyrdl_data_type="int32"; field {sw = rw; hw = r;} data[`C_W_COR_COEF]; } CORR_K1B_Y; reg { desc="Correction coefficient (inverse) C."; + desyrdl_data_type="int32"; field {sw = rw; hw = r;} data[`C_W_COR_COEF]; } CORR_K1IC_Y; reg { desc="Correction coefficient D."; + desyrdl_data_type="int32"; field {sw = rw; hw = r;} data[`C_W_COR_COEF]; } CORR_K1D_Y; reg { desc="Correction coefficient A."; + desyrdl_data_type="int32"; field {sw = rw; hw = r;} data[`C_W_COR_COEF]; } CORR_K2A_Y; reg { desc="Correction coefficient B."; + desyrdl_data_type="int32"; field {sw = rw; hw = r;} data[`C_W_COR_COEF]; } CORR_K2B_Y; reg { desc="Correction coefficient (inverse) C."; + desyrdl_data_type="int32"; field {sw = rw; hw = r;} data[`C_W_COR_COEF]; } CORR_K2IC_Y; reg { desc="Correction coefficient D."; + desyrdl_data_type="int32"; field {sw = rw; hw = r;} data[`C_W_COR_COEF]; } CORR_K2D_Y; @@ -143,12 +159,14 @@ addrmap corr_matrix { mem { desc = "X Reference orbit."; + desyrdl_data_type="int32"; memwidth = 32; mementries = 2**`C_W_MM_IDCNT; } external REFORBITX; mem { desc = "Y Reference orbit."; + desyrdl_data_type="int32"; memwidth = 32; mementries = 2**`C_W_MM_IDCNT; } external REFORBITY; @@ -162,12 +180,14 @@ addrmap corr_matrix { mem { desc = "Matrix multiplication coefficients."; + desyrdl_data_type="int32"; memwidth = 32; mementries = 2**`C_W_MM_IDCNT; } external MATRIXCOEF[`C_N_MM_PSC]; mem { desc = "X Average orbit error"; + desyrdl_data_type="int32"; sw=r; memwidth = 32; mementries = 2**`C_W_MM_IDCNT; @@ -175,6 +195,7 @@ addrmap corr_matrix { mem { desc = "Y Average orbit error"; + desyrdl_data_type="int32"; sw=r; memwidth = 32; mementries = 2**`C_W_MM_IDCNT; @@ -182,6 +203,7 @@ addrmap corr_matrix { mem { desc = "Average correction, both planes"; + desyrdl_data_type="int32"; sw=r; memwidth = 32; mementries = 2**`C_W_PSCID;