diff --git a/generic_ip/enc_pd_emul/2/doc/enc_pd_emul_2.json b/generic_ip/enc_pd_emul/2/doc/enc_pd_emul_2.json index e901a89..cf28553 100644 --- a/generic_ip/enc_pd_emul/2/doc/enc_pd_emul_2.json +++ b/generic_ip/enc_pd_emul/2/doc/enc_pd_emul_2.json @@ -421,4 +421,19 @@ } } } -}] \ No newline at end of file +}, +{ + "ip_name" : "enc_pd_emul_2", + "bus" : "seq", + "addr_hi_bit" : "10", + "addr_lo_bit" : "9", + "description" : "Encoder/PD emulator sequencer ram", + "sub_blocks" : { + "generic_sequencer_17" : { + "instance" : "channel", + "process" : "cpp", + "offset" : "0x200" + } + } +} +] diff --git a/generic_ip/fire_pulse_manager/6/sim/sim_fpm.do b/generic_ip/fire_pulse_manager/6/sim/sim_fpm.do index c1a8c2d..21d93e0 100644 --- a/generic_ip/fire_pulse_manager/6/sim/sim_fpm.do +++ b/generic_ip/fire_pulse_manager/6/sim/sim_fpm.do @@ -43,7 +43,7 @@ vcom -2008 -work $WORKLIB $TB_PATH/fire_pulse_manager_6_tb.vhd vsim -t ps work.fire_pulse_manager_6_tb # Add waves -#add wave -r sim:/fire_pulse_manager_1_tb/* +add wave -r sim:/fire_pulse_manager_6_tb/* do wave_fpm.do # remove warnings from standard numeric/arithmetic packages (speed-up simulation) diff --git a/generic_ip/fire_pulse_manager/7/sim/com_fpm.do b/generic_ip/fire_pulse_manager/7/sim/com_fpm.do index 8a3d0ee..5e4ea76 100644 --- a/generic_ip/fire_pulse_manager/7/sim/com_fpm.do +++ b/generic_ip/fire_pulse_manager/7/sim/com_fpm.do @@ -23,14 +23,13 @@ if { $DO_CLEANUP == 1 } { # Path variables set COMMON_PATH ../../../common/0/src -set POF_PATH_0 ../../../pof_protocol/0/src -set POF_PATH_1 ../../../pof_protocol/1/src +set POF_PATH_2 ../../../pof_protocol/2/src set SEQUENCER_PATH ../../../generic_sequencer/ -set PULSE_GEN_PATH ../../../pulse_generator/3/src -set EMUL_PATH ../../../enc_pd_emul/1/src -set EMS_PATH ../../../ems/0/src +set PULSE_GEN_PATH ../../../pulse_generator/4/src +set EMUL_PATH ../../../enc_pd_emul/2/src +set EMS_PATH ../../../ems/1/src set ENC_MULT_PATH ../../../encoder_multiply/0/src -set LOG_PATH ../../../event_logger/0/src +set LOG_PATH ../../../event_logger/1/src set SRC_PATH ../src set OSVVM_PATH ../../../common/0/src/test/OSVVM set TB_PATH ../src/test @@ -51,61 +50,58 @@ vcom -2008 -work $WORKLIB $COMMON_PATH/dpram_sclk.vhd vcom -2008 -work $WORKLIB $COMMON_PATH/digital_lpf.vhd vcom -2008 -work $WORKLIB $COMMON_PATH/altera/alt_rw_dp_ram.vhd -# Generic Sequencer (both 15 and 16) +# Generic Sequencer (both 15 and 17) #vcom -2008 -work $WORKLIB $SEQUENCER_PATH/15/src/altera/generic_seq_ram_15.vhd vcom -2008 -work $WORKLIB $SEQUENCER_PATH/15/src/generic_sequencer_15_pkg.vhd vcom -2008 -work $WORKLIB $SEQUENCER_PATH/15/src/generic_sequencer_15.vhd -#vcom -2008 -work $WORKLIB $SEQUENCER_PATH/16/src/altera/generic_seq_ram_16.vhd -vcom -2008 -work $WORKLIB $SEQUENCER_PATH/16/src/generic_sequencer_16_pkg.vhd -vcom -2008 -work $WORKLIB $SEQUENCER_PATH/16/src/generic_sequencer_16.vhd +vcom -2008 -work $WORKLIB $SEQUENCER_PATH/17/src/generic_sequencer_17_cmd_pkg.vhd +vcom -2008 -work $WORKLIB $SEQUENCER_PATH/17/src/generic_sequencer_17_pkg_auto.vhd +vcom -2008 -work $WORKLIB $SEQUENCER_PATH/17/src/generic_sequencer_17_csr_regs_auto.vhd +vcom -2008 -work $WORKLIB $SEQUENCER_PATH/17/src/generic_sequencer_17.vhd # Pulse Generator -vcom -2008 -work $WORKLIB $PULSE_GEN_PATH/simple_frac_div_3.vhd -vcom -2008 -work $WORKLIB $PULSE_GEN_PATH/pulse_generator_3_pkg.vhd -vcom -2008 -work $WORKLIB $PULSE_GEN_PATH/pulse_generator_3.vhd +vcom -2008 -work $WORKLIB $PULSE_GEN_PATH/simple_frac_div_4.vhd +vcom -2008 -work $WORKLIB $PULSE_GEN_PATH/pulse_generator_4_pkg_auto.vhd +vcom -2008 -work $WORKLIB $PULSE_GEN_PATH/pulse_generator_4_csr_regs_auto.vhd +vcom -2008 -work $WORKLIB $PULSE_GEN_PATH/pulse_generator_4.vhd # Emulator -vcom -2008 -work $WORKLIB $EMUL_PATH/enc_pd_emul_1_pkg.vhd -vcom -2008 -work $WORKLIB $EMUL_PATH/enc_pd_emul_1.vhd +vcom -2008 -work $WORKLIB $EMUL_PATH/enc_pd_emul_2_pkg_auto.vhd +vcom -2008 -work $WORKLIB $EMUL_PATH/enc_pd_emul_2_csr_regs_auto.vhd +vcom -2008 -work $WORKLIB $EMUL_PATH/enc_pd_emul_2.vhd # EMS -vcom -2008 -work $WORKLIB $EMS_PATH/ems_0_pkg.vhd vcom -2008 -work $WORKLIB $ENC_MULT_PATH/lut_divider_0.vhd vcom -2008 -work $WORKLIB $ENC_MULT_PATH/encoder_speed_detect_0.vhd vcom -2008 -work $WORKLIB $ENC_MULT_PATH/encoder_multiply_0.vhd -vcom -2008 -work $WORKLIB $EMS_PATH/ems_0_pkg_auto.vhd -vcom -2008 -work $WORKLIB $EMS_PATH/ems_0_csr_regs_auto.vhd -vcom -2008 -work $WORKLIB $EMS_PATH/ems_0.vhd +vcom -2008 -work $WORKLIB $EMS_PATH/ems_1_pkg_auto.vhd +vcom -2008 -work $WORKLIB $EMS_PATH/ems_1_csr_regs_auto.vhd +vcom -2008 -work $WORKLIB $EMS_PATH/ems_1.vhd # Event Logger -vcom -2008 -work $WORKLIB $LOG_PATH/event_logger_0_pkg.vhd -vcom -2008 -work $WORKLIB $LOG_PATH/event_logger_0.vhd +vcom -2008 -work $WORKLIB $LOG_PATH/event_logger_1_pkg_auto.vhd +vcom -2008 -work $WORKLIB $LOG_PATH/event_logger_1_csr_regs_auto.vhd +vcom -2008 -work $WORKLIB $LOG_PATH/event_logger_1.vhd # POF-Rx -vcom -2008 -work $WORKLIB $POF_PATH_0/pof_uart_rx_0.vhd -vcom -2008 -work $WORKLIB $POF_PATH_0/pof_rx_0.vhd -vcom -2008 -work $WORKLIB $POF_PATH_0/pof_uart_regen_0.vhd -vcom -2008 -work $WORKLIB $POF_PATH_0/uart_tx_0.vhd -vcom -2008 -work $WORKLIB $POF_PATH_0/pof_tx_0_pkg_auto.vhd -vcom -2008 -work $WORKLIB $POF_PATH_0/pof_tx_0_csr_regs_auto.vhd -vcom -2008 -work $WORKLIB $POF_PATH_0/pof_tx_0.vhd - -vcom -2008 -work $WORKLIB $POF_PATH_1/pof_uart_rx_1.vhd -vcom -2008 -work $WORKLIB $POF_PATH_1/pof_rx_1.vhd -vcom -2008 -work $WORKLIB $POF_PATH_1/pof_uart_regen_1.vhd -vcom -2008 -work $WORKLIB $POF_PATH_1/uart_tx_1.vhd -vcom -2008 -work $WORKLIB $POF_PATH_1/pof_tx_1.vhd +vcom -2008 -work $WORKLIB $POF_PATH_2/pof_uart_rx_2.vhd +vcom -2008 -work $WORKLIB $POF_PATH_2/pof_rx_2.vhd +vcom -2008 -work $WORKLIB $POF_PATH_2/pof_uart_regen_2.vhd +vcom -2008 -work $WORKLIB $POF_PATH_2/uart_tx_2.vhd +vcom -2008 -work $WORKLIB $POF_PATH_2/pof_tx_2_pkg_auto.vhd +vcom -2008 -work $WORKLIB $POF_PATH_2/pof_tx_2_csr_regs_auto.vhd +vcom -2008 -work $WORKLIB $POF_PATH_2/pof_tx_2.vhd # Fire-Pulse-Manager -vcom -2008 -work $WORKLIB $COMMON_PATH/cs_bus_itf.vhd +vcom -2008 -work $WORKLIB $COMMON_PATH/cs_bus_itf_no_wait.vhd vcom -2008 -work $WORKLIB $SRC_PATH/fpm_diags_7_pkg_auto.vhd vcom -2008 -work $WORKLIB $SRC_PATH/fpm_diags_7_csr_regs_auto.vhd vcom -2008 -work $WORKLIB $SRC_PATH/smb_diagnostics_7.vhd -vcom -2008 -work $WORKLIB $SRC_PATH/simple_enc_vel_detect_6.vhd +vcom -2008 -work $WORKLIB $SRC_PATH/simple_enc_vel_detect_7.vhd vcom -2008 -work $WORKLIB $SRC_PATH/fire_pulse_7_pkg.vhd vcom -2008 -work $WORKLIB $SRC_PATH/fpm_ctrl_7_pkg_auto.vhd vcom -2008 -work $WORKLIB $SRC_PATH/fpm_ctrl_7_csr_regs_auto.vhd vcom -2008 -work $WORKLIB $SRC_PATH/fire_pulse_ctrl_7.vhd -vcom -2008 -work $WORKLIB $SRC_PATH/seb_epd_led_gen_6.vhd +vcom -2008 -work $WORKLIB $SRC_PATH/seb_epd_led_gen_7.vhd vcom -2008 -work $WORKLIB $SRC_PATH/fire_pulse_manager_7.vhd diff --git a/generic_ip/fire_pulse_manager/7/sim/sim_fpm.do b/generic_ip/fire_pulse_manager/7/sim/sim_fpm.do index 3f87bc5..b10b585 100644 --- a/generic_ip/fire_pulse_manager/7/sim/sim_fpm.do +++ b/generic_ip/fire_pulse_manager/7/sim/sim_fpm.do @@ -43,7 +43,7 @@ vcom -2008 -work $WORKLIB $TB_PATH/fire_pulse_manager_7_tb.vhd vsim -t ps work.fire_pulse_manager_7_tb # Add waves -#add wave -r sim:/fire_pulse_manager_1_tb/* +#add wave -r sim:/fire_pulse_manager_7_tb/* do wave_fpm.do # remove warnings from standard numeric/arithmetic packages (speed-up simulation) diff --git a/generic_ip/fire_pulse_manager/7/src/fire_pulse_manager_7.vhd b/generic_ip/fire_pulse_manager/7/src/fire_pulse_manager_7.vhd index e36dc45..7e0bb65 100644 --- a/generic_ip/fire_pulse_manager/7/src/fire_pulse_manager_7.vhd +++ b/generic_ip/fire_pulse_manager/7/src/fire_pulse_manager_7.vhd @@ -442,7 +442,7 @@ begin gENC_VEL: if TOF_COMP_EN = true generate -- Used for Time-of-Flight Compensation - iVEL : entity work.simple_enc_vel_detect_6 + iVEL : entity work.simple_enc_vel_detect_7 port map ( clk => clk, init => init, @@ -502,9 +502,10 @@ begin gPOF: if POF_PROT_VER = 0 generate -- POF Receiver - iPOF_RX : entity work.pof_rx_0 + iPOF_RX : entity work.pof_rx_2 generic map( - GEN_BIT_DIV => POF_UART_BIT_BIV) + PROTOCOL_VER => 0, + GEN_BIT_DIV => POF_UART_BIT_BIV) port map( reset_n => reset_n_i, clk => clk, @@ -527,7 +528,7 @@ begin skip_pos_cnt => skip_pos_cnt); -- UART signal regeneration - iUART_REGEN : entity work.pof_uart_regen_0 + iUART_REGEN : entity work.pof_uart_regen_2 generic map( GEN_BIT_DIV => POF_UART_BIT_BIV, data_width => 8) @@ -544,9 +545,10 @@ begin elsif POF_PROT_VER = 1 generate -- POF Receiver - iPOF_RX : entity work.pof_rx_1 + iPOF_RX : entity work.pof_rx_2 generic map( - GEN_BIT_DIV => POF_UART_BIT_BIV) + PROTOCOL_VER => 1, + GEN_BIT_DIV => POF_UART_BIT_BIV) port map( reset_n => reset_n_i, clk => clk, @@ -570,7 +572,7 @@ begin skip_pos_cnt => skip_pos_cnt); -- UART signal regeneration - iUART_REGEN : entity work.pof_uart_regen_1 + iUART_REGEN : entity work.pof_uart_regen_2 generic map( GEN_BIT_DIV => POF_UART_BIT_BIV, data_width => 9) @@ -590,7 +592,7 @@ begin gEMS : if SEB_EPD_MODE = true generate - iEMS : entity work.ems_0 + iEMS : entity work.ems_1 generic map( ADD_ENC_ZP_LOGIC => false, ADD_MULT_DEBUG_REG => false, @@ -603,7 +605,6 @@ begin avs_write => cs_ems_write_en, avs_writedata => cs_write_data, avs_read => cs_ems_read_en, - avs_readdatavalid => open, avs_readdata => cs_ems_read_data, rs422_pd => pd_pulse_mux, rs422_p1 => enc_p1_mux, @@ -646,7 +647,10 @@ begin gPOF_TX : if SEB_EPD_MODE = true generate -- Default POF-Protocol - iPOF_TX: entity work.pof_tx_0 + iPOF_TX: entity work.pof_tx_2 + generic map ( + PROTOCOL_VER => 0 + ) port map ( reset_n => reset_n_i, clk => clk, @@ -660,7 +664,6 @@ begin avs_write => cs_pof_write_en, avs_writedata => cs_write_data, avs_read => cs_pof_read_en, - avs_readdatavalid => open, avs_readdata => cs_pof_read_data); else generate @@ -676,7 +679,7 @@ begin ----------------------------------------------------------------------------- gSEB_EPD_LEDs : if SEB_EPD_MODE = true generate - iLED_GEN: entity work.seb_epd_led_gen_6 + iLED_GEN: entity work.seb_epd_led_gen_7 port map ( reset_n => reset_n, clk => clk, diff --git a/generic_ip/fire_pulse_manager/7/src/seb_epd_led_gen_6.vhd b/generic_ip/fire_pulse_manager/7/src/seb_epd_led_gen_7.vhd similarity index 98% rename from generic_ip/fire_pulse_manager/7/src/seb_epd_led_gen_6.vhd rename to generic_ip/fire_pulse_manager/7/src/seb_epd_led_gen_7.vhd index ae8c439..dafa112 100644 --- a/generic_ip/fire_pulse_manager/7/src/seb_epd_led_gen_6.vhd +++ b/generic_ip/fire_pulse_manager/7/src/seb_epd_led_gen_7.vhd @@ -1,8 +1,8 @@ ------------------------------------------------------------------------------- --- Title : seb_epd_led_gen_6 +-- Title : seb_epd_led_gen_7 -- Project : SMB ------------------------------------------------------------------------------- --- File : seb_epd_led_gen_6.vhd +-- File : seb_epd_led_gen_7.vhd -- Author : Gianmarco Girau -- Company : Global Inkjet Systems -- Created : 2018-08-06 @@ -20,7 +20,7 @@ library ieee; use ieee.std_logic_1164.all; use ieee.numeric_std.all; -entity seb_epd_led_gen_6 is +entity seb_epd_led_gen_7 is generic( MAX_PERIOD_MS : natural := 1000; GREEN_PERIOD_MS : natural := 200); @@ -48,9 +48,9 @@ entity seb_epd_led_gen_6 is led_pof_g : out std_logic; led_pof_y : out std_logic; led_pof_r : out std_logic); -end entity seb_epd_led_gen_6; +end entity seb_epd_led_gen_7; -architecture rtl of seb_epd_led_gen_6 is +architecture rtl of seb_epd_led_gen_7 is constant END_GREEN_PERIOD_MS : natural := MAX_PERIOD_MS - GREEN_PERIOD_MS; diff --git a/generic_ip/fire_pulse_manager/7/src/simple_enc_vel_detect_6.vhd b/generic_ip/fire_pulse_manager/7/src/simple_enc_vel_detect_7.vhd similarity index 94% rename from generic_ip/fire_pulse_manager/7/src/simple_enc_vel_detect_6.vhd rename to generic_ip/fire_pulse_manager/7/src/simple_enc_vel_detect_7.vhd index fb2cc49..efc9941 100644 --- a/generic_ip/fire_pulse_manager/7/src/simple_enc_vel_detect_6.vhd +++ b/generic_ip/fire_pulse_manager/7/src/simple_enc_vel_detect_7.vhd @@ -2,7 +2,7 @@ -- Title : simple encoder velocity detection -- Project : project independent ------------------------------------------------------------------------------- --- File : simple_enc_vel_detect_6.vhd +-- File : simple_enc_vel_detect_7.vhd -- Author : Gianmarco Girau -- Company : Global Inkjet Systems -- Created : 2019-06-18 @@ -22,7 +22,7 @@ library ieee; use ieee.std_logic_1164.all; use ieee.numeric_std.all; -entity simple_enc_vel_detect_6 is +entity simple_enc_vel_detect_7 is port ( clk : in std_logic; -- Must be 100 MHz init : in std_logic; @@ -30,9 +30,9 @@ entity simple_enc_vel_detect_6 is step_neg : in std_logic; sampling_period : in std_logic_vector(19 downto 0); vel_meas : out std_logic_vector(19 downto 0)); -end simple_enc_vel_detect_6; +end simple_enc_vel_detect_7; -architecture RTL of simple_enc_vel_detect_6 is +architecture RTL of simple_enc_vel_detect_7 is signal init_i, sampling_pulse : std_logic; diff --git a/generic_ip/fire_pulse_manager/7/src/test/fire_pulse_manager_7_tb.vhd b/generic_ip/fire_pulse_manager/7/src/test/fire_pulse_manager_7_tb.vhd index 7a4a0d0..e0a4fba 100644 --- a/generic_ip/fire_pulse_manager/7/src/test/fire_pulse_manager_7_tb.vhd +++ b/generic_ip/fire_pulse_manager/7/src/test/fire_pulse_manager_7_tb.vhd @@ -26,8 +26,8 @@ use work.fire_pulse_7_pkg.all; use work.fpm_ctrl_7_pkg.all; use work.log_pkg.all; use work.avalon_verify_pkg_2.all; -use work.pulse_generator_3_pkg.all; -use work.enc_pd_emul_1_pkg.all; +use work.pulse_generator_4_pkg.all; +use work.enc_pd_emul_2_pkg.all; use work.fire_pulse_manager_7_tb_pkg.all; library osvvm; @@ -85,7 +85,6 @@ architecture behav of fire_pulse_manager_7_tb is signal avs_write : std_logic_vector(DEV_NUM - 1 downto 0); signal avs_writedata : std_logic_vector(31 downto 0); signal avs_read : std_logic_vector(DEV_NUM - 1 downto 0); - signal avs_waitrequest : std_logic_vector(DEV_NUM - 1 downto 0); signal avs_readdata : avs_read_bus_t; -- signal init_tx : std_logic; @@ -106,7 +105,6 @@ architecture behav of fire_pulse_manager_7_tb is signal emul_write : std_logic; signal emul_writedata : std_logic_vector(31 downto 0); signal emul_read : std_logic; - signal emul_readdatavalid : std_logic; signal emul_readdata : std_logic_vector(31 downto 0); signal emul_inc_pos : std_logic; signal emul_dec_pos : std_logic; @@ -203,7 +201,6 @@ begin -- behav avs_write => avs_write(0), avs_writedata => avs_writedata, avs_read => avs_read(0), - avs_waitrequest => avs_waitrequest(0), avs_readdata => avs_readdata(0)); pof_rx <= transport tx_data after POF_DELAY when ext_pulse_enable = '0' else ext_pulse; @@ -233,7 +230,7 @@ begin -- behav -- When using the SEB-EPD, the encoder phase-1/2 outputs of the emulator are -- directly fed as inputs to the FPM - iEMUL : entity work.enc_pd_emul_1 + iEMUL : entity work.enc_pd_emul_2 port map ( clk => clk, reset_n => reset_n, @@ -253,7 +250,6 @@ begin -- behav avs_write => emul_write, avs_writedata => emul_writedata, avs_read => emul_read, - avs_readdatavalid => emul_readdatavalid, avs_readdata => emul_readdata); abs_position <= emul_pos(31 downto 0); @@ -266,7 +262,10 @@ begin -- behav -- POF Tx (Stimuli Generator) ----------------------------------------------------------------------------- - iPOF_TX : entity work.pof_tx_0 + iPOF_TX : entity work.pof_tx_2 + generic map( + PROTOCOL_VER => 0 + ) port map( reset_n => reset_n, clk => clk, @@ -280,19 +279,8 @@ begin -- behav avs_write => avs_write(1), avs_writedata => avs_writedata, avs_read => avs_read(1), - avs_readdatavalid => pof_tx_avs_rv, avs_readdata => avs_readdata(1)); - -- Generate a dummy waitrequest for the POF-tx - pPOF_TX_DUMMY_WR : process(clk) - begin - if(clk = '1' and clk'event) then - pof_tx_avs_we_d <= avs_write(1); - end if; - end process pPOF_TX_DUMMY_WR; - - avs_waitrequest(1) <= '0' when pof_tx_avs_we_d = '1' or pof_tx_avs_rv = '1' else '0'; - ----------------------------------------------------------------------------- -- Stimuli Generation ----------------------------------------------------------------------------- @@ -315,7 +303,7 @@ begin -- behav stimuli_completed <= false; end_of_swathe <= '0'; -- - mm_m_init(emul_m, use_readvalid => true); + mm_m_init(emul_m, use_readvalid => false); -- generating the stimulus if(running /= true) then @@ -623,7 +611,7 @@ begin -- behav run_dw <= '0'; -- Initialize avalon mm interfaces - mm_m_init(avs_m, use_waitrequest => true); + mm_m_init(avs_m, use_waitrequest => false); if (reset_n = '0') then wait until reset_n = '1'; @@ -686,9 +674,9 @@ begin -- behav log("Reading counters ... ", VLOW, true); -- Read PD and FP counter from pulse generator for i in 0 to CH_NUM - 1 loop - fpm_reg_read(PG_CH_ID+i, work.pulse_generator_3_pkg.PD_CNT_REG, data, avs_s, avs_m); + fpm_reg_read(PG_CH_ID+i, work.pulse_generator_4_pkg.CSR_PD_COUNTER_ADDR, data, avs_s, avs_m); pd_cnt(i) <= to_integer(unsigned(data)); - fpm_reg_read(PG_CH_ID+i, work.pulse_generator_3_pkg.FIRE_REQ_CNT_REG, data, avs_s, avs_m); + fpm_reg_read(PG_CH_ID+i, work.pulse_generator_4_pkg.CSR_FIRE_REQ_COUNTER_ADDR, data, avs_s, avs_m); fp_cnt(i) <= to_integer(unsigned(data)); wait until clk = '1' and clk'event; log("CH-" & to_string(i) & ": pd_in_cnt = " & to_string(pd_cnt(i)) & ", fire_req_cnt = " & to_string(fp_cnt(i)) & ", detected fire-req-cnt = " & to_string(loc_fp_cnt(i)), VMEDIUM); @@ -723,9 +711,9 @@ begin -- behav log("Reading counters ... ", VLOW, true); -- Read PD and FP counter from pulse generator for i in 0 to CH_NUM - 1 loop - fpm_reg_read(PG_CH_ID+i, work.pulse_generator_3_pkg.PD_CNT_REG, data, avs_s, avs_m); + fpm_reg_read(PG_CH_ID+i, work.pulse_generator_4_pkg.CSR_PD_COUNTER_ADDR, data, avs_s, avs_m); pd_cnt(i) <= to_integer(unsigned(data)); - fpm_reg_read(PG_CH_ID+i, work.pulse_generator_3_pkg.FIRE_REQ_CNT_REG, data, avs_s, avs_m); + fpm_reg_read(PG_CH_ID+i, work.pulse_generator_4_pkg.CSR_FIRE_REQ_COUNTER_ADDR, data, avs_s, avs_m); fp_cnt(i) <= to_integer(unsigned(data)); wait until clk = '1' and clk'event; log("CH-" & to_string(i) & ": pd_in_cnt = " & to_string(pd_cnt(i)) & ", fire_req_cnt = " & to_string(fp_cnt(i)), VMEDIUM); @@ -740,12 +728,11 @@ begin -- behav reset_reset_n <= reset_n; avs_s.mm_readdata <= avs_readdata(0) when sel_slave_0 = '1' else - avs_readdata(1) when sel_slave_1 = '1' else (others => '0'); + avs_readdata(1) when sel_slave_1 = '1' else (others => '0'); avs_s.mm_readdatavalid <= '0'; - avs_s.mm_waitrequest <= avs_waitrequest(0) when sel_slave_0 = '1' else - avs_waitrequest(1) when sel_slave_1 = '1' else '0'; + avs_s.mm_waitrequest <= '0'; avs_address <= avs_m.mm_address(avs_address'range); avs_write(0) <= avs_m.mm_write and sel_slave_0; @@ -756,7 +743,7 @@ begin -- behav -- Emulator Avalon bus maapings emul_s.mm_readdata <= emul_readdata; - emul_s.mm_readdatavalid <= emul_readdatavalid; + emul_s.mm_readdatavalid <= '0'; emul_s.mm_waitrequest <= '0'; emul_address <= emul_m.mm_address(emul_address'range); diff --git a/generic_ip/fire_pulse_manager/7/src/test/fire_pulse_manager_7_tb_pkg.vhd b/generic_ip/fire_pulse_manager/7/src/test/fire_pulse_manager_7_tb_pkg.vhd index b9944da..176a9fa 100644 --- a/generic_ip/fire_pulse_manager/7/src/test/fire_pulse_manager_7_tb_pkg.vhd +++ b/generic_ip/fire_pulse_manager/7/src/test/fire_pulse_manager_7_tb_pkg.vhd @@ -25,7 +25,7 @@ use ieee.math_real.all; library work; use work.fire_pulse_7_pkg.all; -use work.ems_0_pkg.all; +use work.ems_1_pkg.all; use work.fpm_ctrl_7_pkg.all; library OSVVM ; @@ -35,7 +35,7 @@ use OSVVM.RandomPkg.all; library work; use work.log_pkg.all; use work.avalon_verify_pkg_2.all; -use work.enc_pd_emul_1_pkg.all; +use work.enc_pd_emul_2_pkg.all; package fire_pulse_manager_7_tb_pkg is @@ -317,8 +317,8 @@ package body fire_pulse_manager_7_tb_pkg is -- Disable/Re-enable first the whole pulse_generator data := std_logic_vector(to_unsigned(ch_offset, 32)); - fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_3_pkg.CH_OFFSET_D0_REG, data, mm_s, mm_m); - fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_3_pkg.CH_OFFSET_D1_REG, data, mm_s, mm_m); + fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_4_pkg.CSR_PD_OFFSET_DIR_0_ADDR, data, mm_s, mm_m); + fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_4_pkg.CSR_PD_OFFSET_DIR_1_ADDR, data, mm_s, mm_m); log("CH-" & to_string(ch_id) & ": PD offset configured to " & to_string(ch_offset) & ".", VMEDIUM); @@ -336,7 +336,7 @@ package body fire_pulse_manager_7_tb_pkg is begin - ram_offset := to_integer(unsigned(work.pulse_generator_3_pkg.SEQ_RAM_OFFSET)); + ram_offset := to_integer(unsigned(work.pulse_generator_4_pkg.SEQ_GENERIC_SEQUENCER_17_CHANNEL_ADDR)); ram_idx := 0; -- Issue first an image on DIR-0, then on DIR-1 @@ -408,19 +408,19 @@ package body fire_pulse_manager_7_tb_pkg is -- Disable/Re-enable first the whole pulse_generator data := (others => '0'); - fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_3_pkg.PULSE_GEN_CTRL_REG, data, mm_s, mm_m); + fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_4_pkg.CSR_PULSE_GEN_CONTROL_W_ADDR, data, mm_s, mm_m); data := (0 => '1', 16 => '1', others => '0'); - fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_3_pkg.PULSE_GEN_CTRL_REG, data, mm_s, mm_m); + fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_4_pkg.CSR_PULSE_GEN_CONTROL_W_ADDR, data, mm_s, mm_m); -- Disable/Re-enable the Channel Controller sequencer data := (others => '0'); - fpm_reg_write(PG_CH_ID+ch_id, to_integer(unsigned(work.pulse_generator_3_pkg.SEQ_CSR_OFFSET)) + 3, data, mm_s, mm_m); + fpm_reg_write(PG_CH_ID+ch_id, to_integer(unsigned(work.pulse_generator_4_pkg.CSR_GENERIC_SEQUENCER_17_CHANNEL_ADDR)) + 3, data, mm_s, mm_m); data := (0 => '1', others => '0'); - fpm_reg_write(PG_CH_ID+ch_id, to_integer(unsigned(work.pulse_generator_3_pkg.SEQ_CSR_OFFSET)) + 3, data, mm_s, mm_m); + fpm_reg_write(PG_CH_ID+ch_id, to_integer(unsigned(work.pulse_generator_4_pkg.CSR_GENERIC_SEQUENCER_17_CHANNEL_ADDR)) + 3, data, mm_s, mm_m); -- Set the number of sub-pixel phases data := std_logic_vector(to_unsigned(subpix_phases, 32)); - fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_3_pkg.SUBPIXEL_PHASE_REG, data, mm_s, mm_m); + fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_4_pkg.CSR_SUBPIXEL_PHASE_NUM_ADDR, data, mm_s, mm_m); -- set the division ratio ratio_int := integer((div_ratio / real(subpix_phases)) * real(2**24)); @@ -428,15 +428,15 @@ package body fire_pulse_manager_7_tb_pkg is -- Set the integer part of the div-ratio data(31 downto 10) := (others => '0'); data(9 downto 0) := ratio_slv(33 downto 24); - fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_3_pkg.DIV_RATIO_INT, data, mm_s, mm_m); + fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_4_pkg.CSR_DIVIDER_RATIO_INT_ADDR, data, mm_s, mm_m); data(31 downto 24) := (others => '0'); data(23 downto 0) := ratio_slv(23 downto 0); - fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_3_pkg.DIV_RATIO_FRAC, data, mm_s, mm_m); + fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_4_pkg.CSR_DIVIDER_RATIO_FRACTION_ADDR, data, mm_s, mm_m); -- Disable/Enable the fractional divider data := (others => '0'); - fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_3_pkg.FRAC_DIV_CTRL_REG, data, mm_s, mm_m); + fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_4_pkg.CSR_FRACTIONAL_DIVIDER_CONTROL_ADDR, data, mm_s, mm_m); data := (0 => '1', others => '0'); - fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_3_pkg.FRAC_DIV_CTRL_REG, data, mm_s, mm_m); + fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_4_pkg.CSR_FRACTIONAL_DIVIDER_CONTROL_ADDR, data, mm_s, mm_m); -- configure the channel offset ch_offset_config(ch_id, ch_offset, mm_s, mm_m); @@ -446,9 +446,9 @@ package body fire_pulse_manager_7_tb_pkg is -- Restart the sequencer data := (others => '0'); - fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_3_pkg.CH_CTRL_CTRL_REG, data, mm_s, mm_m); + fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_4_pkg.CSR_CHANNEL_CONTROLLER_CONTROL_W_ADDR, data, mm_s, mm_m); data := (0 => '1', others => '0'); - fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_3_pkg.CH_CTRL_CTRL_REG, data, mm_s, mm_m); + fpm_reg_write(PG_CH_ID+ch_id, work.pulse_generator_4_pkg.CSR_CHANNEL_CONTROLLER_CONTROL_W_ADDR, data, mm_s, mm_m); end procedure pulse_gen_config; @@ -493,16 +493,16 @@ package body fire_pulse_manager_7_tb_pkg is log("Configuring EMS ... ", VMEDIUM, true); -- EMS software init - fpm_reg_write(EMS_BLK_ID, work.ems_0_pkg.CSR_EMS_ENABLE_ADDR, 32x"1", mm_s, mm_m); + fpm_reg_write(EMS_BLK_ID, work.ems_1_pkg.CSR_EMS_ENABLE_ADDR, 32x"1", mm_s, mm_m); -- disable the EMS during the configuration - fpm_reg_write(EMS_BLK_ID, work.ems_0_pkg.CSR_EMS_ENABLE_ADDR, 32x"0", mm_s, mm_m); + fpm_reg_write(EMS_BLK_ID, work.ems_1_pkg.CSR_EMS_ENABLE_ADDR, 32x"0", mm_s, mm_m); -- apply EMS config - fpm_reg_write(EMS_BLK_ID, work.ems_0_pkg.CSR_EMS_CONFIG_ADDR, 32x"3E0", mm_s, mm_m); + fpm_reg_write(EMS_BLK_ID, work.ems_1_pkg.CSR_EMS_CONFIG_ADDR, 32x"3E0", mm_s, mm_m); -- enable the EMS - fpm_reg_write(EMS_BLK_ID, work.ems_0_pkg.CSR_EMS_ENABLE_ADDR, 32x"E", mm_s, mm_m); + fpm_reg_write(EMS_BLK_ID, work.ems_1_pkg.CSR_EMS_ENABLE_ADDR, 32x"E", mm_s, mm_m); end procedure fpm_ems_config; @@ -556,7 +556,7 @@ package body fire_pulse_manager_7_tb_pkg is mm_32b_write(addr, abs_pos(31 downto 0), mm_s_rec, mm_m_rec); -- read back the encoder configuration, then apply the set_abs_pos control -- bit - addr:= std_logic_vector(resize(unsigned(CSR_ENC_CTRL_ADDR), 32)); + addr:= std_logic_vector(resize(unsigned(CSR_ENC_CTRL_W_ADDR), 32)); mm_32b_read(addr, data, mm_s_rec, mm_m_rec); data(3) := '1'; mm_32b_write(addr, data, mm_s_rec, mm_m_rec); @@ -588,12 +588,12 @@ package body fire_pulse_manager_7_tb_pkg is mm_32b_write(addr, data, mm_s_rec, mm_m_rec); -- set the max pulses register - addr := std_logic_vector(resize(unsigned(CSR_PULSE_NUM_ADDR), 32)); + addr := std_logic_vector(resize(unsigned(CSR_ENC_PULSE_NUM_ADDR), 32)); data := std_logic_vector(to_unsigned(cfg.enc_pulses, 32)); mm_32b_write(addr, data, mm_s_rec, mm_m_rec); -- set the zero-phase ppr number - addr := std_logic_vector(resize(unsigned(CSR_ZP_PPR_ADDR), 32)); + addr := std_logic_vector(resize(unsigned(CSR_ENC_ZP_PPR_ADDR), 32)); data := std_logic_vector(to_unsigned(cfg.enc_ppr, 32)); mm_32b_write(addr, data, mm_s_rec, mm_m_rec); @@ -606,7 +606,7 @@ package body fire_pulse_manager_7_tb_pkg is addr := std_logic_vector(resize(unsigned(CSR_OUT_ENABLE_ADDR), 32)); mm_32b_write(addr, data, mm_s_rec, mm_m_rec); - addr := std_logic_vector(resize(unsigned(CSR_ENC_CTRL_ADDR), 32)); + addr := std_logic_vector(resize(unsigned(CSR_ENC_CTRL_W_ADDR), 32)); if(init = true) then mm_32b_write(addr, 32x"2", mm_s_rec, mm_m_rec); end if; @@ -646,7 +646,7 @@ package body fire_pulse_manager_7_tb_pkg is mm_32b_write(addr, data, mm_s_rec, mm_m_rec); -- Disable Enc emulation - addr := std_logic_vector(resize(unsigned(CSR_ENC_CTRL_ADDR), 32)); + addr := std_logic_vector(resize(unsigned(CSR_ENC_CTRL_W_ADDR), 32)); mm_32b_read(addr, data, mm_s_rec, mm_m_rec); data(0) := '0'; mm_32b_write(addr, data, mm_s_rec, mm_m_rec); @@ -664,7 +664,7 @@ package body fire_pulse_manager_7_tb_pkg is begin - addr := std_logic_vector(resize(unsigned(CSR_ENC_CTRL_ADDR), 32)); + addr := std_logic_vector(resize(unsigned(CSR_ENC_CTRL_R_ADDR), 32)); mm_32b_read(addr, data, mm_s_rec, mm_m_rec); if(data(6) = '1') then @@ -697,12 +697,12 @@ package body fire_pulse_manager_7_tb_pkg is mm_32b_write(addr, data, mm_s_rec, mm_m_rec); -- set the max pulses register - addr := std_logic_vector(resize(unsigned(CSR_PULSE_NUM_ADDR), 32)); + addr := std_logic_vector(resize(unsigned(CSR_ENC_PULSE_NUM_ADDR), 32)); data := std_logic_vector(to_unsigned(num_pulses, 32)); mm_32b_write(addr, data, mm_s_rec, mm_m_rec); -- set the zero-phase ppr number - addr := std_logic_vector(resize(unsigned(CSR_ZP_PPR_ADDR), 32)); + addr := std_logic_vector(resize(unsigned(CSR_ENC_ZP_PPR_ADDR), 32)); data := std_logic_vector(to_unsigned(enc_ppr, 32)); mm_32b_write(addr, data, mm_s_rec, mm_m_rec); @@ -715,7 +715,7 @@ package body fire_pulse_manager_7_tb_pkg is addr := std_logic_vector(resize(unsigned(CSR_OUT_ENABLE_ADDR), 32)); mm_32b_write(addr, data, mm_s_rec, mm_m_rec); - addr := std_logic_vector(resize(unsigned(CSR_ENC_CTRL_ADDR), 32)); + addr := std_logic_vector(resize(unsigned(CSR_ENC_CTRL_W_ADDR), 32)); data := (4 => '1', 5 => '1', others => '0'); if(direction = DIR_0) then data(2) := '0'; @@ -749,7 +749,7 @@ package body fire_pulse_manager_7_tb_pkg is begin -- set the pulse width - addr := std_logic_vector(resize(unsigned(CSR_PD_PULSE_W_ADDR), 32)); + addr := std_logic_vector(resize(unsigned(CSR_PD_PULSE_WIDTH_ADDR), 32)); data := std_logic_vector(to_unsigned(integer(pulse_width*100.0),32)); mm_32b_write(addr, data, mm_s_rec, mm_m_rec); @@ -767,36 +767,36 @@ package body fire_pulse_manager_7_tb_pkg is -- finally trigger the start of the procedure: -- Write in the Emulator sequencer a simple procedure to issue PD pulses - addr := std_logic_vector(resize(unsigned(SEQ_RAM_OFFSET)+0, 32)); + addr := std_logic_vector(resize(unsigned(SEQ_GENERIC_SEQUENCER_17_CHANNEL_ADDR)+0, 32)); mm_32b_write(addr, X"100000FF", mm_s_rec, mm_m_rec); -- Enable triggers - addr := std_logic_vector(resize(unsigned(SEQ_RAM_OFFSET)+1, 32)); + addr := std_logic_vector(resize(unsigned(SEQ_GENERIC_SEQUENCER_17_CHANNEL_ADDR)+1, 32)); mm_32b_write(addr, X"30000000", mm_s_rec, mm_m_rec); -- All the outputs to zero idx := 2; loop_idx := idx; if(pd_period >= 1.0) then -- add a first trigger-wait instruction for 1-us pulses - addr := std_logic_vector(resize(unsigned(SEQ_RAM_OFFSET)+idx, 32)); + addr := std_logic_vector(resize(unsigned(SEQ_GENERIC_SEQUENCER_17_CHANNEL_ADDR)+idx, 32)); tmp_val := integer(pd_period); data := X"21000" & std_logic_vector(to_unsigned(tmp_val, 12)); mm_32b_write(addr, data, mm_s_rec, mm_m_rec); -- trig_wait (us pulses) idx := idx + 1; end if; -- add a second trigger on single clock cycle events - addr := std_logic_vector(resize(unsigned(SEQ_RAM_OFFSET)+idx, 32)); + addr := std_logic_vector(resize(unsigned(SEQ_GENERIC_SEQUENCER_17_CHANNEL_ADDR)+idx, 32)); tmp_val := integer((pd_period-floor(pd_period))*100.0); data := X"20000" & std_logic_vector(to_unsigned(tmp_val, 12)); mm_32b_write(addr, data, mm_s_rec, mm_m_rec); -- trig_wait (clk pulses) idx := idx + 1; -- issue the PD pulse - addr := std_logic_vector(resize(unsigned(SEQ_RAM_OFFSET)+idx, 32)); + addr := std_logic_vector(resize(unsigned(SEQ_GENERIC_SEQUENCER_17_CHANNEL_ADDR)+idx, 32)); mm_32b_write(addr, X"31000001", mm_s_rec, mm_m_rec); -- All the outputs to zero idx := idx + 1; -- Jump to the beginning of the loop - addr := std_logic_vector(resize(unsigned(SEQ_RAM_OFFSET)+idx, 32)); + addr := std_logic_vector(resize(unsigned(SEQ_GENERIC_SEQUENCER_17_CHANNEL_ADDR)+idx, 32)); mm_32b_write(addr, X"31000001", mm_s_rec, mm_m_rec); -- All the outputs to zero -- Enable the sequencer - addr := std_logic_vector(resize(unsigned(SEQ_RAM_OFFSET)+idx, 32)); + addr := std_logic_vector(resize(unsigned(SEQ_GENERIC_SEQUENCER_17_CHANNEL_ADDR)+idx, 32)); mm_32b_write(addr, 32x"1", mm_s_rec, mm_m_rec); -- All the outputs to zero -- issue a start-request to the sequencer diff --git a/generic_ip/pulse_generator/4/doc/pulse_generator_4.json b/generic_ip/pulse_generator/4/doc/pulse_generator_4.json index 60ff17f..bab4760 100644 --- a/generic_ip/pulse_generator/4/doc/pulse_generator_4.json +++ b/generic_ip/pulse_generator/4/doc/pulse_generator_4.json @@ -70,7 +70,7 @@ }, "pulse_gen_control_w": { "address": "2", - "width": "21", + "width": "20", "description": "", "fields": { "enable": { @@ -127,7 +127,7 @@ }, "reserved_2": { "type": "rsv", - "bit_len": "3", + "bit_len": "2", "description": "" }, "enable_output": {