ELGIP-25 SMB-106 - Pulse Generator Minor update: enabled Support for End-and-Queue instructions in ChCtrl sequencer. PD Queue size is now exposed as a generic (default value = 64)
This commit is contained in:
parent
4a42477b4b
commit
49ac98c0bb
2 changed files with 13 additions and 12 deletions
|
|
@ -50,7 +50,7 @@
|
|||
"minor_number" : {
|
||||
"type" : "c",
|
||||
"bit_len" : "8",
|
||||
"reset" : "0x00",
|
||||
"reset" : "0x01",
|
||||
"description" : "Minor number"
|
||||
},
|
||||
"major_number" : {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
-- Author : Gianmarco Girau
|
||||
-- Company : Global Inkjet Systems
|
||||
-- Created : 2016-10-24
|
||||
-- Last update: 2018-10-08
|
||||
-- Last update: 2018-12-20
|
||||
-- SVN ID : Git
|
||||
-- Standard : VHDL'93
|
||||
-------------------------------------------------------------------------------
|
||||
|
|
@ -31,8 +31,9 @@ use work.pulse_generator_1_pkg.all;
|
|||
|
||||
entity pulse_generator_1 is
|
||||
generic(
|
||||
pulse_delay_equal_en : boolean := true;
|
||||
out_pulse_condition : boolean := true);
|
||||
PD_QUEUE_SIZE : natural range 32 to 1024 := 64;
|
||||
PULSE_DELAY_EQUAL_EN : boolean := true;
|
||||
OUT_PULSE_CONDITION : boolean := true);
|
||||
port(
|
||||
clk : in std_logic;
|
||||
reset_n : in std_logic := '1';
|
||||
|
|
@ -65,7 +66,7 @@ architecture rtl of pulse_generator_1 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"00000001";
|
||||
constant CSR_IP_VER : std_logic_vector(31 downto 0) := x"00000101";
|
||||
|
||||
|
||||
signal init_de, init_qd, enable, loc_pd, pd_queue_error : std_logic;
|
||||
|
|
@ -188,7 +189,7 @@ begin
|
|||
iPD_queue: entity work.queue_and_delay_1
|
||||
generic map (
|
||||
use_ext_time => true,
|
||||
queue_size => 128)
|
||||
queue_size => 2*PD_QUEUE_SIZE)
|
||||
port map (
|
||||
rstN => reset_n,
|
||||
clk => clk,
|
||||
|
|
@ -248,7 +249,6 @@ begin
|
|||
-- Sequencer outputs
|
||||
-- - Gating signal (ch_mask)
|
||||
|
||||
--i_channel_control : entity work.emb_generic_sequencer
|
||||
i_channel_control : entity work.generic_sequencer_15
|
||||
generic map (
|
||||
TRIGGER_WIDTH => 4,
|
||||
|
|
@ -260,7 +260,8 @@ begin
|
|||
VECT_RAMP_EN => false,
|
||||
BUS_BURST_EN => false,
|
||||
POS_BUS_EN => true,
|
||||
ALU_EN => false)
|
||||
ALU_EN => false,
|
||||
QUEUE_EN => true)
|
||||
port map (
|
||||
clk => clk,
|
||||
reset_n => reset_n,
|
||||
|
|
@ -389,7 +390,7 @@ begin
|
|||
|
||||
-- compendate for variation in the channel delay when daisy-chaining multiple
|
||||
-- EMBs/HMBs:
|
||||
gPULSE_DELAY_EQUAL: if pulse_delay_equal_en = true generate
|
||||
gPULSE_DELAY_EQUAL: if PULSE_DELAY_EQUAL_EN = true generate
|
||||
iDE: entity work.queue_and_delay_1
|
||||
generic map (
|
||||
use_ext_time => false,
|
||||
|
|
@ -409,7 +410,7 @@ begin
|
|||
|
||||
end generate gPULSE_DELAY_EQUAL;
|
||||
|
||||
gNOT_PULSE_DELAY_EQUAL: if pulse_delay_equal_en = false generate
|
||||
gNOT_PULSE_DELAY_EQUAL: if PULSE_DELAY_EQUAL_EN = false generate
|
||||
|
||||
retimed_pulse <= gated_pulse;
|
||||
|
||||
|
|
@ -463,7 +464,7 @@ begin
|
|||
-- Pulse Width Conditioning
|
||||
-----------------------------------------------------------------------------
|
||||
|
||||
gOUT_COND: if out_pulse_condition = true generate
|
||||
gOUT_COND: if OUT_PULSE_CONDITION = true generate
|
||||
|
||||
iPC: entity work.pulse_conditioning_1
|
||||
port map (
|
||||
|
|
@ -481,7 +482,7 @@ begin
|
|||
|
||||
end generate gOUT_COND;
|
||||
|
||||
gOUT_BYPASS : if out_pulse_condition = false generate
|
||||
gOUT_BYPASS : if OUT_PULSE_CONDITION = false generate
|
||||
|
||||
pulse_out <= pulse_out_i;
|
||||
fire_req <= pulse_out_ii;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue