From d087dc4845cd35cdba3f35aed69ffa3df67a82c9 Mon Sep 17 00:00:00 2001 From: gianmarcogirau Date: Tue, 2 Apr 2019 16:52:14 +0100 Subject: [PATCH] ELGIP-45 - Modified the set of instructions leading to an update of the trigger selection register --- .../generic_sequencer/15/doc/generic_sequencer_15.json | 2 +- .../generic_sequencer/15/src/generic_sequencer_15.vhd | 8 ++++---- .../15/src/test/generic_sequencer_15_tb.vhd | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/generic_ip/generic_sequencer/15/doc/generic_sequencer_15.json b/generic_ip/generic_sequencer/15/doc/generic_sequencer_15.json index ddd5298..c49a131 100644 --- a/generic_ip/generic_sequencer/15/doc/generic_sequencer_15.json +++ b/generic_ip/generic_sequencer/15/doc/generic_sequencer_15.json @@ -37,7 +37,7 @@ "minor_number" : { "type" : "c", "bit_len" : "8", - "reset" : "0x11", + "reset" : "0x12", "description" : "Minor number" }, "major_number" : { diff --git a/generic_ip/generic_sequencer/15/src/generic_sequencer_15.vhd b/generic_ip/generic_sequencer/15/src/generic_sequencer_15.vhd index 0b82676..535c0e6 100644 --- a/generic_ip/generic_sequencer/15/src/generic_sequencer_15.vhd +++ b/generic_ip/generic_sequencer/15/src/generic_sequencer_15.vhd @@ -6,14 +6,14 @@ -- Author : Robbie Temple (original) -- Company : Global Inkjet Systems -- Created : 2016-05-12 --- Last update: 2019-03-05 +-- Last update: 2019-04-02 -- SVN ID : Git -- Standard : VHDL'2008 ------------------------------------------------------------------------------- -- Description: -- Generic Sequencer core ------------------------------------------------------------------------------- --- altera vhdl_input_version vhdl_2008 + library ieee; use ieee.std_logic_1164.all; @@ -74,7 +74,7 @@ architecture rtl of generic_sequencer_15 is ----------------------------------------------------------------------------- constant CSR_IP_ID : std_logic_vector(31 downto 0) := x"0000FF01"; - constant CSR_IP_VER : std_logic_vector(31 downto 0) := x"00000F11"; + constant CSR_IP_VER : std_logic_vector(31 downto 0) := x"00000F12"; type fsm_t is (s_idle, s_init, s_fetch, s_decode, -- @@ -494,7 +494,7 @@ begin end if; end process pFSM_CL; - ld_trig_sel <= '1' when decode = '1' and opcode /= CMD_JUMP else '0'; + ld_trig_sel <= '1' when decode = '1' and (opcode = CMD_TRIG_WAIT or opcode = CMD_VEC_RAMP_UP or opcode = CMD_VEC_RAMP_DN) else '0'; -- pSEQ_REGs : process(reset_n, clk) diff --git a/generic_ip/generic_sequencer/15/src/test/generic_sequencer_15_tb.vhd b/generic_ip/generic_sequencer/15/src/test/generic_sequencer_15_tb.vhd index c4d77dd..8c8ddcd 100644 --- a/generic_ip/generic_sequencer/15/src/test/generic_sequencer_15_tb.vhd +++ b/generic_ip/generic_sequencer/15/src/test/generic_sequencer_15_tb.vhd @@ -27,7 +27,7 @@ architecture behav of generic_sequencer_15_tb is constant QUEUE_EN : boolean := true; constant CSR_IP_ID : std_logic_vector(31 downto 0) := x"0000FF01"; - constant CSR_IP_VER : std_logic_vector(31 downto 0) := x"00000F11"; + constant CSR_IP_VER : std_logic_vector(31 downto 0) := x"00000F12"; constant CLK_PERIOD : time := 10 ns;