From 339f8c05d255e7fbd35c0642adc322d640aa640f Mon Sep 17 00:00:00 2001 From: gianmarcogirau Date: Fri, 15 May 2020 11:39:10 +0100 Subject: [PATCH] ELGIP-91 - Added input triggers to synchronize operations during in-line merge --- .../fire_pulse_manager/6/doc/fpm_ctrl_6.json | 2 +- .../fire_pulse_manager/6/src/fire_pulse_ctrl_6.vhd | 4 ++-- .../6/src/fire_pulse_manager_6.vhd | 6 +++++- .../pulse_generator/3/doc/pulse_generator_3.json | 2 +- .../pulse_generator/3/src/pulse_generator_3.vhd | 14 ++++++++------ 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/generic_ip/fire_pulse_manager/6/doc/fpm_ctrl_6.json b/generic_ip/fire_pulse_manager/6/doc/fpm_ctrl_6.json index 26f8f71..3a18c70 100644 --- a/generic_ip/fire_pulse_manager/6/doc/fpm_ctrl_6.json +++ b/generic_ip/fire_pulse_manager/6/doc/fpm_ctrl_6.json @@ -36,7 +36,7 @@ "minor_number" : { "type" : "c", "bit_len" : "8", - "reset" : "0x01", + "reset" : "0x02", "description" : "Minor number" }, "major_number" : { diff --git a/generic_ip/fire_pulse_manager/6/src/fire_pulse_ctrl_6.vhd b/generic_ip/fire_pulse_manager/6/src/fire_pulse_ctrl_6.vhd index b2806a1..59e211d 100644 --- a/generic_ip/fire_pulse_manager/6/src/fire_pulse_ctrl_6.vhd +++ b/generic_ip/fire_pulse_manager/6/src/fire_pulse_ctrl_6.vhd @@ -6,7 +6,7 @@ -- Author : Gianmarco Girau -- Company : Global Inkjet Systems -- Created : 2017-09-06 --- Last update: 2020-04-17 +-- Last update: 2020-05-15 -- SVN ID : Git -- Standard : VHDL'08 ------------------------------------------------------------------------------- @@ -64,7 +64,7 @@ architecture rtl of fire_pulse_ctrl_6 is -- Control & Status Registers Map ----------------------------------------------------------------------------- constant CSR_IP_ID : std_logic_vector(31 downto 0) := x"0000FF14"; - constant CSR_IP_VER : std_logic_vector(31 downto 0) := x"00000601"; + constant CSR_IP_VER : std_logic_vector(31 downto 0) := x"00000602"; ----------------------------------------------------------------------------- -- Constants, Signals diff --git a/generic_ip/fire_pulse_manager/6/src/fire_pulse_manager_6.vhd b/generic_ip/fire_pulse_manager/6/src/fire_pulse_manager_6.vhd index f3b83e4..bf838b9 100644 --- a/generic_ip/fire_pulse_manager/6/src/fire_pulse_manager_6.vhd +++ b/generic_ip/fire_pulse_manager/6/src/fire_pulse_manager_6.vhd @@ -6,7 +6,7 @@ -- Author : Gianmarco Girau -- Company : Global Inkjet Systems -- Created : 2017-09-06 --- Last update: 2020-04-20 +-- Last update: 2020-05-15 -- SVN ID : Git -- Standard : VHDL'08 ------------------------------------------------------------------------------- @@ -50,6 +50,8 @@ entity fire_pulse_manager_6 is seb_epd_pd : in std_logic; fire_pulse : out std_logic_vector(32*CH_NUM - 1 downto 0); start_of_image : out std_logic_vector(32*CH_NUM - 1 downto 0); + stream_busy_a : in std_logic_vector(CH_NUM - 1 downto 0) := (others => '0'); + stream_busy_b : in std_logic_vector(CH_NUM - 1 downto 0) := (others => '0'); dp_dir_out : out std_logic_vector(CH_NUM - 1 downto 0); abs_pos_out : out std_logic_vector(31 downto 0); print_start : out std_logic; @@ -501,6 +503,8 @@ begin dp_dir => dp_dir(i), fire_req_vec => ch_fire_pulse(i), start_of_image_vec => ch_start_of_image(i), + stream_busy_a => stream_busy_a(i), + stream_busy_b => stream_busy_b(i), ch_pd => ch_pd(i), ch_mask => ch_mask(i), raw_fire_req => ch_raw_pulse(i), diff --git a/generic_ip/pulse_generator/3/doc/pulse_generator_3.json b/generic_ip/pulse_generator/3/doc/pulse_generator_3.json index 039dda4..4d3e92c 100644 --- a/generic_ip/pulse_generator/3/doc/pulse_generator_3.json +++ b/generic_ip/pulse_generator/3/doc/pulse_generator_3.json @@ -50,7 +50,7 @@ "minor_number" : { "type" : "c", "bit_len" : "8", - "reset" : "0x01", + "reset" : "0x02", "description" : "Minor number" }, "major_number" : { diff --git a/generic_ip/pulse_generator/3/src/pulse_generator_3.vhd b/generic_ip/pulse_generator/3/src/pulse_generator_3.vhd index 95e30d3..3cc209e 100644 --- a/generic_ip/pulse_generator/3/src/pulse_generator_3.vhd +++ b/generic_ip/pulse_generator/3/src/pulse_generator_3.vhd @@ -6,7 +6,7 @@ -- Author : Gianmarco Girau -- Company : Global Inkjet Systems -- Created : 2016-10-24 --- Last update: 2020-04-16 +-- Last update: 2020-05-15 -- SVN ID : Git -- Standard : VHDL'93 ------------------------------------------------------------------------------- @@ -53,6 +53,8 @@ entity pulse_generator_3 is dp_dir : out std_logic; fire_req_vec : out std_logic_vector(31 downto 0); start_of_image_vec : out std_logic_vector(31 downto 0); + stream_busy_a : in std_logic := '0'; + stream_busy_b : in std_logic := '0'; -- diagnostic outputs filtered_pd : out std_logic; ch_pd : out std_logic; @@ -91,7 +93,7 @@ architecture rtl of pulse_generator_3 is -- constants constant CSR_IP_ID : std_logic_vector(31 downto 0) := x"0000FF13"; - constant CSR_IP_VER : std_logic_vector(31 downto 0) := x"00000301"; + constant CSR_IP_VER : std_logic_vector(31 downto 0) := x"00000302"; signal init_de, init_qd, enable, loc_pd, pd_queue_error : std_logic; signal ch_ctrl_start_req, pd_pulse, filt_pd, filt_pd_d : std_logic; @@ -129,8 +131,8 @@ architecture rtl of pulse_generator_3 is signal add_delay_eq_reg, add_diag_reg : std_logic; -- signal abs_pos_msb_old : std_logic_vector( 1 downto 0); - signal ch_ctrl_csr_addr, ch_ctrl_trigger_in : std_logic_vector( 3 downto 0); - signal wh_corr_ready_v : std_logic_vector( 5 downto 0); + signal ch_ctrl_csr_addr : std_logic_vector( 3 downto 0); + signal wh_corr_ready_v, ch_ctrl_trigger_in : std_logic_vector( 5 downto 0); signal avs_addr : std_logic_vector( 4 downto 0); signal subpix_phase_cnt, subpixel_phase_num : std_logic_vector( 5 downto 0); signal init_v : std_logic_vector( 7 downto 0); @@ -326,7 +328,7 @@ begin i_channel_control : entity work.generic_sequencer_16 generic map ( - TRIGGER_WIDTH => 4, + TRIGGER_WIDTH => 6, VECTOR_WIDTH => 24, BUS_WIDTH => 32, POS_WIDTH => 24, @@ -361,7 +363,7 @@ begin bus_valid => seq_bus_valid, bus_ack => '1'); - ch_ctrl_trigger_in <= (0 => loc_pd, 1 => fire_enable, 2 => gated_pulse, 3 => (not fire_enable)); + ch_ctrl_trigger_in <= (0 => loc_pd, 1 => fire_enable, 2 => gated_pulse, 3 => (not fire_enable), 4 => stream_busy_a, 5 => stream_busy_b); ch_mask_i <= fire_enable or ch_ctrl_vector_out(1) or bypass_ch_ctrl;