Take version from sourceid

9464d0e8 · Tom Levens · a3dc2ea8 · 9464d0e8 · 9464d0e8
Commit 9464d0e8 authored Feb 24, 2023 by Tom Levens
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 7 deletions

FfpgPkg.vhd hdl/ffpg/rtl/FfpgPkg.vhd +0 -4

FfpgSlave.vhd hdl/ffpg/rtl/FfpgSlave.vhd +4 -3

No files found.
--- a/hdl/ffpg/rtl/FfpgPkg.vhd
+++ b/hdl/ffpg/rtl/FfpgPkg.vhd
@@ -40,10 +40,6 @@ use work.wishbone_pkg.all;

 package FfpgPkg is

-    constant VersionMajor: natural := 2;
-    constant VersionMinor: natural := 0;
-    constant VersionRevision: natural := 0;
-
    type t_Ad5600Interface is record
        FrameSynchronization_n: std_logic;
        SerialClock: std_logic;

--- a/hdl/ffpg/rtl/FfpgSlave.vhd
+++ b/hdl/ffpg/rtl/FfpgSlave.vhd
@@ -47,6 +47,7 @@ use ieee.numeric_std.all;
 use work.FfpgPkg.all;
 use work.ffpg_wbgen2_pkg.all;
 use work.wishbone_pkg.all;
+use work.sourceid_svec_top_ffpg_pkg;

 entity FfpgSlave is
    generic (
@@ -398,8 +399,8 @@ begin
    -- Version information
    ----------------------------------

-    WbRegsInput.version_major_i <= to_unsigned(VersionMajor, WbRegsInput.version_major_i'length);
-    WbRegsInput.version_minor_i <= to_unsigned(VersionMinor, WbRegsInput.version_minor_i'length);
-    WbRegsInput.version_revision_i <= to_unsigned(VersionRevision, WbRegsInput.version_revision_i'length);
+    WbRegsInput.version_major_i <= "00" & unsigned(sourceid_svec_top_ffpg_pkg.version(31 downto 24));
+    WbRegsInput.version_minor_i <= "00" & unsigned(sourceid_svec_top_ffpg_pkg.version(23 downto 16));
+    WbRegsInput.version_revision_i <= unsigned(sourceid_svec_top_ffpg_pkg.version(11 downto 0));

 end architecture;