From 81a6112379c0623806f1cd271634b25f1d2b3c3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Bron=C3=A8s?= <romain.brones@synchrotron-soleil.fr>
Date: Wed, 23 Oct 2024 15:44:33 +0200
Subject: [PATCH] fix: fall back on coeff C name in RDL
* Avoid breaking compatibility...
---
hdl/top_corr_matrix.vhd | 8 ++++----
rdl/corr_matrix.rdl | 16 ++++++++--------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/hdl/top_corr_matrix.vhd b/hdl/top_corr_matrix.vhd
index a963123..773190f 100644
--- a/hdl/top_corr_matrix.vhd
+++ b/hdl/top_corr_matrix.vhd
@@ -237,11 +237,11 @@ begin
-- Corr coefs
coef_a_x => signed(mm_a2l.CORR_K1A_X.data.data),
coef_b_x => signed(mm_a2l.CORR_K1B_X.data.data),
- coef_c_x => signed(mm_a2l.CORR_K1C_X.data.data),
+ coef_c_x => signed(mm_a2l.CORR_K1IC_X.data.data),
coef_d_x => signed(mm_a2l.CORR_K1D_X.data.data),
coef_a_y => signed(mm_a2l.CORR_K1A_Y.data.data),
coef_b_y => signed(mm_a2l.CORR_K1B_Y.data.data),
- coef_c_y => signed(mm_a2l.CORR_K1C_Y.data.data),
+ coef_c_y => signed(mm_a2l.CORR_K1IC_Y.data.data),
coef_d_y => signed(mm_a2l.CORR_K1D_Y.data.data),
reset_corr_x => mm_a2l.CONTROL_X.RST_CORR.data(0),
@@ -269,11 +269,11 @@ begin
-- Corr coefs
coef_a_x => signed(mm_a2l.CORR_K2A_X.data.data),
coef_b_x => signed(mm_a2l.CORR_K2B_X.data.data),
- coef_c_x => signed(mm_a2l.CORR_K2C_X.data.data),
+ coef_c_x => signed(mm_a2l.CORR_K2IC_X.data.data),
coef_d_x => signed(mm_a2l.CORR_K2D_X.data.data),
coef_a_y => signed(mm_a2l.CORR_K2A_Y.data.data),
coef_b_y => signed(mm_a2l.CORR_K2B_Y.data.data),
- coef_c_y => signed(mm_a2l.CORR_K2C_Y.data.data),
+ coef_c_y => signed(mm_a2l.CORR_K2IC_Y.data.data),
coef_d_y => signed(mm_a2l.CORR_K2D_Y.data.data),
reset_corr_x => mm_a2l.CONTROL_X.RST_CORR.data(0),
diff --git a/rdl/corr_matrix.rdl b/rdl/corr_matrix.rdl
index 1a5f91c..866206b 100644
--- a/rdl/corr_matrix.rdl
+++ b/rdl/corr_matrix.rdl
@@ -67,10 +67,10 @@ addrmap corr_matrix {
} CORR_K1B_X;
reg {
- desc="Correction coefficient C.";
+ desc="Correction coefficient (inverse) C.";
desyrdl_data_type="int32";
field {sw = rw; hw = r;} data[`C_W_COR_COEF];
- } CORR_K1C_X;
+ } CORR_K1IC_X;
reg {
desc="Correction coefficient D.";
@@ -92,10 +92,10 @@ addrmap corr_matrix {
} CORR_K2B_X;
reg {
- desc="Correction coefficient C.";
+ desc="Correction coefficient (inverse) C.";
desyrdl_data_type="int32";
field {sw = rw; hw = r;} data[`C_W_COR_COEF];
- } CORR_K2C_X;
+ } CORR_K2IC_X;
reg {
desc="Correction coefficient D.";
@@ -116,10 +116,10 @@ addrmap corr_matrix {
} CORR_K1B_Y;
reg {
- desc="Correction coefficient C.";
+ desc="Correction coefficient (inverse) C.";
desyrdl_data_type="int32";
field {sw = rw; hw = r;} data[`C_W_COR_COEF];
- } CORR_K1C_Y;
+ } CORR_K1IC_Y;
reg {
desc="Correction coefficient D.";
@@ -141,10 +141,10 @@ addrmap corr_matrix {
} CORR_K2B_Y;
reg {
- desc="Correction coefficient C.";
+ desc="Correction coefficient (inverse) C.";
desyrdl_data_type="int32";
field {sw = rw; hw = r;} data[`C_W_COR_COEF];
- } CORR_K2C_Y;
+ } CORR_K2IC_Y;
reg {
desc="Correction coefficient D.";
--
GitLab