g_VME_2e generic is false by default. Adjust component and testbench.

710dbc16 · Tristan Gingold · b86ede3d · 710dbc16 · 710dbc16 · 710dbc16
Commit 710dbc16 authored Jun 04, 2020 by Tristan Gingold
Showing with 14 additions and 10 deletions

vme64x_core.vhd hdl/rtl/vme64x_core.vhd +3 -2

vme64x_pkg.vhd hdl/rtl/vme64x_pkg.vhd +1 -0

xvme64x_core.vhd hdl/rtl/xvme64x_core.vhd +2 -1

top_tb.vhd hdl/testbench/simple_tb/top_tb.vhd +8 -7

No files found.
--- a/hdl/rtl/vme64x_core.vhd
+++ b/hdl/rtl/vme64x_core.vhd
@@ -16,6 +16,7 @@ entity vme64x_core is
    g_ENABLE_CR_CSR   : boolean := true;
    g_USER_CSR_EXT    : boolean := false;
    g_VME32           : boolean := true;
+    g_VME_2e          : boolean := False;
    g_WB_GRANULARITY  : t_wishbone_address_granularity;
    g_MANUFACTURER_ID : std_logic_vector(23 downto 0);
    g_BOARD_ID        : std_logic_vector(31 downto 0);
@@ -117,6 +118,7 @@ begin
      g_VME32            => g_VME32,
      g_WB_GRANULARITY   => g_WB_GRANULARITY,
      g_WB_MODE          => CLASSIC,
+      g_VME_2e           => g_VME_2e,
      g_MANUFACTURER_ID  => g_MANUFACTURER_ID,
      g_BOARD_ID         => g_BOARD_ID,
      g_REVISION_ID      => g_REVISION_ID,
@@ -205,4 +207,3 @@ begin
      user_cr_addr_o  => user_cr_addr_o,
      user_cr_data_i  => user_cr_data_i);
 end unwrap;
-
--- a/hdl/rtl/vme64x_pkg.vhd
+++ b/hdl/rtl/vme64x_pkg.vhd
@@ -199,6 +199,7 @@ package vme64x_pkg is
      g_VME32           : boolean := True;
      g_VME_2e          : boolean := True;
      g_WB_GRANULARITY  : t_wishbone_address_granularity;
+      g_WB_MODE         : t_wishbone_interface_mode := CLASSIC;

      g_MANUFACTURER_ID : std_logic_vector(23 downto 0);
      g_BOARD_ID        : std_logic_vector(31 downto 0);

--- a/hdl/rtl/xvme64x_core.vhd
+++ b/hdl/rtl/xvme64x_core.vhd
@@ -64,7 +64,8 @@ entity xvme64x_core is
    g_VME32           : boolean := True;

    --  If True, supports 2eSST.
-    g_VME_2e          : boolean := True;
+    --  Do not forget to assign g_DECODER if set to True.
+    g_VME_2e          : boolean := False;

    -- Address granularity on the WB bus. Value can be:
    -- WORD: VME address bits 31:2 are translated to WB address bits 29:0,

--- a/hdl/testbench/simple_tb/top_tb.vhd
+++ b/hdl/testbench/simple_tb/top_tb.vhd
@@ -270,6 +270,7 @@ begin
                 g_DECODE_AM => (g_SCENARIO /= 9),
                 g_WB_GRANULARITY => WORD,
                 g_USER_CSR_EXT   => false,
+                 g_VME_2e         => True,

                 g_MANUFACTURER_ID => c_CERN_ID,
                 g_BOARD_ID        => c_SVEC_ID,