From 6f591eb21dab606304646dae03c9312046e1f1fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Bron=C3=A8s?= <romain.brones@synchrotron-soleil.fr>
Date: Tue, 30 May 2023 11:24:49 +0200
Subject: [PATCH] Mutliple fixes
* Tie version register
* Import lib
* Copy data input before simulation
---
hdl/top_corr_matrixpi.vhd | 2 ++
rdl/corr_matrixpi.rdl | 2 +-
sim/TestCtrl_e.vhd | 1 +
tcl/main.tcl | 3 +++
4 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/hdl/top_corr_matrixpi.vhd b/hdl/top_corr_matrixpi.vhd
index b6d2e17..e52abc7 100644
--- a/hdl/top_corr_matrixpi.vhd
+++ b/hdl/top_corr_matrixpi.vhd
@@ -87,6 +87,8 @@ begin
po_addrmap => mm_a2l
);
+ mm_l2a.VERSION.data.data <= C_VERSION;
+
------------------
-- UNPACK INPUT --
------------------
diff --git a/rdl/corr_matrixpi.rdl b/rdl/corr_matrixpi.rdl
index 21aee76..148e377 100644
--- a/rdl/corr_matrixpi.rdl
+++ b/rdl/corr_matrixpi.rdl
@@ -23,7 +23,7 @@ addrmap corr_matrixpi {
reg {
desc="Module Version Number.";
default sw = r;
- default hw = r;
+ default hw = rw;
field {} data [32];
} VERSION @0x04;
diff --git a/sim/TestCtrl_e.vhd b/sim/TestCtrl_e.vhd
index 9916b21..aefe157 100644
--- a/sim/TestCtrl_e.vhd
+++ b/sim/TestCtrl_e.vhd
@@ -1,6 +1,7 @@
library ieee ;
use ieee.std_logic_1164.all ;
use ieee.numeric_std.all ;
+ use std.textio.all;
library OSVVM ;
context OSVVM.OsvvmContext ;
diff --git a/tcl/main.tcl b/tcl/main.tcl
index 28436f2..c2ee3f5 100644
--- a/tcl/main.tcl
+++ b/tcl/main.tcl
@@ -58,4 +58,7 @@ proc setSim {} {
set SimTop { \
tc_basic \
}
+
+ # Move data input to project path
+ file copy -force "../sim/reforbit.txt" "../sim/bpmdata.txt" "../sim/respmat.txt" "../sim/corrout.txt" ${::fwfwk::PrjBuildPath}
}
--
GitLab