From 2cce8d216de0fbbcd1e9f0f90c1b313e1b7dad5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Bron=C3=A8s?= <romain.brones@synchrotron-soleil.fr>
Date: Mon, 6 Nov 2023 17:45:08 +0100
Subject: [PATCH] fix: Fix conditionnal generate statement and typo
---
hdl/corr_ll.vhd | 8 +++++---
hdl/top_corr_matrix.vhd | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/hdl/corr_ll.vhd b/hdl/corr_ll.vhd
index d19c68f..cda56f1 100644
--- a/hdl/corr_ll.vhd
+++ b/hdl/corr_ll.vhd
@@ -101,21 +101,23 @@ begin
begin
-- Signal mux for X/Y coef and enable/reset, based on PSCID number
- if I < 51 then
+ gen_x_sigmux:if I < 51 generate
coef_a <= coef_a_x;
coef_b <= coef_b_x;
coef_ic <= coef_ic_x;
coef_d <= coef_d_x;
enable_corr <= enable_corr_x;
reset_corr <= reset_corr_x;
- else
+ end generate;
+
+ gen_y_sigmux:if I > 50 generate
coef_a <= coef_a_y;
coef_b <= coef_b_y;
coef_ic <= coef_ic_y;
coef_d <= coef_d_y;
enable_corr <= enable_corr_y;
reset_corr <= reset_corr_y;
- end if;
+ end generate;
p_main:process(clk, rst_n)
begin
diff --git a/hdl/top_corr_matrix.vhd b/hdl/top_corr_matrix.vhd
index 25a7ed1..365b5c5 100644
--- a/hdl/top_corr_matrix.vhd
+++ b/hdl/top_corr_matrix.vhd
@@ -240,9 +240,9 @@ begin
coef_ic_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.RST_CORR.data(0),
+ reset_corr_x => mm_a2l.CONTROL_X.RST_CORR.data(0),
enable_corr_x => enable_corr_x,
- reset_corr_y => mm_a2l.CONTROL.RST_CORR.data(0),
+ reset_corr_y => mm_a2l.CONTROL_Y.RST_CORR.data(0),
enable_corr_y => enable_corr_y,
-- Corr output
--
GitLab