Merge remote-tracking branch 'remotes/origin/master' into 1.10013.px_buf_diag_writes
This commit is contained in:
commit
ff61a8bf11
3 changed files with 32 additions and 21 deletions
|
|
@ -6,7 +6,7 @@
|
|||
-- Author : Gianmarco Girau
|
||||
-- Company : Global Inkjet Systems
|
||||
-- Created : 2017-09-06
|
||||
-- Last update: 2020-05-15
|
||||
-- Last update: 2020-05-19
|
||||
-- SVN ID : Git
|
||||
-- Standard : VHDL'08
|
||||
-------------------------------------------------------------------------------
|
||||
|
|
@ -488,6 +488,7 @@ begin
|
|||
generic map(
|
||||
PD_QUEUE_SIZE => PD_QUEUE_SIZE,
|
||||
PULSE_DELAY_EQUAL_EN => PULSE_DELAY_EQUAL_EN,
|
||||
SPITTING_EN => false,
|
||||
BIDIR_CH_OFFSET_EN => false,
|
||||
DIAG_COUNTERS => true,
|
||||
TOF_COMP_EN => TOF_COMP_EN,
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
"minor_number" : {
|
||||
"type" : "c",
|
||||
"bit_len" : "8",
|
||||
"reset" : "0x02",
|
||||
"reset" : "0x03",
|
||||
"description" : "Minor number"
|
||||
},
|
||||
"major_number" : {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
-- Author : Gianmarco Girau
|
||||
-- Company : Global Inkjet Systems
|
||||
-- Created : 2016-10-24
|
||||
-- Last update: 2020-05-15
|
||||
-- Last update: 2020-05-19
|
||||
-- SVN ID : Git
|
||||
-- Standard : VHDL'93
|
||||
-------------------------------------------------------------------------------
|
||||
|
|
@ -36,6 +36,7 @@ entity pulse_generator_3 is
|
|||
generic(
|
||||
PD_QUEUE_SIZE : natural range 32 to 1024 := 64;
|
||||
PULSE_DELAY_EQUAL_EN : boolean := true;
|
||||
SPITTING_EN : boolean := true;
|
||||
BIDIR_CH_OFFSET_EN : boolean := true;
|
||||
DIAG_COUNTERS : boolean := true;
|
||||
TOF_COMP_EN : boolean := false;
|
||||
|
|
@ -93,7 +94,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"00000302";
|
||||
constant CSR_IP_VER : std_logic_vector(31 downto 0) := x"00000303";
|
||||
|
||||
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;
|
||||
|
|
@ -336,7 +337,7 @@ begin
|
|||
ADD_VEC_PIPE => false,
|
||||
VECT_CPU_EN => false,
|
||||
VECT_RAMP_EN => false,
|
||||
BUS_BURST_EN => true,
|
||||
BUS_BURST_EN => SPITTING_EN,
|
||||
POS_BUS_EN => true,
|
||||
ALU_EN => false,
|
||||
QUEUE_EN => false)
|
||||
|
|
@ -363,7 +364,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), 4 => stream_busy_a, 5 => stream_busy_b);
|
||||
ch_ctrl_trigger_in <= (0 => loc_pd, 1 => fire_enable, 2 => gated_pulse, 3 => (not fire_enable), 4 => (not stream_busy_a), 5 => (not stream_busy_b));
|
||||
|
||||
ch_mask_i <= fire_enable or ch_ctrl_vector_out(1) or bypass_ch_ctrl;
|
||||
|
||||
|
|
@ -604,22 +605,31 @@ begin
|
|||
-- Spitting logic
|
||||
-----------------------------------------------------------------------------
|
||||
|
||||
pSPITTING_LOGIC : process(clk)
|
||||
begin
|
||||
if(clk = '1' and clk'event) then
|
||||
spitting_enable <= ch_ctrl_vector_out(6);
|
||||
if(seq_bus_valid = '1') then
|
||||
spit_nco_inc <= seq_bus_data;
|
||||
gSPIT_LOGIC: if SPITTING_EN generate
|
||||
|
||||
pSPITTING_LOGIC : process(clk)
|
||||
begin
|
||||
if(clk = '1' and clk'event) then
|
||||
spitting_enable <= ch_ctrl_vector_out(6);
|
||||
if(seq_bus_valid = '1') then
|
||||
spit_nco_inc <= seq_bus_data;
|
||||
end if;
|
||||
if(spitting_enable = '0') then
|
||||
spit_nco <= (others => '0');
|
||||
else
|
||||
spit_nco <= std_logic_vector(unsigned(spit_nco)+unsigned(spit_nco_inc));
|
||||
end if;
|
||||
spit_nco_msb <= spit_nco(spit_nco'left);
|
||||
spit_pulse <= spit_nco(spit_nco'left) and not spit_nco_msb;
|
||||
end if;
|
||||
if(spitting_enable = '0') then
|
||||
spit_nco <= (others => '0');
|
||||
else
|
||||
spit_nco <= std_logic_vector(unsigned(spit_nco)+unsigned(spit_nco_inc));
|
||||
end if;
|
||||
spit_nco_msb <= spit_nco(spit_nco'left);
|
||||
spit_pulse <= spit_nco(spit_nco'left) and not spit_nco_msb;
|
||||
end if;
|
||||
end process pSPITTING_LOGIC;
|
||||
end process pSPITTING_LOGIC;
|
||||
|
||||
else generate
|
||||
|
||||
spitting_enable <= '0';
|
||||
spit_pulse <= '0';
|
||||
|
||||
end generate gSPIT_LOGIC;
|
||||
|
||||
-----------------------------------------------------------------------------
|
||||
-- Pulse Gating
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue